--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libxklavier/Makefile	Mon Oct 03 12:09:09 2016 -0700
@@ -0,0 +1,63 @@
+#
+# 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) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS=		32_and_64
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		libxklavier
+COMPONENT_VERSION=	5.0
+COMPONENT_PROJECT_URL=	http://freedesktop.org/wiki/Software/LibXklavier/
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:30e572d3bac0f4c8ba0098dd63527a789cb85649bd4c8d5ffd8d1f34306e36d1
+COMPONENT_ARCHIVE_URL=	https://sourceforge.net/projects/gswitchit/files/libxklavier/5.0/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	gnome/libraries
+
+TPNO=			3429
+
+# Tests do not work in userland framework yet
+TEST_TARGET = $(SKIP_TEST)
+
+include $(WS_MAKE_RULES)/common.mk
+
+COMPONENT_PREP_ACTION += (cd $(@D) ; autoreconf -fiv )
+
+# Need to ensure GNU cp is first in $PATH to avoid
+# "cp: illegal option -- u" errors installing the docs
+CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
+
+CONFIGURE_OPTIONS += --disable-static
+CONFIGURE_OPTIONS += --enable-shared
+CONFIGURE_OPTIONS += --enable-gtk-doc
+CONFIGURE_OPTIONS += --enable-xkb-support
+
+REQUIRED_PACKAGES += data/iso-codes
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += x11/keyboard/data-xkb
+REQUIRED_PACKAGES += x11/keyboard/xkbcomp
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxi
+REQUIRED_PACKAGES += x11/library/libxkbfile

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libxklavier/libxklavier.p5m	Mon Oct 03 12:09:09 2016 -0700
@@ -0,0 +1,89 @@
+#
+# 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) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform dir file link hardlink path=usr/share/gtk-doc/.* -> \
+    default facet.devel all>
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+
+
+set name=pkg.fmri \
+    value=pkg:/library/desktop/libxklavier@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="libXklavier XKB utility library"
+set name=com.oracle.info.description value="libXklavier library"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
+set name=info.repository-url value=git://anongit.freedesktop.org/libxklavier
+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/2009/483
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+
+file path=usr/include/libxklavier/xkl-enum-types.h
+file path=usr/include/libxklavier/xkl_config_item.h
+file path=usr/include/libxklavier/xkl_config_rec.h
+file path=usr/include/libxklavier/xkl_config_registry.h
+file path=usr/include/libxklavier/xkl_engine.h
+file path=usr/include/libxklavier/xkl_engine_marshal.h
+file path=usr/include/libxklavier/xklavier.h
+link path=usr/lib/$(MACH64)/libxklavier.so target=libxklavier.so.16.0.0
+link path=usr/lib/$(MACH64)/libxklavier.so.16 target=libxklavier.so.16.0.0
+file path=usr/lib/$(MACH64)/libxklavier.so.16.0.0
+file path=usr/lib/$(MACH64)/pkgconfig/libxklavier.pc
+link path=usr/lib/libxklavier.so target=libxklavier.so.16.0.0
+link path=usr/lib/libxklavier.so.16 target=libxklavier.so.16.0.0
+file path=usr/lib/libxklavier.so.16.0.0
+file path=usr/lib/pkgconfig/libxklavier.pc
+file path=usr/share/gtk-doc/html/libxklavier/XklConfigItem.html
+file path=usr/share/gtk-doc/html/libxklavier/XklConfigRec.html
+file path=usr/share/gtk-doc/html/libxklavier/XklConfigRegistry.html
+file path=usr/share/gtk-doc/html/libxklavier/ch01.html
+file path=usr/share/gtk-doc/html/libxklavier/ch02.html
+file path=usr/share/gtk-doc/html/libxklavier/home.png
+file path=usr/share/gtk-doc/html/libxklavier/index.html
+file path=usr/share/gtk-doc/html/libxklavier/index.sgml
+file path=usr/share/gtk-doc/html/libxklavier/left-insensitive.png
+file path=usr/share/gtk-doc/html/libxklavier/left.png
+file path=usr/share/gtk-doc/html/libxklavier/libxklavier-xkl-engine.html
+file path=usr/share/gtk-doc/html/libxklavier/libxklavier-xklavier.html
+file path=usr/share/gtk-doc/html/libxklavier/libxklavier.devhelp2
+file path=usr/share/gtk-doc/html/libxklavier/right-insensitive.png
+file path=usr/share/gtk-doc/html/libxklavier/right.png
+file path=usr/share/gtk-doc/html/libxklavier/style.css
+file path=usr/share/gtk-doc/html/libxklavier/up-insensitive.png
+file path=usr/share/gtk-doc/html/libxklavier/up.png
+
+
+license COPYING.LIB license=LGPLv2
+
+# code in xklavier_config_xkb.c execs xkbcomp
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/xkbcomp
+# code in xklavier_config_xkb.c references /usr/share/X11/xkb/rules/base
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/share/X11/xkb/rules/base
+# code in xklavier_config_iso.c parses the data files in iso-codes
+depend type=require fmri=pkg:/data/iso-codes

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libxklavier/patches/libxklavier-01-compile-makefile.patch	Mon Oct 03 12:09:09 2016 -0700
@@ -0,0 +1,55 @@
+Existing set of patches from the desktop gate for Solaris
+Not suitable for upstream
+ 
+--- libxklavier-5.0.orig/tests/Makefile.am	2010-06-01 15:52:32.355954665 +0200
++++ libxklavier-5.0/tests/Makefile.am	2010-06-01 15:54:24.239711266 +0200
+@@ -4,7 +4,7 @@
+ 
+ test_monitor_SOURCES=test_monitor.c
+ 
+-AM_CFLAGS=-Wall -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
++AM_CFLAGS=-I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
+ 
+ LDADD=$(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) $(GLIB_LIBS)
+ 
+--- libxklavier-5.0.orig/tests/Makefile.in	2010-06-01 15:52:32.356253578 +0200
++++ libxklavier-5.0/tests/Makefile.in	2010-06-01 15:54:33.471616942 +0200
+@@ -210,7 +210,7 @@
+ top_srcdir = @top_srcdir@
+ test_config_SOURCES = test_config.c
+ test_monitor_SOURCES = test_monitor.c
+-AM_CFLAGS = -Wall -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
++AM_CFLAGS = -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
+ LDADD = $(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) $(GLIB_LIBS)
+ all: all-am
+ 
+--- libxklavier-5.0.orig/libxklavier/Makefile.am	2009-06-28 15:07:27.000000000 +0200
++++ libxklavier-5.0/libxklavier/Makefile.am	2012-06-05 14:09:29.819059363 +0200
+@@ -15,12 +15,13 @@
+   ENABLE_XMODMAP_SUPPORT_CFLAG = -DDISABLE_XMODMAP_SUPPORT=1
+ endif
+ 
+-AM_CFLAGS=-Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
++AM_CFLAGS=-DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+   -I. -I$(top_srcdir) $(X_CFLAGS) \
+   $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) \
+   $(LIBXKBFILE_PRESENT_CFLAG) \
+   $(ENABLE_XKB_SUPPORT_CFLAG) \
+-  $(ENABLE_XMODMAP_SUPPORT_CFLAG)
++  $(ENABLE_XMODMAP_SUPPORT_CFLAG) \
++  -DLOCALEDIR=\"$(datadir)/locale\"
+ 
+ lib_LTLIBRARIES = libxklavier.la
+ noinst_HEADERS = xklavier_private.h xklavier_private_xkb.h xklavier_private_xmm.h
+
+--- libxklavier-5.0.orig/libxklavier/Makefile.in	2010-06-01 16:01:01.278962526 +0200
++++ libxklavier-5.0/libxklavier/Makefile.in	2010-06-01 16:01:49.876322985 +0200
+@@ -224,7 +224,7 @@
+ @ENABLE_XKB_SUPPORT_TRUE@ENABLE_XKB_SUPPORT_CFLAG = -DENABLE_XKB_SUPPORT=1
+ @ENABLE_XMODMAP_SUPPORT_FALSE@ENABLE_XMODMAP_SUPPORT_CFLAG = -DDISABLE_XMODMAP_SUPPORT=1
+ @ENABLE_XMODMAP_SUPPORT_TRUE@ENABLE_XMODMAP_SUPPORT_CFLAG = -DENABLE_XMODMAP_SUPPORT=1
+-AM_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
++AM_CFLAGS = -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+   -I. -I$(top_srcdir) $(X_CFLAGS) \
+   $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) \
+   $(LIBXKBFILE_PRESENT_CFLAG) \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libxklavier/patches/libxklavier-02-xklavier_config.patch	Mon Oct 03 12:09:09 2016 -0700
@@ -0,0 +1,14 @@
+Existing set of patches from the desktop gate for Solaris
+Not suitable for upstream
+
+--- libxklavier-5.0.orig/libxklavier/xklavier_config.c	2009-06-24 13:08:38.000000000 +0200
++++ libxklavier-5.0/libxklavier/xklavier_config.c	2012-06-05 14:10:30.908824990 +0200
+@@ -1049,6 +1049,7 @@
+ 	object_class->set_property = xkl_config_registry_set_property;
+ 	object_class->get_property = xkl_config_registry_get_property;
+ 
++	bindtextdomain(XKB_DOMAIN, LOCALEDIR);
+ 	bind_textdomain_codeset(XKB_DOMAIN, "UTF-8");
+ 
+ 	engine_param_spec = g_param_spec_object("engine",
+

--- a/components/meta-packages/incorporation-cache	Sat Oct 01 21:55:12 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Mon Oct 03 12:09:09 2016 -0700
@@ -44,7 +44,6 @@
 # Userland gate, and will be removed as the packages are either integrated
 # 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/config/gconf/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/config/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/file-manager/[email protected]
@@ -63,7 +62,6 @@
 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]
 consolidation/desktop/gnome-incorporation:library/desktop/search/tracker/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/search/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
@@ -77,10 +75,6 @@
 consolidation/desktop/gnome-incorporation:library/python/[email protected]
 consolidation/desktop/gnome-incorporation:library/python/[email protected]
 consolidation/userland/userland-incorporation:data/docbook/[email protected]
-consolidation/userland/userland-incorporation:data/docbook/[email protected]
-consolidation/userland/userland-incorporation:data/docbook/[email protected]
-consolidation/userland/userland-incorporation:data/[email protected]
-consolidation/userland/userland-incorporation:data/[email protected]
 consolidation/userland/userland-incorporation:data/[email protected]
 consolidation/userland/userland-incorporation:desktop/archive-manager/[email protected]
 consolidation/userland/userland-incorporation:desktop/cd-burning/[email protected]