# HG changeset patch
# User Niveditha Rau <Niveditha.Rau@Oracle.COM>
# Date 1477378841 25200
# Node ID 8563a121a8549b1f785b9cf55e1a452db2c824f6
# Parent  8908c34de05d2ab86364c6f5e9085694c247acb5
23245635 Deliver gnome-initial-setup 3.18.0 in Solaris

diff -r 8908c34de05d -r 8563a121a854 components/gnome/gnome-initial-setup/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gnome-initial-setup/Makefile	Tue Oct 25 00:00:41 2016 -0700
@@ -0,0 +1,73 @@
+#
+# 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= 64
+# Uses gcc-specific options (e.g. -Wall) which cause Studio build failures.
+COMPILER= gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		gnome-initial-setup
+COMPONENT_VERSION=	3.18.0
+COMPONENT_ARCHIVE_HASH= \
+	sha256:8fee9de41677c44318bb1c3bade2b6c9156698ad1a06e63aa1c15e3ab1bee729
+COMPONENT_BUGDB=	gnome/session
+
+TPNO=			25848
+
+TEST_TARGET= $(NO_TESTS)
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# Regenerate configure after patches modify configure.ac & Makefile.am files
+COMPONENT_PREP_ACTION += ( cd $(@D); autoreconf -fiv);
+
+# Assumes GNU msgfmt in PATH.
+CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
+COMPONENT_BUILD_ENV += PATH="$(GNUBIN):$(PATH)"
+
+# gnome-initial-setup/pages/account/um-utils.c uses UT_NAMESIZE from the Linux
+# <utmp.h> - map it to the equivalent value in the Solaris <utmp.h>
+CPPFLAGS += -DUT_NAMESIZE=_UTMP_USER_LEN
+
+REQUIRED_PACKAGES += gnome/gsettings-desktop-schemas
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
+REQUIRED_PACKAGES += library/desktop/geoclue
+REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/desktop/libgweather
+REQUIRED_PACKAGES += library/desktop/librest
+REQUIRED_PACKAGES += library/desktop/pango
+REQUIRED_PACKAGES += library/desktop/webkitgtk4
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/gnome/gnome-desktop
+REQUIRED_PACKAGES += library/gnome/gnome-online-accounts
+REQUIRED_PACKAGES += library/json-glib
+REQUIRED_PACKAGES += security/kerberos-5
+REQUIRED_PACKAGES += system/display-manager/gdm
+REQUIRED_PACKAGES += system/input-method/ibus
+REQUIRED_PACKAGES += system/library/accountsservice
+REQUIRED_PACKAGES += system/library/fontconfig
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/library/polkit
diff -r 8908c34de05d -r 8563a121a854 components/gnome/gnome-initial-setup/gnome-initial-setup.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gnome-initial-setup/gnome-initial-setup.p5m	Tue Oct 25 00:00:41 2016 -0700
@@ -0,0 +1,127 @@
+#
+# 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.
+#
+
+set name=pkg.fmri \
+    value=pkg:/gnome/gnome-initial-setup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="gnome-initial-setup provides a simple and easy way to prepare a new system for running Gnome"
+set name=com.oracle.info.description value=gnome-initial-setup
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:Desktop (GNOME)/Sessions"
+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/323
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=etc/xdg/autostart/gnome-initial-setup-copy-worker.desktop
+file path=etc/xdg/autostart/gnome-initial-setup-first-login.desktop
+file path=etc/xdg/autostart/gnome-welcome-tour.desktop
+file path=usr/lib/$(MACH64)/gnome-initial-setup mode=0555
+file path=usr/lib/$(MACH64)/gnome-initial-setup-copy-worker mode=0555
+file path=usr/lib/$(MACH64)/gnome-welcome-tour mode=0555
+file path=usr/share/gdm/greeter/applications/gnome-initial-setup.desktop
+file path=usr/share/gdm/greeter/applications/setup-shell.desktop
+file path=usr/share/gnome-session/sessions/gnome-initial-setup.session
+file path=usr/share/gnome-shell/modes/initial-setup.json
+file path=usr/share/locale/af/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/an/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ar/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/as/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/be/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/bg/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/bn_IN/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/bs/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ca/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ca@valencia/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/cs/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/da/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/de/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/el/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/eo/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/es/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/et/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/eu/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/fa/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/fi/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/fr/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/fur/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ga/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/gl/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/gu/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/he/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/hi/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/hu/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ia/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/id/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/is/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/it/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ja/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/kk/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/kn/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ko/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/lt/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/lv/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ml/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/mr/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/nb/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ne/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/nl/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/oc/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/or/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/pa/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/pl/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/pt/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ro/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ru/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/sk/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/sl/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/sr/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/sr@latin/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/sv/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ta/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/te/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/tg/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/th/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/tr/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/ug/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/uk/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/vi/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/gnome-initial-setup.mo
+file path=usr/share/polkit-1/rules.d/20-gnome-initial-setup.rules
+license COPYING license=GPLv2
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=org.freedesktop.GeoClue2.service \
+    pkg.debug.depend.path=usr/share/dbus-1/system-services \
+    pkg.debug.depend.reason=pages/timezone/gis-timezone-page.c
+depend type=require fmri=__TBD \
+    pkg.debug.depend.reason=pages/privacy/gis-privacy-page.c \
+    pkg.tmp.gsettings-schema=org.gnome.desktop.privacy
+depend type=require fmri=__TBD \
+    pkg.debug.depend.reason=pages/privacy/gis-privacy-page.c \
+    pkg.tmp.gsettings-schema=org.gnome.system.location
diff -r 8908c34de05d -r 8563a121a854 components/gnome/gnome-initial-setup/patches/01-disable-unported-modules.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gnome-initial-setup/patches/01-disable-unported-modules.patch	Tue Oct 25 00:00:41 2016 -0700
@@ -0,0 +1,75 @@
+Remove modules that require software not yet ported to Solaris, such as
+Network Manager.
+
+Even if we ported all their dependencies, it's not clear we want these modules,
+since they are focused on setting up a new machine, not a new user - we have
+our initial user creation & network configuration handled by our OS install
+software instead.
+
+Not appropriate for upstream.
+
+--- gnome-initial-setup-3.18.0/configure.ac	Mon Nov 30 20:11:09 2015
++++ gnome-initial-setup-3.18.0/configure.ac	Mon Nov 30 20:12:09 2015
+@@ -29,10 +29,6 @@
+ GEOCLUE_REQUIRED_VERSION=2.1.2
+ 
+ PKG_CHECK_MODULES(INITIAL_SETUP,
+-                  NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
+-                  libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
+-                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
+-                  libnm-gtk >= $NETWORK_MANAGER_REQUIRED_VERSION
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+                   accountsservice
+                   gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+@@ -48,7 +44,6 @@
+                   rest-0.7
+                   json-glib-1.0
+ 		  libsecret-1
+-                  pwquality
+                   webkit2gtk-4.0)
+ 
+ GEOCLUE_DBUS_INTERFACE_XML=`pkg-config --variable=dbus_interface geoclue-2.0`
+
+--- gnome-initial-setup-3.18.0/gnome-initial-setup/pages/Makefile.am	Tue Dec  1 17:41:00 2015
++++ gnome-initial-setup-3.18.0/gnome-initial-setup/pages/Makefile.am	Tue Dec  1 17:41:06 2015
+@@ -4,10 +4,7 @@
+ 	region \
+ 	keyboard \
+ 	eulas \
+-	network \
+ 	timezone \
+ 	privacy \
+ 	goa \
+-	account \
+-	password \
+ 	summary
+--- gnome-initial-setup-3.18.0/gnome-initial-setup/Makefile.am	Tue Dec  1 19:06:50 2015
++++ gnome-initial-setup-3.18.0/gnome-initial-setup/Makefile.am	Tue Dec  1 19:05:01 2015
+@@ -35,12 +35,9 @@
+ 	pages/region/libgisregion.la \
+ 	pages/keyboard/libgiskeyboard.la \
+ 	pages/eulas/libgiseulas.la \
+-	pages/network/libgisnetwork.la \
+ 	pages/timezone/libgistimezone.la \
+ 	pages/privacy/libgisprivacy.la \
+ 	pages/goa/libgisgoa.la \
+-	pages/account/libgisaccount.la \
+-	pages/password/libgispassword.la \
+ 	pages/summary/libgissummary.la \
+ 	$(INITIAL_SETUP_LIBS) \
+ 	-lm
+--- gnome-initial-setup-3.18.0/gnome-initial-setup/gnome-initial-setup.c	Wed Dec  2 09:17:11 2015
++++ gnome-initial-setup-3.18.0/gnome-initial-setup/gnome-initial-setup.c	Wed Dec  2 09:17:29 2015
+@@ -65,12 +65,9 @@
+   /* PAGE (region,   FALSE), */
+   PAGE (keyboard, FALSE),
+   PAGE (eula,     FALSE),
+-  PAGE (network,  FALSE),
+   PAGE (privacy,  FALSE),
+   PAGE (timezone, TRUE),
+   PAGE (goa,      FALSE),
+-  PAGE (account,  TRUE),
+-  PAGE (password, TRUE),
+   PAGE (summary,  FALSE),
+   { NULL },
+ };
diff -r 8908c34de05d -r 8563a121a854 components/gnome/gnome-initial-setup/patches/02-solaris-kerberos.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gnome-initial-setup/patches/02-solaris-kerberos.patch	Tue Oct 25 00:00:41 2016 -0700
@@ -0,0 +1,15 @@
+Adjust Kerberos include path to work with Solaris header layout.
+
+Need to convert to portable autoconf check & submit that upstream.
+
+--- gnome-initial-setup-3.18.0/gnome-initial-setup/pages/account/um-realm-manager.c	Tue Dec  1 18:13:45 2015
++++ gnome-initial-setup-3.18.0/gnome-initial-setup/pages/account/um-realm-manager.c	Tue Dec  1 18:14:30 2015
+@@ -23,7 +23,7 @@
+ 
+ #include "um-realm-manager.h"
+ 
+-#include <krb5/krb5.h>
++#include <kerberosv5/krb5.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>