25816799 Remove more excess FOSS from Desktop gate [PSARC 2016/088 - b122 subset]
PSARC/2016/088 EOF of more excess FOSS from Desktop consolidation (scrubbing the decks harder)
--- a/components/desktop/pidgin/patches/pidgin-01-gnome-keyring.patch Tue Apr 04 16:12:22 2017 -0700
+++ b/components/desktop/pidgin/patches/pidgin-01-gnome-keyring.patch Tue Apr 04 17:27:12 2017 -0700
@@ -8,7 +8,7 @@
--- pidgin-2.11.0/configure.ac.orig 2016-08-17 07:39:38.956248926 -0700
+++ pidgin-2.11.0/configure.ac 2016-08-17 07:41:48.502561778 -0700
[email protected]@ -2469,6 +2469,20 @@
[email protected]@ -2469,6 +2469,18 @@
LDFLAGS="$orig_LDFLAGS"
fi
@@ -21,9 +21,7 @@
+ [use gnome keyring for storing password [default=no]]),,
+ enable_gnome_keyring=no)
+if test "x$enable_gnome_keyring" = "xyes"; then
-+ PKG_CHECK_MODULES(GAIM_KEYRING,
-+ gnome-keyring-1,
-+ AC_DEFINE(GAIM_ENABLE_KEYRING, [], [Set if we should use gnome-keyring]))
++ AC_DEFINE(GAIM_ENABLE_KEYRING, [], [Set if we should use gnome-keyring])
+fi
+
AC_MSG_CHECKING(for me pot o' gold)
--- a/components/gnome/pygtk2/Makefile Tue Apr 04 16:12:22 2017 -0700
+++ b/components/gnome/pygtk2/Makefile Tue Apr 04 17:27:12 2017 -0700
@@ -59,6 +59,7 @@
COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv -I m4);
CONFIGURE_OPTIONS += --disable-static
+CONFIGURE_OPTIONS += --without-glade
CONFIGURE_OPTIONS += PYTHON=$(PYTHON)
# Ensure Python modules are installed into vendor package directories.
@@ -75,7 +76,6 @@
REQUIRED_PACKAGES += library/desktop/cairo
REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
REQUIRED_PACKAGES += library/desktop/gtk2
-REQUIRED_PACKAGES += library/desktop/libglade
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += library/python/numpy-27
--- a/components/gnome/pygtk2/pygtk2-27.p5m Tue Apr 04 16:12:22 2017 -0700
+++ b/components/gnome/pygtk2/pygtk2-27.p5m Tue Apr 04 17:27:12 2017 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -137,14 +137,12 @@
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/64/_lazyutils.py
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/64/compat.py
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/64/deprecation.py
-file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/64/glade.so
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/64/keysyms.py
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/__init__.py
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/_gtk.so
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/_lazyutils.py
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/compat.py
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/deprecation.py
-file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/glade.so
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtk/keysyms.py
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gtkunixprint.so
file path=usr/lib/python2.7/vendor-packages/gtk-2.0/pango.so
@@ -673,7 +671,6 @@
file path=usr/share/pygtk/2.0/defs/gtkunixprint-2.14.defs
file path=usr/share/pygtk/2.0/defs/gtkunixprint-base-types.defs
file path=usr/share/pygtk/2.0/defs/gtkunixprint-base.defs
-file path=usr/share/pygtk/2.0/defs/libglade.defs
file path=usr/share/pygtk/2.0/defs/pango-types.defs
file path=usr/share/pygtk/2.0/defs/pango.defs
file path=usr/share/pygtk/2.0/defs/pangocairo.defs
--- a/components/meta-packages/history/gnome-base-libs.p5m Tue Apr 04 16:12:22 2017 -0700
+++ b/components/meta-packages/history/gnome-base-libs.p5m Tue Apr 04 17:27:12 2017 -0700
@@ -18,12 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
#
# Package split to match upstream components during S11 development
# Updated to reflect later EOF's of some components
-set name=pkg.fmri value=pkg:/library/gnome/[email protected],5.12-5.12.0.0.0.112.0
+set name=pkg.fmri value=pkg:/library/gnome/[email protected],5.12-5.12.0.0.0.122.0
set name=pkg.renamed value=true
set name=org.opensolaris.consolidation \
incorporate=consolidation/desktop/gnome-incorporation \
@@ -31,6 +31,5 @@
depend type=require fmri=pkg:/library/desktop/atk
depend type=require fmri=pkg:/library/desktop/cairo
depend type=require fmri=pkg:/library/desktop/gtk2
-depend type=require fmri=pkg:/library/desktop/libglade
depend type=require fmri=pkg:/library/desktop/pango
depend type=require fmri=pkg:/library/glib2--- a/components/meta-packages/history/history Tue Apr 04 16:12:22 2017 -0700
+++ b/components/meta-packages/history/history Tue Apr 04 17:27:12 2017 -0700
@@ -228,7 +228,7 @@
[email protected],5.11-0.175.0.0.0.0.0 desktop/character-map/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
[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.12-5.12.0.0.0.122.0 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.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
@@ -437,7 +437,7 @@
[email protected],5.11-0.133 text/[email protected]
[email protected],5.11-0.133 library/[email protected]
[email protected],5.11-0.133 network/ftp/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 image/library/[email protected]
[email protected],5.12-5.12.0.0.0.122.0
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/xdg/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.90.0
@@ -450,9 +450,9 @@
[email protected],5.11-0.175.0.0.0.0.0 library/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
[email protected],5.11-0.175.0.0.0.0.0 system/library/security/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.122.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 library/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.122.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 library/security/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/[email protected] incorporate=consolidation/desktop/gnome-incorporation
@@ -943,6 +943,7 @@
image/graphviz/[email protected],5.12-5.12.0.0.0.96.0
image/library/[email protected]
image/library/[email protected]
+image/library/[email protected],5.12-5.12.0.0.0.122.0
image/scanner/[email protected],5.12-5.12.0.0.0.90.0
image/scanner/xsane/[email protected],5.12-5.12.0.0.0.102.0
image/scanner/xsane/[email protected],5.12-5.12.0.0.0.102.0
@@ -962,6 +963,8 @@
library/c++/[email protected],5.12-5.12.0.0.0.90.0
library/c++/[email protected],5.12-5.12.0.0.0.90.0
library/c++/[email protected],5.12-5.12.0.0.0.90.0
+library/desktop/[email protected],5.12-5.12.0.0.0.122.0 incorporate=consolidation/desktop/gnome-incorporation
+library/desktop/[email protected],5.12-5.12.0.0.0.122.0 incorporate=consolidation/desktop/gnome-incorporation
library/desktop/gobject/[email protected],5.11-0.175.0.0.0.0.0
library/desktop/[email protected],5.12-5.12.0.0.0.90.0
library/desktop/gtk2/[email protected],5.11-0.175.0.0.0.0.0 incorporate=consolidation/desktop/gnome-incorporation
@@ -972,6 +975,8 @@
library/desktop/search/tracker/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
library/desktop/xdg/[email protected]
library/[email protected],5.12-5.12.0.0.0.112.0
+library/gnome/[email protected],5.12-5.12.0.0.0.122.0 incorporate=consolidation/desktop/gnome-incorporation
+library/gnome/[email protected],5.12-5.12.0.0.0.122.0 incorporate=consolidation/desktop/gnome-incorporation
library/gnome/[email protected],5.12-5.12.0.0.0.112.0 library/desktop/startup-notification incorporate=consolidation/desktop/gnome-incorporation
library/gnome/[email protected],5.12-5.12.0.0.0.116.0 data/shared-mime-info incorporate=consolidation/desktop/gnome-incorporation
library/gnome/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
@@ -989,6 +994,7 @@
library/java/[email protected],5.12-5.12.0.0.0.90.0
library/java/[email protected],5.12-5.12.0.0.0.90.0
library/[email protected],5.12-5.12.0.0.0.90.0
+library/[email protected],5.12-5.12.0.0.0.122.0 incorporate=consolidation/desktop/gnome-incorporation
library/[email protected],5.12-5.12.0.0.0.90.0
library/libproxy/[email protected]
library/[email protected],5.12-5.12.0.0.0.113.0
@@ -1079,11 +1085,14 @@
library/python/[email protected]
library/python/[email protected] library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
library/python/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
+library/python/[email protected],5.12-5.12.0.0.0.122.0 incorporate=consolidation/desktop/gnome-incorporation
library/python/[email protected],5.12-5.12.0.0.0.90.0
library/python/[email protected],5.12-5.12.0.0.0.113.0 library/python/dbus-python-27
+library/python/[email protected],5.12-5.12.0.0.0.122.0 incorporate=consolidation/desktop/gnome-incorporation
library/python/[email protected],5.12-5.12.0.0.0.113.0
library/python/[email protected]
library/python/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
+library/python/[email protected],5.12-5.12.0.0.0.122.0 incorporate=consolidation/desktop/gnome-incorporation
library/python/[email protected],5.12-5.12.0.0.0.113.0
library/python/[email protected]
library/python/[email protected]
--- a/components/meta-packages/incorporation-cache Tue Apr 04 16:12:22 2017 -0700
+++ b/components/meta-packages/incorporation-cache Tue Apr 04 17:27:12 2017 -0700
@@ -39,17 +39,3 @@
# lines begining with hash (#) are ignored
#
-#
-# The following packages are part of the Desktop consolidation merge to the
-# 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:library/desktop/[email protected]
-consolidation/desktop/gnome-incorporation:library/desktop/[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]
-consolidation/desktop/gnome-incorporation:library/python/[email protected]
-consolidation/desktop/gnome-incorporation:library/python/[email protected]
-consolidation/desktop/gnome-incorporation:library/python/[email protected]
-consolidation/userland/userland-incorporation:image/library/[email protected]