# HG changeset patch # User Niveditha Rau # Date 1477427821 25200 # Node ID b301fad4ef3a75f9afbc5cccd1f160208e23303c # Parent 3944ab9896509777de4b4c30d79d2f270831de7d 24826760 Deliver background-logo-extension 3.20.0 in Solaris PSARC/2016/396 GNOME 3 Window Manager Bundle diff -r 3944ab989650 -r b301fad4ef3a components/desktop/xscreensaver/Makefile --- 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 diff -r 3944ab989650 -r b301fad4ef3a components/gnome/background-logo-extension/Makefile --- /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 diff -r 3944ab989650 -r b301fad4ef3a components/gnome/background-logo-extension/background-logo-extension.p5m --- /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. +# + + \ + 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/background-logo@fedorahosted.org/COPYING +file path=usr/share/gnome-shell/extensions/background-logo@fedorahosted.org/convenience.js +file path=usr/share/gnome-shell/extensions/background-logo@fedorahosted.org/extension.js +file path=usr/share/gnome-shell/extensions/background-logo@fedorahosted.org/metadata.json +file path=usr/share/gnome-shell/extensions/background-logo@fedorahosted.org/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 + diff -r 3944ab989650 -r b301fad4ef3a components/gnome/background-logo-extension/patches/solaris-logo.patch --- /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 @@ + + +- '/usr/share/pixmaps/fedora_whitelogo.svg' ++ '/usr/share/pixmaps/Oracle_Solaris_Logo.png' + Logo file + The full logo file path + +@@ -25,7 +25,7 @@ + + +- +- 9.0 ++ ++ 15.0 + Logo size + The logo size in percent relative to the screen width + + +--- 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, diff -r 3944ab989650 -r b301fad4ef3a components/gnome/background-logo-extension/solaris/Oracle_Solaris_Logo.png Binary file components/gnome/background-logo-extension/solaris/Oracle_Solaris_Logo.png has changed diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/os-backgrounds-extra.p5m --- 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 diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/os-backgrounds.p5m --- 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 diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/10_org.gnome.desktop.background.solaris.gschema.override --- 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=['background-logo@fedorahosted.org'] diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Hexagons_Color.jpg Binary file components/gnome/gnome-backgrounds/solaris/Hexagons_Color.jpg has changed diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Hexagons_Color.png Binary file components/gnome/gnome-backgrounds/solaris/Hexagons_Color.png has changed diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Hexagons_Dark.jpg Binary file components/gnome/gnome-backgrounds/solaris/Hexagons_Dark.jpg has changed diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Hexagons_Dark.png Binary file components/gnome/gnome-backgrounds/solaris/Hexagons_Dark.png has changed diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Hexagons_timed.xml --- 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 @@ 18000.0 -/usr/share/backgrounds/solaris/Hexagons_Dark.jpg -/usr/share/backgrounds/solaris/Hexagons_Color.jpg +/usr/share/backgrounds/solaris/Hexagons_Dark.png +/usr/share/backgrounds/solaris/Hexagons_Color.png 21600.0 -/usr/share/backgrounds/solaris/Hexagons_Color.jpg +/usr/share/backgrounds/solaris/Hexagons_Color.png 18000.0 -/usr/share/backgrounds/solaris/Hexagons_Color.jpg -/usr/share/backgrounds/solaris/Hexagons_Dark.jpg +/usr/share/backgrounds/solaris/Hexagons_Color.png +/usr/share/backgrounds/solaris/Hexagons_Dark.png 28800.0 -/usr/share/backgrounds/solaris/Hexagons_Dark.jpg +/usr/share/backgrounds/solaris/Hexagons_Dark.png diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Plum.jpg Binary file components/gnome/gnome-backgrounds/solaris/Plum.jpg has changed diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Plum.png Binary file components/gnome/gnome-backgrounds/solaris/Plum.png has changed diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Polygons_Chrome.jpg Binary file components/gnome/gnome-backgrounds/solaris/Polygons_Chrome.jpg has changed diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Polygons_Chrome.png Binary file components/gnome/gnome-backgrounds/solaris/Polygons_Chrome.png has changed diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Polygons_Color.jpg Binary file components/gnome/gnome-backgrounds/solaris/Polygons_Color.jpg has changed diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Polygons_Color.png Binary file components/gnome/gnome-backgrounds/solaris/Polygons_Color.png has changed diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/Polygons_timed.xml --- 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 @@ 18000.0 -/usr/share/backgrounds/solaris/Polygons_Chrome.jpg -/usr/share/backgrounds/solaris/Polygons_Color.jpg +/usr/share/backgrounds/solaris/Polygons_Chrome.png +/usr/share/backgrounds/solaris/Polygons_Color.png 21600.0 -/usr/share/backgrounds/solaris/Polygons_Color.jpg +/usr/share/backgrounds/solaris/Polygons_Color.png 18000.0 -/usr/share/backgrounds/solaris/Polygons_Color.jpg -/usr/share/backgrounds/solaris/Polygons_Chrome.jpg +/usr/share/backgrounds/solaris/Polygons_Color.png +/usr/share/backgrounds/solaris/Polygons_Chrome.png 28800.0 -/usr/share/backgrounds/solaris/Polygons_Chrome.jpg +/usr/share/backgrounds/solaris/Polygons_Chrome.png diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/os-backgrounds-extra.xml --- 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 @@ Hexagons (Color) - /usr/share/backgrounds/solaris/Hexagons_Color.jpg + /usr/share/backgrounds/solaris/Hexagons_Color.png zoom solid #3465a4 @@ -19,15 +19,15 @@ Hexagons (Dark) - /usr/share/backgrounds/solaris/Hexagons_Dark.jpg + /usr/share/backgrounds/solaris/Hexagons_Dark.png zoom solid #3465a4 #000000 - Plum.jpg - /usr/share/backgrounds/solaris/Plum.jpg + Plum.png + /usr/share/backgrounds/solaris/Plum.png zoom solid #3465a4 @@ -35,7 +35,7 @@ Blue Grid - /usr/share/backgrounds/opensolaris/grid-blue.jpg + /usr/share/backgrounds/opensolaris/grid-blue.png zoom diff -r 3944ab989650 -r b301fad4ef3a components/gnome/gnome-backgrounds/solaris/os-backgrounds.xml --- 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 @@ Polygons (Chrome) - /usr/share/backgrounds/solaris/Polygons_Chrome.jpg + /usr/share/backgrounds/solaris/Polygons_Chrome.png zoom solid #3465a4 @@ -19,7 +19,7 @@ Polygons (Color) - /usr/share/backgrounds/solaris/Polygons_Color.jpg + /usr/share/backgrounds/solaris/Polygons_Color.png zoom solid #3465a4 @@ -27,7 +27,7 @@ Default - /usr/share/backgrounds/opensolaris/opensolaris-default.jpg + /usr/share/backgrounds/opensolaris/opensolaris-default.png zoom