--- a/components/desktop/xscreensaver/Makefile	Mon Oct 10 22:23:05 2016 -0700
+++ b/components/desktop/xscreensaver/Makefile	Tue Oct 25 13:37:01 2016 -0700
@@ -108,7 +108,7 @@
 CONFIGURE_OPTIONS += --with-x-app-defaults=$(APP_DEFAULTS_DIR)
 
 # Data sources for images & text in hacks
-CONFIGURE_OPTIONS += --with-image-directory=$(USRSHAREDIR)/pixmaps/backgrounds
+CONFIGURE_OPTIONS += --with-image-directory=$(USRSHAREDIR)/backgrounds
 CONFIGURE_OPTIONS += --with-text-file=/etc/motd
 
 # Do not install setuid hacks

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/background-logo-extension/Makefile	Tue Oct 25 13:37:01 2016 -0700
@@ -0,0 +1,57 @@
+#
+# 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.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		background-logo-extension
+COMPONENT_VERSION=	3.20.0
+COMPONENT_PROJECT_URL=  https://extensions.gnome.org/extension/889/background-logo
+COMPONENT_ARCHIVE_HASH= \
+	sha256:9a0480fcf82214c6fac54485d5e91be485b2b8517df2fad853bfeba534c00f6b
+COMPONENT_ARCHIVE_URL=	https://git.fedorahosted.org/cgit/$(COMPONENT_NAME).git/snapshot/$(COMPONENT_ARCHIVE)
+
+TPNO=			29309
+
+TEST_TARGET = $(NO_TESTS)
+
+# This is for Gnome 3 so shouldn't apply to S11
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# configure assumes the extension version matches the gnome-shell version,
+# so override that for now, since our version numberss are out of sync
+COMPONENT_PREP_ACTION += \
+    $(GSED) -i -e 's/@shell_version@/3.18/' $(@D)/metadata.json.in ;
+
+# tarballs include autogen.sh, but not pre-generated configure script
+COMPONENT_PREP_ACTION += ( cd $(@D) ; NOCONFIGURE=1 $(CONFIG_SHELL) autogen.sh );
+
+REQUIRED_PACKAGES += gnome/gnome-shell
+REQUIRED_PACKAGES += library/desktop/clutter
+REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/gnome/gnome-desktop

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/background-logo-extension/background-logo-extension.p5m	Tue Oct 25 13:37:01 2016 -0700
@@ -0,0 +1,66 @@
+#
+# 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 "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/gnome/gnome-shell/background-logo-extension@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value=background-logo-extension
+set name=com.oracle.info.description \
+    value="Extension for displaying the Solaris logo in the background"
+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/396
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/share/glib-2.0/schemas/org.fedorahosted.background-logo-extension.gschema.xml
+file path=usr/share/gnome-shell/extensions/[email protected]/COPYING
+file path=usr/share/gnome-shell/extensions/[email protected]/convenience.js
+file path=usr/share/gnome-shell/extensions/[email protected]/extension.js
+file path=usr/share/gnome-shell/extensions/[email protected]/metadata.json
+file path=usr/share/gnome-shell/extensions/[email protected]/prefs.js
+file solaris/Oracle_Solaris_Logo.png \
+    path=usr/share/pixmaps/Oracle_Solaris_Logo.png
+license COPYING license=GPLv2
+depend type=require fmri=__TBD \
+    pkg.debug.depend.path=usr/lib/$(MACH64)/gnome-shell \
+    pkg.debug.depend.reason=extension.js pkg.tmp.gi-typelib=St-1.0
+depend type=require fmri=__TBD pkg.tmp.gi-typelib=Gio-2.0 \
+    pkg.debug.depend.reason=convenience.js \
+    pkg.debug.depend.reason=extension.js \
+    pkg.debug.depend.reason=prefs.js
+depend type=require fmri=__TBD pkg.debug.depend.reason=extension.js \
+    pkg.tmp.gi-typelib=Clutter-1.0
+depend type=require fmri=__TBD pkg.debug.depend.reason=prefs.js \
+    pkg.tmp.gi-typelib=Gdk-3.0
+depend type=require fmri=__TBD pkg.debug.depend.reason=prefs.js \
+    pkg.tmp.gi-typelib=GdkPixbuf-2.0
+depend type=require fmri=__TBD pkg.debug.depend.reason=prefs.js \
+    pkg.tmp.gi-typelib=GnomeDesktop-3.0
+depend type=require fmri=__TBD pkg.debug.depend.reason=prefs.js \
+    pkg.tmp.gi-typelib=Gtk-3.0
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/background-logo-extension/patches/solaris-logo.patch	Tue Oct 25 13:37:01 2016 -0700
@@ -0,0 +1,45 @@
+Use the Solaris logo and allow it to be displayed on non-default backgrounds
+Not suitable for upstream
+
+--- a/schemas/org.fedorahosted.background-logo-extension.gschema.xml
++++ b/schemas/org.fedorahosted.background-logo-extension.gschema.xml
+@@ -10,7 +10,7 @@
+   <schema path="/org/fedorahosted/background-logo-extension/"
+           id="org.fedorahosted.background-logo-extension">
+     <key type="s" name="logo-file">
+-      <default>'/usr/share/pixmaps/fedora_whitelogo.svg'</default>
++      <default>'/usr/share/pixmaps/Oracle_Solaris_Logo.png'</default>
+       <summary>Logo file</summary>
+       <description>The full logo file path</description>
+     </key>
+@@ -25,7 +25,7 @@
+     </key>
+     <key type="d" name="logo-size">
+-      <range min="5.0" max="15.0"/>
+-      <default>9.0</default>
++      <range min="5.0" max="25.0"/>
++      <default>15.0</default>
+       <summary>Logo size</summary>
+       <description>The logo size in percent relative to the screen width</description>
+     </key>
+
+--- a/extension.js
++++ b/extension.js
+@@ -141,14 +141,15 @@ const BackgroundLogo = new Lang.Class({
+         let defaultUri = background._settings.get_default_value('picture-uri');
+         let file = Gio.File.new_for_commandline_arg(defaultUri.deep_unpack());
+ 
+-        let visible;
++        let visible = true;
++/*
+         if (background._file) // > 3.14
+             visible = background._file.equal(file);
+         else if (background._filename) // <= 3.14
+             visible = background._filename == file.get_path();
+         else // background == NONE
+             visible = false;
+-
++ */
+         Tweener.addTween(this.actor,
+                          { opacity: visible ? 255 : 0,
+                            time: Background.FADE_ANIMATION_TIME,

Binary file components/gnome/background-logo-extension/solaris/Oracle_Solaris_Logo.png has changed

--- a/components/gnome/gnome-backgrounds/os-backgrounds-extra.p5m	Mon Oct 10 22:23:05 2016 -0700
+++ b/components/gnome/gnome-backgrounds/os-backgrounds-extra.p5m	Tue Oct 25 13:37:01 2016 -0700
@@ -34,13 +34,9 @@
 set name=org.opensolaris.consolidation \
     incorporate=consolidation/userland/userland-incorporation \
     value=$(CONSOLIDATION)
-link path=usr/share/backgrounds/opensolaris/grid-blue.jpg \
-    target=../solaris/Hexagons_Dark.jpg
-file path=usr/share/backgrounds/solaris/Hexagons_Color.jpg
-file path=usr/share/backgrounds/solaris/Hexagons_Dark.jpg
+file path=usr/share/backgrounds/solaris/Hexagons_Color.png
+file path=usr/share/backgrounds/solaris/Hexagons_Dark.png
 file path=usr/share/backgrounds/solaris/Hexagons_timed.xml
-file path=usr/share/backgrounds/solaris/Plum.jpg
+file path=usr/share/backgrounds/solaris/Plum.png
 file path=usr/share/gnome-background-properties/os-backgrounds-extra.xml
-link path=usr/share/pixmaps/backgrounds/opensolaris/grid-blue.jpg \
-    target=../../../backgrounds/solaris/Hexagons_Dark.jpg
 license solaris/license.txt license=Oracle

--- a/components/gnome/gnome-backgrounds/os-backgrounds.p5m	Mon Oct 10 22:23:05 2016 -0700
+++ b/components/gnome/gnome-backgrounds/os-backgrounds.p5m	Tue Oct 25 13:37:01 2016 -0700
@@ -35,13 +35,9 @@
     incorporate=consolidation/userland/userland-incorporation \
     value=$(CONSOLIDATION)
 #
-link path=usr/share/backgrounds/opensolaris/opensolaris-default.jpg \
-    target=../solaris/Polygons_Color.jpg
-file path=usr/share/backgrounds/solaris/Polygons_Chrome.jpg
-file path=usr/share/backgrounds/solaris/Polygons_Color.jpg
+file path=usr/share/backgrounds/solaris/Polygons_Chrome.png
+file path=usr/share/backgrounds/solaris/Polygons_Color.png
 file path=usr/share/backgrounds/solaris/Polygons_timed.xml
 file path=usr/share/glib-2.0/schemas/10_org.gnome.desktop.background.solaris.gschema.override
 file path=usr/share/gnome-background-properties/os-backgrounds.xml
-link path=usr/share/pixmaps/backgrounds/opensolaris/opensolaris-default.jpg \
-    target=../../../backgrounds/solaris/Polygons_Color.jpg
 license solaris/license.txt license=Oracle

--- a/components/gnome/gnome-backgrounds/solaris/10_org.gnome.desktop.background.solaris.gschema.override	Mon Oct 10 22:23:05 2016 -0700
+++ b/components/gnome/gnome-backgrounds/solaris/10_org.gnome.desktop.background.solaris.gschema.override	Tue Oct 25 13:37:01 2016 -0700
@@ -1,2 +1,6 @@
 [org.gnome.desktop.background]
 picture-uri='file:///usr/share/backgrounds/solaris/Polygons_timed.xml'
+[org.gnome.desktop.screensaver]
+picture-uri='file:///usr/share/backgrounds/solaris/Polygons_Chrome.png'
+[org.gnome.shell]
+enabled-extensions=['[email protected]']

Binary file components/gnome/gnome-backgrounds/solaris/Hexagons_Color.jpg has changed

Binary file components/gnome/gnome-backgrounds/solaris/Hexagons_Color.png has changed

Binary file components/gnome/gnome-backgrounds/solaris/Hexagons_Dark.jpg has changed

Binary file components/gnome/gnome-backgrounds/solaris/Hexagons_Dark.png has changed

--- a/components/gnome/gnome-backgrounds/solaris/Hexagons_timed.xml	Mon Oct 10 22:23:05 2016 -0700
+++ b/components/gnome/gnome-backgrounds/solaris/Hexagons_timed.xml	Tue Oct 25 13:37:01 2016 -0700
@@ -12,29 +12,29 @@
 <!-- The transition lasts for 5 hours, ending at 11AM. -->
 <transition type="overlay">
 <duration>18000.0</duration>
-<from>/usr/share/backgrounds/solaris/Hexagons_Dark.jpg</from>
-<to>/usr/share/backgrounds/solaris/Hexagons_Color.jpg</to>
+<from>/usr/share/backgrounds/solaris/Hexagons_Dark.png</from>
+<to>/usr/share/backgrounds/solaris/Hexagons_Color.png</to>
 </transition>
 
 <!-- It's 11 AM, we're showing the day image in full force now,
      for 6 hours ending at 5 PM. -->
 <static>
 <duration>21600.0</duration>
-<file>/usr/share/backgrounds/solaris/Hexagons_Color.jpg</file>
+<file>/usr/share/backgrounds/solaris/Hexagons_Color.png</file>
 </static>
 
 <!-- It's 5 PM and it's going to start to get darker.
      This will transition for 5 hours up until 10PM. -->
 <transition type="overlay">
 <duration>18000.0</duration>
-<from>/usr/share/backgrounds/solaris/Hexagons_Color.jpg</from>
-<to>/usr/share/backgrounds/solaris/Hexagons_Dark.jpg</to>
+<from>/usr/share/backgrounds/solaris/Hexagons_Color.png</from>
+<to>/usr/share/backgrounds/solaris/Hexagons_Dark.png</to>
 </transition>
 
 <!-- It's 10PM. It'll stay dark for 8 hours up until 6 AM. -->
 <static>
 <duration>28800.0</duration>
-<file>/usr/share/backgrounds/solaris/Hexagons_Dark.jpg</file>
+<file>/usr/share/backgrounds/solaris/Hexagons_Dark.png</file>
 </static>
 
 </background>

Binary file components/gnome/gnome-backgrounds/solaris/Plum.jpg has changed

Binary file components/gnome/gnome-backgrounds/solaris/Plum.png has changed

Binary file components/gnome/gnome-backgrounds/solaris/Polygons_Chrome.jpg has changed

Binary file components/gnome/gnome-backgrounds/solaris/Polygons_Chrome.png has changed

Binary file components/gnome/gnome-backgrounds/solaris/Polygons_Color.jpg has changed

Binary file components/gnome/gnome-backgrounds/solaris/Polygons_Color.png has changed

--- a/components/gnome/gnome-backgrounds/solaris/Polygons_timed.xml	Mon Oct 10 22:23:05 2016 -0700
+++ b/components/gnome/gnome-backgrounds/solaris/Polygons_timed.xml	Tue Oct 25 13:37:01 2016 -0700
@@ -12,29 +12,29 @@
 <!-- The transition lasts for 5 hours, ending at 11AM. -->
 <transition type="overlay">
 <duration>18000.0</duration>
-<from>/usr/share/backgrounds/solaris/Polygons_Chrome.jpg</from>
-<to>/usr/share/backgrounds/solaris/Polygons_Color.jpg</to>
+<from>/usr/share/backgrounds/solaris/Polygons_Chrome.png</from>
+<to>/usr/share/backgrounds/solaris/Polygons_Color.png</to>
 </transition>
 
 <!-- It's 11 AM, we're showing the day image in full force now,
      for 6 hours ending at 5 PM. -->
 <static>
 <duration>21600.0</duration>
-<file>/usr/share/backgrounds/solaris/Polygons_Color.jpg</file>
+<file>/usr/share/backgrounds/solaris/Polygons_Color.png</file>
 </static>
 
 <!-- It's 5 PM and it's going to start to get darker.
      This will transition for 5 hours up until 10PM. -->
 <transition type="overlay">
 <duration>18000.0</duration>
-<from>/usr/share/backgrounds/solaris/Polygons_Color.jpg</from>
-<to>/usr/share/backgrounds/solaris/Polygons_Chrome.jpg</to>
+<from>/usr/share/backgrounds/solaris/Polygons_Color.png</from>
+<to>/usr/share/backgrounds/solaris/Polygons_Chrome.png</to>
 </transition>
 
 <!-- It's 10PM. It'll stay dark for 8 hours up until 6 AM. -->
 <static>
 <duration>28800.0</duration>
-<file>/usr/share/backgrounds/solaris/Polygons_Chrome.jpg</file>
+<file>/usr/share/backgrounds/solaris/Polygons_Chrome.png</file>
 </static>
 
 </background>

--- a/components/gnome/gnome-backgrounds/solaris/os-backgrounds-extra.xml	Mon Oct 10 22:23:05 2016 -0700
+++ b/components/gnome/gnome-backgrounds/solaris/os-backgrounds-extra.xml	Tue Oct 25 13:37:01 2016 -0700
@@ -11,7 +11,7 @@
   </wallpaper>
   <wallpaper deleted="false">
     <name>Hexagons (Color)</name>
-    <filename>/usr/share/backgrounds/solaris/Hexagons_Color.jpg</filename>
+    <filename>/usr/share/backgrounds/solaris/Hexagons_Color.png</filename>
     <options>zoom</options>
     <shade_type>solid</shade_type>
     <pcolor>#3465a4</pcolor>
@@ -19,15 +19,15 @@
   </wallpaper>
   <wallpaper deleted="false">
     <name>Hexagons (Dark)</name>
-    <filename>/usr/share/backgrounds/solaris/Hexagons_Dark.jpg</filename>
+    <filename>/usr/share/backgrounds/solaris/Hexagons_Dark.png</filename>
     <options>zoom</options>
     <shade_type>solid</shade_type>
     <pcolor>#3465a4</pcolor>
     <scolor>#000000</scolor>
   </wallpaper>
   <wallpaper deleted="false">
-    <name>Plum.jpg</name>
-    <filename>/usr/share/backgrounds/solaris/Plum.jpg</filename>
+    <name>Plum.png</name>
+    <filename>/usr/share/backgrounds/solaris/Plum.png</filename>
     <options>zoom</options>
     <shade_type>solid</shade_type>
     <pcolor>#3465a4</pcolor>
@@ -35,7 +35,7 @@
   </wallpaper>
   <wallpaper deleted="true">
     <name>Blue Grid</name>
-    <filename>/usr/share/backgrounds/opensolaris/grid-blue.jpg</filename>
+    <filename>/usr/share/backgrounds/opensolaris/grid-blue.png</filename>
     <options>zoom</options>
   </wallpaper>
 </wallpapers>

--- a/components/gnome/gnome-backgrounds/solaris/os-backgrounds.xml	Mon Oct 10 22:23:05 2016 -0700
+++ b/components/gnome/gnome-backgrounds/solaris/os-backgrounds.xml	Tue Oct 25 13:37:01 2016 -0700
@@ -11,7 +11,7 @@
   </wallpaper>
   <wallpaper deleted="false">
     <name>Polygons (Chrome)</name>
-    <filename>/usr/share/backgrounds/solaris/Polygons_Chrome.jpg</filename>
+    <filename>/usr/share/backgrounds/solaris/Polygons_Chrome.png</filename>
     <options>zoom</options>
     <shade_type>solid</shade_type>
     <pcolor>#3465a4</pcolor>
@@ -19,7 +19,7 @@
   </wallpaper>
   <wallpaper deleted="false">
     <name>Polygons (Color)</name>
-    <filename>/usr/share/backgrounds/solaris/Polygons_Color.jpg</filename>
+    <filename>/usr/share/backgrounds/solaris/Polygons_Color.png</filename>
     <options>zoom</options>
     <shade_type>solid</shade_type>
     <pcolor>#3465a4</pcolor>
@@ -27,7 +27,7 @@
   </wallpaper>
   <wallpaper deleted="true">
     <name>Default</name>
-    <filename>/usr/share/backgrounds/opensolaris/opensolaris-default.jpg</filename>
+    <filename>/usr/share/backgrounds/opensolaris/opensolaris-default.png</filename>
     <options>zoom</options>
   </wallpaper>
 </wallpapers>