--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libcanberra/Makefile	Sun Jun 12 20:55:57 2016 -0700
@@ -0,0 +1,76 @@
+#
+# 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=		libcanberra
+COMPONENT_VERSION=	0.30
+COMPONENT_PROJECT_URL=	http://0pointer.de/lennart/projects/libcanberra/
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
+COMPONENT_ARCHIVE_HASH=	\
+	sha256:c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72
+COMPONENT_ARCHIVE_URL=	http://0pointer.de/lennart/projects/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	gnome/libraries
+
+TPNO=			24163
+
+TEST_TARGET= $(NO_TESTS)
+
+# Needs updated glib2, not available on S11.
+ifeq ($(BUILD_TYPE), evaluation)
+BUILD_32_and_64=
+INSTALL_32_and_64=
+PUBLISH_STAMP=
+endif
+
+include $(WS_MAKE_RULES)/common.mk
+
+# configure falsely believes ld(1) supports --gc-sections because gcc accepts
+# the flag.
+CONFIGURE_ENV += cc_cv_LDFLAGS__Wl___gc_sections=no
+
+CONFIGURE_OPTIONS += --enable-gstreamer
+# For documentation.
+CONFIGURE_OPTIONS += --enable-lynx
+CONFIGURE_OPTIONS += --enable-largefile
+CONFIGURE_OPTIONS += --enable-oss
+CONFIGURE_OPTIONS += --enable-pulse
+CONFIGURE_OPTIONS += --enable-gtk
+CONFIGURE_OPTIONS += --enable-gtk3
+CONFIGURE_OPTIONS += --with-pic
+
+REQUIRED_PACKAGES += codec/ogg-vorbis
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += developer/vala
+REQUIRED_PACKAGES += library/audio/pulseaudio
+REQUIRED_PACKAGES += library/desktop/gstreamer-1
+REQUIRED_PACKAGES += library/desktop/gtk2
+REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += web/browser/lynx
+REQUIRED_PACKAGES += x11/library/libx11

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libcanberra/libcanberra.p5m	Sun Jun 12 20:55:57 2016 -0700
@@ -0,0 +1,97 @@
+#
+# 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/xdg/libcanberra@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Event Sound API Using XDG Sound Theming Specification"
+set name=pkg.description \
+    value="libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops, such as GNOME. It comes with several backends (ALSA, PulseAudio, OSS, GStreamer, null) and is designed to be portable."
+set name=com.oracle.info.description value=$(COMPONENT_NAME)
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Multimedia 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/383
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/bin/$(MACH64)/canberra-gtk-play
+link path=usr/bin/canberra-gtk-play target=$(MACH64)/canberra-gtk-play
+file path=usr/include/canberra-gtk.h
+file path=usr/include/canberra.h
+file path=usr/lib/$(MACH64)/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
+file path=usr/lib/$(MACH64)/gtk-2.0/modules/libcanberra-gtk-module.so
+link path=usr/lib/$(MACH64)/gtk-3.0/modules/libcanberra-gtk-module.so \
+    target=libcanberra-gtk3-module.so
+file path=usr/lib/$(MACH64)/gtk-3.0/modules/libcanberra-gtk3-module.so
+file path=usr/lib/$(MACH64)/libcanberra-$(COMPONENT_VERSION)/libcanberra-gstreamer.so
+file path=usr/lib/$(MACH64)/libcanberra-$(COMPONENT_VERSION)/libcanberra-multi.so
+file path=usr/lib/$(MACH64)/libcanberra-$(COMPONENT_VERSION)/libcanberra-null.so
+file path=usr/lib/$(MACH64)/libcanberra-$(COMPONENT_VERSION)/libcanberra-oss.so
+file path=usr/lib/$(MACH64)/libcanberra-$(COMPONENT_VERSION)/libcanberra-pulse.so
+link path=usr/lib/$(MACH64)/libcanberra-gtk.so target=libcanberra-gtk.so.0.1.9
+link path=usr/lib/$(MACH64)/libcanberra-gtk.so.0 target=libcanberra-gtk.so.0.1.9
+file path=usr/lib/$(MACH64)/libcanberra-gtk.so.0.1.9
+link path=usr/lib/$(MACH64)/libcanberra-gtk3.so target=libcanberra-gtk3.so.0.1.9
+link path=usr/lib/$(MACH64)/libcanberra-gtk3.so.0 \
+    target=libcanberra-gtk3.so.0.1.9
+file path=usr/lib/$(MACH64)/libcanberra-gtk3.so.0.1.9
+link path=usr/lib/$(MACH64)/libcanberra.so target=libcanberra.so.0.2.5
+link path=usr/lib/$(MACH64)/libcanberra.so.0 target=libcanberra.so.0.2.5
+file path=usr/lib/$(MACH64)/libcanberra.so.0.2.5
+file path=usr/lib/$(MACH64)/pkgconfig/libcanberra-gtk.pc
+file path=usr/lib/$(MACH64)/pkgconfig/libcanberra-gtk3.pc
+file path=usr/lib/$(MACH64)/pkgconfig/libcanberra.pc
+file path=usr/lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
+file path=usr/lib/gtk-2.0/modules/libcanberra-gtk-module.so
+link path=usr/lib/gtk-3.0/modules/libcanberra-gtk-module.so \
+    target=libcanberra-gtk3-module.so
+file path=usr/lib/gtk-3.0/modules/libcanberra-gtk3-module.so
+file path=usr/lib/libcanberra-$(COMPONENT_VERSION)/libcanberra-gstreamer.so
+file path=usr/lib/libcanberra-$(COMPONENT_VERSION)/libcanberra-multi.so
+file path=usr/lib/libcanberra-$(COMPONENT_VERSION)/libcanberra-null.so
+file path=usr/lib/libcanberra-$(COMPONENT_VERSION)/libcanberra-oss.so
+file path=usr/lib/libcanberra-$(COMPONENT_VERSION)/libcanberra-pulse.so
+link path=usr/lib/libcanberra-gtk.so target=libcanberra-gtk.so.0.1.9
+link path=usr/lib/libcanberra-gtk.so.0 target=libcanberra-gtk.so.0.1.9
+file path=usr/lib/libcanberra-gtk.so.0.1.9
+link path=usr/lib/libcanberra-gtk3.so target=libcanberra-gtk3.so.0.1.9
+link path=usr/lib/libcanberra-gtk3.so.0 target=libcanberra-gtk3.so.0.1.9
+file path=usr/lib/libcanberra-gtk3.so.0.1.9
+link path=usr/lib/libcanberra.so target=libcanberra.so.0.2.5
+link path=usr/lib/libcanberra.so.0 target=libcanberra.so.0.2.5
+file path=usr/lib/libcanberra.so.0.2.5
+file path=usr/lib/pkgconfig/libcanberra-gtk.pc
+file path=usr/lib/pkgconfig/libcanberra-gtk3.pc
+file path=usr/lib/pkgconfig/libcanberra.pc
+file path=usr/share/doc/libcanberra/README
+file path=usr/share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
+file path=usr/share/gnome/autostart/libcanberra-login-sound.desktop
+file path=usr/share/gnome/shutdown/libcanberra-logout-sound.sh
+file path=usr/share/vala/vapi/libcanberra-gtk.vapi
+file path=usr/share/vala/vapi/libcanberra.vapi
+license LGPL license=LGPLv2.1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libcanberra/patches/01-glib-deprecated.patch	Sun Jun 12 20:55:57 2016 -0700
@@ -0,0 +1,16 @@
+g_type_init() is deprecated and is no longer necessary after glib >= 2.35.
+
+XXX file upstream bug
+
+--- libcanberra-0.30/src/canberra-gtk-play.c	2012-09-24 17:21:07.000000000 -0700
++++ libcanberra-0.30/src/canberra-gtk-play.c	2015-07-01 21:21:08.275924571 -0700
+@@ -133,7 +133,9 @@
+ 
+         setlocale(LC_ALL, "");
+ 
++#if !GLIB_CHECK_VERSION(2,35,0)
+         g_type_init();
++#endif
+ 
+         ca_proplist_create(&proplist);
+ 

--- a/components/meta-packages/incorporation-cache	Sun Jun 12 20:44:00 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Sun Jun 12 20:55:57 2016 -0700
@@ -45,7 +45,6 @@
 # to the build or replaced by a package rename/obsolete in the history file.
 #
 consolidation/desktop/gnome-incorporation:desktop/xdg/[email protected]
-consolidation/desktop/gnome-incorporation:gnome/accessibility/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/config/gconf/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/config/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/file-manager/[email protected]
@@ -60,7 +59,6 @@
 consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
-consolidation/desktop/gnome-incorporation:image/[email protected]
 consolidation/desktop/gnome-incorporation:library/audio/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/c++/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/c++/[email protected]
@@ -69,8 +67,6 @@
 consolidation/desktop/gnome-incorporation:library/desktop/clutter/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
-consolidation/desktop/gnome-incorporation:library/desktop/gtk3/[email protected]
-consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
@@ -82,8 +78,6 @@
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/search/tracker/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/search/[email protected]
-consolidation/desktop/gnome-incorporation:library/desktop/xdg/[email protected]
-consolidation/desktop/gnome-incorporation:library/[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]
@@ -147,8 +141,6 @@
 consolidation/userland/userland-incorporation:gnome/speech/gnome-speech/driver/[email protected]
 consolidation/userland/userland-incorporation:gnome/theme/background/[email protected]
 consolidation/userland/userland-incorporation:gnome/theme/background/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/background/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/background/[email protected]
 consolidation/userland/userland-incorporation:gnome/theme/[email protected]
 consolidation/userland/userland-incorporation:gnome/theme/cursor/[email protected]
 consolidation/userland/userland-incorporation:gnome/theme/cursor/[email protected]
@@ -167,7 +159,6 @@
 consolidation/userland/userland-incorporation:image/viewer/eog/[email protected]
 consolidation/userland/userland-incorporation:image/viewer/[email protected]
 consolidation/userland/userland-incorporation:library/accessibility/[email protected]
-consolidation/userland/userland-incorporation:library/audio/[email protected]
 consolidation/userland/userland-incorporation:library/c++/[email protected]
 consolidation/userland/userland-incorporation:library/c++/[email protected]
 consolidation/userland/userland-incorporation:library/desktop/[email protected]
@@ -179,7 +170,6 @@
 consolidation/userland/userland-incorporation:library/libproxy/[email protected]
 consolidation/userland/userland-incorporation:library/libproxy/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
-consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/media-player/[email protected]
 consolidation/userland/userland-incorporation:library/musicbrainz/[email protected]