Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23245292 Move gconf to Userland and update to 3.2.6
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Fri, 28 Oct 2016 16:33:42 -0700
changeset 7211 d531e9fbb2a8
parent 7210 66f170dce8c5
child 7212 d8800d9f8518
23245292 Move gconf to Userland and update to 3.2.6 PSARC/2016/543 GConf 3.2.6 16390628 with the inclusion of gtk3, a gsettings backend for gconf needs to be installed
components/gnome/gconf/Makefile file | annotate | diff | comparison | revisions
components/gnome/gconf/gconf.p5m file | annotate | diff | comparison | revisions
components/meta-packages/history/history file | annotate | diff | comparison | revisions
components/meta-packages/incorporation-cache file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gconf/Makefile	Fri Oct 28 16:33:42 2016 -0700
@@ -0,0 +1,71 @@
+#
+# 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_and_32
+COMPILER =      	gcc
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		GConf
+COMPONENT_VERSION=	3.2.6
+COMPONENT_PROJECT_URL=	https://projects.gnome.org/gconf/
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
+COMPONENT_BUGDB=	gnome/libraries
+
+TPNO=			26337
+
+# While there is a tests subdirectory, it's not setup for automated use
+# on a headless system, and isn't even built unless you manually do it.
+TEST_TARGET = $(NO_TESTS)
+
+# Needs gobject-introspection, not available on S11.
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+CONFIGURE_OPTIONS += --disable-defaults-service
+CONFIGURE_OPTIONS += --enable-gsettings_backend
+CONFIGURE_OPTIONS += --disable-orbit
+CONFIGURE_OPTIONS += --with-gtk=3.0
+CONFIGURE_OPTIONS += --without-openldap
+CONFIGURE_OPTIONS += --disable-static
+CONFIGURE_OPTIONS += --enable-shared
+
+# Assumes GNU xgettext in PATH
+CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)
+
+# Need to convert "#! /usr/bin/env python" to actual path for pkgdepend to work
+PYTHON_SCRIPTS += $(PROTO_DIR)$(CONFIGURE_BINDIR.$(BITS))/gsettings-schema-convert
+
+PKG_MACROS += PYVER="$(PYTHON_VERSION)"
+
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/python/lxml-27
+REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += system/library/libdbus
+REQUIRED_PACKAGES += system/library/libdbus-glib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gconf/gconf.p5m	Fri Oct 28 16:33:42 2016 -0700
@@ -0,0 +1,173 @@
+#
+# 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 file path=usr.*/man/.+ -> \
+    default mangler.man.stability "obsolete pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/gnome/config/gconf@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="GNOME configuration framework (obsolete)"
+set name=com.oracle.info.description value=GConf
+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=LSARC/2002/146 value=LSARC/2008/510 \
+    value=PSARC/2016/543
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+
+file path=etc/gconf/2/path
+dir  path=etc/gconf/gconf.xml.defaults
+dir  path=etc/gconf/gconf.xml.mandatory
+file path=etc/xdg/autostart/gsettings-data-convert.desktop
+file path=usr/bin/gconf-merge-tree
+file path=usr/bin/gconftool-2
+file path=usr/bin/gsettings-data-convert
+file path=usr/bin/gsettings-schema-convert \
+    pkg.depend.runpath=$PKGDEPEND_RUNPATH:/usr/lib/python$(PYVER)/xml/etree
+file path=usr/include/gconf/2/gconf/gconf-changeset.h
+file path=usr/include/gconf/2/gconf/gconf-client.h
+file path=usr/include/gconf/2/gconf/gconf-engine.h
+file path=usr/include/gconf/2/gconf/gconf-enum-types.h
+file path=usr/include/gconf/2/gconf/gconf-error.h
+file path=usr/include/gconf/2/gconf/gconf-listeners.h
+file path=usr/include/gconf/2/gconf/gconf-schema.h
+file path=usr/include/gconf/2/gconf/gconf-value.h
+file path=usr/include/gconf/2/gconf/gconf.h
+file path=usr/lib/$(MACH64)/GConf/2/libgconfbackend-oldxml.so
+file path=usr/lib/$(MACH64)/GConf/2/libgconfbackend-xml.so
+file path=usr/lib/$(MACH64)/gconfd-2
+file path=usr/lib/$(MACH64)/gio/modules/libgsettingsgconfbackend.so
+file path=usr/lib/$(MACH64)/girepository-1.0/GConf-2.0.typelib
+link path=usr/lib/$(MACH64)/libgconf-2.so target=libgconf-2.so.4.1.5
+link path=usr/lib/$(MACH64)/libgconf-2.so.4 target=libgconf-2.so.4.1.5
+file path=usr/lib/$(MACH64)/libgconf-2.so.4.1.5
+file path=usr/lib/$(MACH64)/pkgconfig/gconf-2.0.pc
+file path=usr/lib/GConf/2/libgconfbackend-oldxml.so
+file path=usr/lib/GConf/2/libgconfbackend-xml.so
+file path=usr/lib/gconfd-2
+file path=usr/lib/gio/modules/libgsettingsgconfbackend.so
+file path=usr/lib/girepository-1.0/GConf-2.0.typelib
+link path=usr/lib/libgconf-2.so target=libgconf-2.so.4.1.5
+link path=usr/lib/libgconf-2.so.4 target=libgconf-2.so.4.1.5
+file path=usr/lib/libgconf-2.so.4.1.5
+file path=usr/lib/pkgconfig/gconf-2.0.pc
+file path=usr/share/aclocal/gconf-2.m4
+file path=usr/share/dbus-1/services/org.gnome.GConf.service
+file path=usr/share/gir-1.0/GConf-2.0.gir
+file path=usr/share/locale/am/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ar/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/as/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ast/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/az/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/be/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/bg/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/bn/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/bn_IN/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/bs/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ca/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ca@valencia/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/cs/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/cy/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/da/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/de/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/dz/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/el/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/en@shaw/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/en_CA/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/eo/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/es/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/et/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/eu/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/fa/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/fi/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/fr/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ga/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/gl/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/gu/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/he/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/hi/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/hr/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/hu/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/hy/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/id/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/is/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/it/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ja/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ka/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/km/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/kn/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ko/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ku/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/lt/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/lv/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/mai/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/mg/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/mk/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ml/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/mn/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/mr/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ms/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/nb/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ne/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/nl/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/nn/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/oc/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/or/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/pa/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/pl/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/pt/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ro/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ru/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/rw/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/si/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/sk/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/sl/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/sq/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/sr/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/sr@latin/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/sv/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ta/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/te/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/th/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/tr/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/ug/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/uk/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/vi/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/xh/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/yi/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/GConf2.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/GConf2.mo
+file path=usr/share/man/man1/gconftool-2.1
+file path=usr/share/man/man1/gsettings-data-convert.1
+file path=usr/share/man/man1/gsettings-schema-convert.1
+file path=usr/share/sgml/gconf/gconf-1.0.dtd
+
+
+license COPYING license=LGPLv2
--- a/components/meta-packages/history/history	Mon Oct 24 23:43:46 2016 -0700
+++ b/components/meta-packages/history/history	Fri Oct 28 16:33:42 2016 -0700
@@ -230,7 +230,7 @@
 [email protected],5.11-0.175.0.0.0.0.0 developer/gnome/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 library/gnome/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 gnome/config/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 gnome/config/gconf/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.12-5.12.0.0.0.90.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 gnome/crash-report/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0
@@ -820,6 +820,7 @@
 gnome/accessibility/[email protected]
 gnome/accessibility/[email protected],5.11-0.175.0.0.0.0.0
 gnome/applet/[email protected]
+gnome/config/gconf/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 gnome/config/gconf/[email protected],5.12-5.12.0.0.0.96.0
 gnome/desklet/[email protected],5.11-0.175.0.0.0.0.0
 gnome/desklet/[email protected],5.11-0.175.0.0.0.0.0
--- a/components/meta-packages/incorporation-cache	Mon Oct 24 23:43:46 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Fri Oct 28 16:33:42 2016 -0700
@@ -44,8 +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:gnome/config/gconf/[email protected]
-consolidation/desktop/gnome-incorporation:gnome/config/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/speech/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
upstream/oracle/userland-gate