Hello community, here is the log from the commit of package gnome-shell for openSUSE:Factory checked in at 2017-06-28 10:35:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-shell (Old) and /work/SRC/openSUSE:Factory/.gnome-shell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-shell" Wed Jun 28 10:35:28 2017 rev:129 rq:506308 version:3.24.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-shell/gnome-shell.changes 2017-06-12 15:08:13.621274120 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-shell.new/gnome-shell.changes 2017-06-28 10:35:30.150031111 +0200 @@ -1,0 +2,6 @@ +Mon Jun 26 05:57:59 UTC 2017 - [email protected] + +- Drop gnome-shell-970480-authprompt-wrapping-message.patch: + Fixed upstream. + +------------------------------------------------------------------- @@ -161,0 +168,2 @@ +- Drop gnome-shell-774381-app-window-overlay-app-list.patch: + Fixed upstream. @@ -204,0 +213,7 @@ +Thu Nov 24 01:44:11 UTC 2016 - [email protected] + +- Add gnome-shell-774381-app-window-overlay-app-list.patch: + Fix app windows overlay app list in overview screen (bsc#1008539, + bgo#774381). + +------------------------------------------------------------------- @@ -214,0 +230,7 @@ +Mon Nov 7 01:47:55 UTC 2016 - [email protected] + +- Add SUSE logo on lock screen for GNOME theme (bsc#1007468): + + gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch + + sle-background.png + +------------------------------------------------------------------- @@ -239,0 +262,11 @@ + +------------------------------------------------------------------- +Fri Sep 23 07:46:22 UTC 2016 - [email protected] + +- Drop gnome-shell-sle-theme.patch (bsc#999592): the patch is + included in gnome-shell-gdm-login-applet.patch. +- Drop source SLE-theme.tar.gz: SLE12SP2 doesn't use this source + any more. +- Update gnome-shell-gdm-login-applet.patch: + + Use dbus function to get hostname +- Add aboutMenu.js: Create from gnome-shell-gdm-login-applet.patch Old: ---- SLE-theme.tar.gz gnome-shell-970480-authprompt-wrapping-message.patch gnome-shell-sle-theme.patch New: ---- aboutMenu.js gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch sle-background.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.s5ALmn/_old 2017-06-28 10:35:30.821936053 +0200 +++ /var/tmp/diff_new_pack.s5ALmn/_new 2017-06-28 10:35:30.825935488 +0200 @@ -28,8 +28,10 @@ Source: http://download.gnome.org/sources/gnome-shell/3.24/%{name}-%{version}.tar.xz # SOURCE-FEATURE-SLE SLE-Classic specific core extension file, see bnc#862615 Source1: SLEClassicExt.js -# SOURCE-FEATURE-SLE The SLE theme, with icons/background/gnome-shell.css, works with gnome-shell-sle-theme.patch -Source2: SLE-theme.tar.gz +# SOURCE-FEATURE-SLE aboutMenu fate#314545 [email protected] -- Add an applet on login UI to display suse icon, product name, hostname. +Source2: aboutMenu.js +# SOURCE-FEATURE-SLE sle-background bsc#1007468 [email protected] -- Add SUSE logo on lock screen for GNOME theme +Source3: sle-background.png # PATCH-FIX-UPSTREAM gnome-shell-linking.patch bgo#768781 [email protected] -- Fix linking the various libs in private directories Patch0: gnome-shell-linking.patch # PATCH-NEEDS-REBASE gnome-shell-private-connection.patch bnc#751211 bgo#646187 [email protected] -- create private connections if the user is not authorized Was PATCH-FIX-UPSTREAM @@ -50,16 +52,14 @@ Patch8: gnome-shell-864872-unlock-by-mouse-motion.patch # PATCH-FIX-SLE gnome-shell-lock-bg-on-primay.patch bnc#894050 [email protected] -- display background of lock dialog on the primary screen. Patch9: gnome-shell-lock-bg-on-primary.patch -# PATCH-FIX-SLE gnome-shell-970480-authprompt-wrapping-message.patch bnc#970480 [email protected] -- fix wrapping message issue when password change operation fails. -Patch10: gnome-shell-970480-authprompt-wrapping-message.patch # PATCH-FIX-SLE gs-fate318433-prevent-same-account-multi-logins.patch fate#318433 [email protected] -- prevent multiple simultaneous login. Patch11: gs-fate318433-prevent-same-account-multi-logins.patch -# PATCH-FEATURE-SLE gnome-shell-sle-theme.patch [email protected] -- Use sle theme avatar -Patch12: gnome-shell-sle-theme.patch # PATCH-FIX-UPSTREAM gnome-shell-login-fix-session-button-can-be-clicked.patch bsc#1034584 bsc#1034827 bgo#781482 [email protected] -- Disable session selection button function when it does not display. Patch13: gnome-shell-login-fix-session-button-can-be-clicked.patch # PATCH-FIX-UPSTREAM gnome-shell-portalhelper-fixes.patch bgo#769692 bgo#783286 [email protected] -- Portalhelper fixes from upstream git Patch14: gnome-shell-portalhelper-fixes.patch +# PATCH-FEATURE-SLE gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch [email protected] -- Add SUSE logo on lock screen for GNOME theme. +Patch15: gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch ## NOTE: Keep SLE Classic pathes at bottom. ## NOTE: Keep SLE Classic pathes at bottom. # PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 [email protected] -- add SLE Classic support @@ -200,12 +200,8 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 %patch11 -p1 -### FIXME: The patch currently don't work. Re-enable when it's fixed -%if 0 -%patch12 -p1 -%endif +%patch15 -p1 %endif %patch13 -p1 %patch14 -p1 @@ -214,6 +210,10 @@ translation-update-upstream %endif cp %{S:1} js/ui/ +%if !0%{?is_opensuse} +cp %{S:2} js/ui/ +cp %{S:3} data/theme/ +%endif %build # Needed for patch2 @@ -232,13 +232,6 @@ install -d %{buildroot}%{_datadir}/gnome-shell/extensions # This is the directory where search providers get installed install -d %{buildroot}%{_datadir}/gnome-shell/search-providers -# Install SLE theme -# WARNING: some of the followings might NOT be effective at all, as core themes -# are packed as GResource. -tar xzvf %{SOURCE2} -install -d %{buildroot}%{_datadir}/gnome-shell/theme -cp -r SLE-theme/icons %{buildroot}%{_datadir}/ -cp SLE-theme/theme/* %{buildroot}%{_datadir}/gnome-shell/theme %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file org.gnome.Shell @@ -283,7 +276,6 @@ %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml %{_datadir}/gnome-control-center/keybindings/50-gnome-shell-system.xml %{_datadir}/gnome-shell/ -%{_datadir}/icons/* %doc %{_mandir}/man?/gnome-shell.* %dir %{_datadir}/xdg-desktop-portal %dir %{_datadir}/xdg-desktop-portal/portals ++++++ aboutMenu.js ++++++ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- const GLib = imports.gi.GLib; const Gio = imports.gi.Gio; const Lang = imports.lang; const Clutter = imports.gi.Clutter; const St = imports.gi.St; const DBus = imports.gi.DBus; const PanelMenu = imports.ui.panelMenu; const AboutMenuButton = new Lang.Class({ Name: 'AboutMenuButton', Extends: PanelMenu.Button, _init: function() { this._hostname = null; this._updateHostnameId = 0; this._ticket = 1; let hbox; let vbox; let menuAlignment = 0.25; if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) menuAlignment = 1.0 - menuAlignment; this.parent(menuAlignment, 'About Me'); this.about_hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); this.hostname_label = new St.Label({y_align: Clutter.ActorAlign.CENTER}); this.about_hbox.add_child(this.hostname_label); this.actor.add_child(this.about_hbox); hbox = new St.BoxLayout({ name: 'aboutArea' }); this.menu.box.add_child(hbox); vbox = new St.BoxLayout({vertical: true}); hbox.add(vbox); ///// Section: read '/etc/os-release' to get pretty name // // Note: previously this is defaulted to 'SUSE Linux Enterprise', now // let's use a "safer" option. let sysinfo_text = 'SUSE Linux'; try { let success, contents, tag; let _os_release = Gio.File.new_for_path('/etc/os-release'); [success, contents, tag] = _os_release.load_contents(null); let osReleaseContentStr = contents.toString(); let prettyNameReg = /^PRETTY_NAME="(.+)"/; let match = null; for (let line of osReleaseContentStr.split('\n')) { match = prettyNameReg.exec(line); if (match) { sysinfo_text = match[1]; } } } catch (e) { // NOTE soft fail, 'sysinfo_text' is the default warn('ERROR: fail to read /etc/os-release'); } this._sysinfo = new St.Label({ text: sysinfo_text, can_focus: true }); vbox.add(this._sysinfo); this.actor.hide(); this._updateHostnameId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, this._ticket, Lang.bind(this, function() { if (this._ticket < 60*60) this._ticket *= 2; this._updateHostnameId = 0; this._updateHostname(); return false; })); return; }, _updateHostname: function(){ let hostname_text = get_hostname(); if ((this._hostname == null) || (this._hostname != hostname_text)) { this._ticket = 1; this._hostname = hostname_text; this.hostname_label.set_text(this._hostname); this.actor.show(); } this._updateHostnameId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, this._ticket, Lang.bind(this, function() { if (this._ticket < 60*60) this._ticket *= 2; this._updateHostnameId = 0; this._updateHostname(); return false; })); }, _destroy: function() { this._ticket = 1; if (this._updateHostnameId) { GLib.source_remove (this._updateHostnameId); this._updateHostnameId = 0; } }, }); function get_hostname() { let hostname; let interface_name = [GLib.Variant.new_string('org.freedesktop.hostname1'), GLib.Variant.new_string('Hostname')]; let call = { bus_name: 'org.freedesktop.hostname1', object_path: '/org/freedesktop/hostname1', interface_name: 'org.freedesktop.DBus.Properties', method_name: 'Get', parameters: GLib.Variant.new_tuple(interface_name, 2), reply_type: null, flags: Gio.DBusCallFlags.NONE, timeout_msec: -1, cancellable: null, }; try { let dbusConnection = Gio.bus_get_sync(DBus.BusType.SYSTEM, null); let message = dbusConnection.call_sync( call.bus_name, call.object_path, call.interface_name, call.method_name, call.parameters, call.reply_type, call.flags, call.timeout_msec, call.cancellable ); hostname = message.get_child_value(0).get_variant().get_string()[0]; } catch(e) { hostname = 'localhost'; } return hostname; } ++++++ gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch ++++++ Index: gnome-shell-3.20.4/data/gnome-shell-theme.gresource.xml =================================================================== --- gnome-shell-3.20.4.orig/data/gnome-shell-theme.gresource.xml +++ gnome-shell-3.20.4/data/gnome-shell-theme.gresource.xml @@ -38,5 +38,6 @@ <file>toggle-on-hc.svg</file> <file>ws-switch-arrow-up.png</file> <file>ws-switch-arrow-down.png</file> + <file>sle-background.png</file> </gresource> </gresources> Index: gnome-shell-3.20.4/data/theme/gnome-shell.css =================================================================== --- gnome-shell-3.20.4.orig/data/theme/gnome-shell.css +++ gnome-shell-3.20.4/data/theme/gnome-shell.css @@ -1544,6 +1544,9 @@ StScrollBar { padding-top: 24px; max-width: 23em; } +.login-dialog-sle { + background: #2e3436 url(sle-background.png); } + .login-dialog { border: none; background-color: transparent; } Index: gnome-shell-3.20.4/js/ui/unlockDialog.js =================================================================== --- gnome-shell-3.20.4.orig/js/ui/unlockDialog.js +++ gnome-shell-3.20.4/js/ui/unlockDialog.js @@ -37,6 +37,7 @@ const UnlockDialog = new Lang.Class({ layout_manager: new Clutter.BoxLayout(), visible: false }); + this.actor.add_style_class_name('login-dialog-sle'); this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true })); parentActor.add_child(this.actor); ++++++ gnome-shell-gdm-login-applet.patch ++++++ --- /var/tmp/diff_new_pack.s5ALmn/_old 2017-06-28 10:35:30.909923606 +0200 +++ /var/tmp/diff_new_pack.s5ALmn/_new 2017-06-28 10:35:30.909923606 +0200 @@ -1,176 +1,21 @@ -diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml -index a1a4196..fa01cee 100644 ---- a/js/js-resources.gresource.xml -+++ b/js/js-resources.gresource.xml -@@ -33,6 +33,7 @@ - - <file>portalHelper/main.js</file> - +Index: gnome-shell-3.20.4/js/js-resources.gresource.xml +=================================================================== +--- gnome-shell-3.20.4.orig/js/js-resources.gresource.xml ++++ gnome-shell-3.20.4/js/js-resources.gresource.xml +@@ -25,7 +25,7 @@ + <file>misc/params.js</file> + <file>misc/smartcardManager.js</file> + <file>misc/util.js</file> +- + <file>ui/aboutMenu.js</file> - <file>ui/accessDialog.js</file> - <file>ui/altTab.js</file> - <file>ui/animation.js</file> -diff --git a/js/ui/aboutMenu.js b/js/ui/aboutMenu.js -new file mode 100644 -index 0000000..46c5de1 ---- /dev/null -+++ b/js/ui/aboutMenu.js -@@ -0,0 +1,150 @@ -+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- -+ -+const GLib = imports.gi.GLib; -+const Gio = imports.gi.Gio; -+const Lang = imports.lang; -+const Clutter = imports.gi.Clutter; -+const St = imports.gi.St; -+const DBus = imports.gi.DBus; -+ -+const PanelMenu = imports.ui.panelMenu; -+ -+const AboutMenuButton = new Lang.Class({ -+ Name: 'AboutMenuButton', -+ Extends: PanelMenu.Button, -+ _init: function() { -+ this._hostname = null; -+ this._updateHostnameId = 0; -+ this._ticket = 1; -+ -+ let hbox; -+ let vbox; -+ let menuAlignment = 0.25; -+ -+ if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) -+ menuAlignment = 1.0 - menuAlignment; -+ this.parent(menuAlignment, 'About Me'); -+ -+ this.about_hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); -+ this.hostname_label = new St.Label({y_align: Clutter.ActorAlign.CENTER}); -+ this.about_hbox.add_child(this.hostname_label); -+ -+ this.actor.add_child(this.about_hbox); -+ hbox = new St.BoxLayout({ name: 'aboutArea' }); -+ this.menu.box.add_child(hbox); -+ -+ vbox = new St.BoxLayout({vertical: true}); -+ hbox.add(vbox); -+ -+ ///// Section: read '/etc/os-release' to get pretty name -+ // -+ // Note: previously this is defaulted to 'SUSE Linux Enterprise', now -+ // let's use a "safer" option. -+ let sysinfo_text = 'SUSE Linux'; -+ try { -+ let success, contents, tag; -+ let _os_release = Gio.File.new_for_path('/etc/os-release'); -+ [success, contents, tag] = _os_release.load_contents(null); -+ -+ let osReleaseContentStr = contents.toString(); -+ let prettyNameReg = /^PRETTY_NAME="(.+)"/; -+ let match = null; -+ for (let line of osReleaseContentStr.split('\n')) { -+ match = prettyNameReg.exec(line); -+ if (match) { -+ sysinfo_text = match[1]; -+ } -+ } -+ } -+ catch (e) { -+ // NOTE soft fail, 'sysinfo_text' is the default -+ warn('ERROR: fail to read /etc/os-release'); -+ } -+ -+ this._sysinfo = new St.Label({ text: sysinfo_text, can_focus: true }); -+ vbox.add(this._sysinfo); -+ this.actor.hide(); -+ -+ this._updateHostnameId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, -+ this._ticket, -+ Lang.bind(this, function() { -+ if (this._ticket < 60*60) -+ this._ticket *= 2; -+ this._updateHostnameId = 0; -+ this._updateHostname(); -+ return false; -+ })); -+ -+ return; -+ }, -+ -+ _updateHostname: function(){ -+ let hostname_text = get_hostname(); -+ -+ if ((this._hostname == null) || (this._hostname != hostname_text)) { -+ this._ticket = 1; -+ this._hostname = hostname_text; -+ this.hostname_label.set_text(this._hostname); -+ this.actor.show(); -+ } -+ this._updateHostnameId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, -+ this._ticket, -+ Lang.bind(this, function() { -+ if (this._ticket < 60*60) -+ this._ticket *= 2; -+ this._updateHostnameId = 0; -+ this._updateHostname(); -+ return false; -+ })); -+ }, -+ -+ _destroy: function() { -+ this._ticket = 1; -+ if (this._updateHostnameId) { -+ GLib.source_remove (this._updateHostnameId); -+ this._updateHostnameId = 0; -+ } -+ }, -+ -+}); -+ -+function get_hostname() { -+ let hostname; -+ let interface_name = [GLib.Variant.new_string('org.freedesktop.hostname1'), -+ GLib.Variant.new_string('Hostname')]; -+ -+ let call = { -+ bus_name: 'org.freedesktop.hostname1', -+ object_path: '/org/freedesktop/hostname1', -+ interface_name: 'org.freedesktop.DBus.Properties', -+ method_name: 'Get', -+ parameters: GLib.Variant.new_tuple(interface_name, 2), -+ reply_type: null, -+ flags: Gio.DBusCallFlags.NONE, -+ timeout_msec: -1, -+ cancellable: null, -+ }; -+ -+ try { -+ let dbusConnection = Gio.bus_get_sync(DBus.BusType.SYSTEM, null); -+ -+ let message = dbusConnection.call_sync( -+ call.bus_name, -+ call.object_path, -+ call.interface_name, -+ call.method_name, -+ call.parameters, -+ call.reply_type, -+ call.flags, -+ call.timeout_msec, -+ call.cancellable -+ ); -+ -+ hostname = message.get_child_value(0).get_variant().get_string()[0]; -+ -+ } catch(e) { -+ hostname = 'localhost'; -+ } -+ -+ return hostname; -+} -diff --git a/js/ui/panel.js b/js/ui/panel.js -index fe3fc39..8b7c780 100644 ---- a/js/ui/panel.js -+++ b/js/ui/panel.js -@@ -758,6 +758,7 @@ const AggregateMenu = new Lang.Class({ + <file>perf/core.js</file> + <file>perf/hwtest.js</file> + +Index: gnome-shell-3.20.4/js/ui/panel.js +=================================================================== +--- gnome-shell-3.20.4.orig/js/ui/panel.js ++++ gnome-shell-3.20.4/js/ui/panel.js +@@ -755,6 +755,7 @@ const AggregateMenu = new Lang.Class({ }); const PANEL_ITEM_IMPLEMENTATIONS = { @@ -178,16 +23,16 @@ 'activities': ActivitiesButton, 'aggregateMenu': AggregateMenu, 'appMenu': AppMenuButton, -diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js -index ae08d08..99465d4 100644 ---- a/js/ui/sessionMode.js -+++ b/js/ui/sessionMode.js +Index: gnome-shell-3.20.4/js/ui/sessionMode.js +=================================================================== +--- gnome-shell-3.20.4.orig/js/ui/sessionMode.js ++++ gnome-shell-3.20.4/js/ui/sessionMode.js @@ -48,7 +48,7 @@ const _modes = { unlockDialog: imports.gdm.loginDialog.LoginDialog, components: ['polkitAgent'], panel: { - left: [], -+ left: ['aboutMenu'] ++ left: ['aboutMenu'], center: ['dateMenu'], right: ['a11yGreeter', 'keyboard', 'aggregateMenu'], },
