--- a/components/desktop/firefox/Makefile	Sun Oct 23 21:19:26 2016 -0700
+++ b/components/desktop/firefox/Makefile	Fri Oct 28 14:57:30 2016 -0700
@@ -200,7 +200,9 @@
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
 REQUIRED_PACKAGES += library/desktop/gtk2
 REQUIRED_PACKAGES += library/desktop/pango
+REQUIRED_PACKAGES += library/desktop/startup-notification
 REQUIRED_PACKAGES += library/glib2
+# Remove once all build machines have library/desktop/startup-notification:
 REQUIRED_PACKAGES += library/gnome/gnome-libs
 REQUIRED_PACKAGES += library/graphics/pixman
 REQUIRED_PACKAGES += library/libevent

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/startup-notification/Makefile	Fri Oct 28 14:57:30 2016 -0700
@@ -0,0 +1,58 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS=             32_and_64
+COMPILER=		gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		startup-notification
+COMPONENT_VERSION=	0.12
+COMPONENT_PROJECT_URL=	http://www.freedesktop.org/wiki/Software/startup-notification/
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+   sha256:3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a
+COMPONENT_ARCHIVE_URL=	http://www.freedesktop.org/software/$(COMPONENT_NAME)/releases/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	gnome/libraries
+
+TPNO=			24899
+
+# gmake check works but produces no useful output
+TEST_TARGET = $(SKIP_TEST)
+
+# May build on S11 but will conflict with gnome-libs
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
+include $(WS_MAKE_RULES)/common.mk
+
+CONFIGURE_OPTIONS += --enable-static=no
+CONFIGURE_OPTIONS += --with-x
+
+REQUIRED_PACKAGES += developer/build/automake
+REQUIRED_PACKAGES += developer/build/gnu-make
+REQUIRED_PACKAGES += developer/build/pkg-config
+REQUIRED_PACKAGES += text/gnu-grep
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxcb
+REQUIRED_PACKAGES += x11/library/xcb-util

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/startup-notification/startup-notification.p5m	Fri Oct 28 14:57:30 2016 -0700
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/library/desktop/startup-notification@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Provides a reference implementation of the startup notification protocol"
+set name=com.oracle.info.description value=startup-notification
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/371
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/include/startup-notification-1.0/libsn/sn-common.h
+file path=usr/include/startup-notification-1.0/libsn/sn-launchee.h
+file path=usr/include/startup-notification-1.0/libsn/sn-launcher.h
+file path=usr/include/startup-notification-1.0/libsn/sn-monitor.h
+file path=usr/include/startup-notification-1.0/libsn/sn-util.h
+file path=usr/include/startup-notification-1.0/libsn/sn.h
+link path=usr/lib/$(MACH64)/libstartup-notification-1.so \
+    target=libstartup-notification-1.so.0.0.0
+link path=usr/lib/$(MACH64)/libstartup-notification-1.so.0 \
+    target=libstartup-notification-1.so.0.0.0
+file path=usr/lib/$(MACH64)/libstartup-notification-1.so.0.0.0
+file path=usr/lib/$(MACH64)/pkgconfig/libstartup-notification-1.0.pc
+link path=usr/lib/libstartup-notification-1.so \
+    target=libstartup-notification-1.so.0.0.0
+link path=usr/lib/libstartup-notification-1.so.0 \
+    target=libstartup-notification-1.so.0.0.0
+file path=usr/lib/libstartup-notification-1.so.0.0.0
+file path=usr/lib/pkgconfig/libstartup-notification-1.0.pc
+license COPYING license=LGPLv2
+# Prior to s12_112, this library was in the gnome-libs package, so we depend
+# on a version of that new enough to avoid conflicts
+depend type=optional fmri=pkg:/library/gnome/[email protected]

--- a/components/desktop/thunderbird/Makefile	Sun Oct 23 21:19:26 2016 -0700
+++ b/components/desktop/thunderbird/Makefile	Fri Oct 28 14:57:30 2016 -0700
@@ -240,7 +240,9 @@
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
 REQUIRED_PACKAGES += library/desktop/gtk2
 REQUIRED_PACKAGES += library/desktop/pango
+REQUIRED_PACKAGES += library/desktop/startup-notification
 REQUIRED_PACKAGES += library/glib2
+# Remove once all build machines have library/desktop/startup-notification:
 REQUIRED_PACKAGES += library/gnome/gnome-libs
 REQUIRED_PACKAGES += library/graphics/pixman
 REQUIRED_PACKAGES += library/libevent

--- a/components/meta-packages/history/history	Sun Oct 23 21:19:26 2016 -0700
+++ b/components/meta-packages/history/history	Fri Oct 28 14:57:30 2016 -0700
@@ -929,6 +929,7 @@
 library/desktop/gtk2/[email protected],5.11-0.175.0.0.0.0.0 incorporate=consolidation/desktop/gnome-incorporation
 library/desktop/[email protected],5.11-0.175.0.0.0.0.0
 library/desktop/xdg/[email protected]
+library/gnome/[email protected],5.12-5.12.0.0.0.112.0 library/desktop/startup-notification incorporate=consolidation/desktop/gnome-incorporation
 library/gnome/print/[email protected],5.11-0.175.0.0.0.0.0
 library/gnome/print/gnome-print/[email protected],5.11-0.175.0.0.0.0.0
 library/[email protected],5.12-5.12.0.0.0.90.0

--- a/components/meta-packages/incorporation-cache	Sun Oct 23 21:19:26 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Fri Oct 28 14:57:30 2016 -0700
@@ -63,7 +63,6 @@
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
-consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/[email protected]