From 05c90a7486d5e0454ac4563a3acbae7deaaa46485e5638e070544368db15e1bd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Sep 2016 10:41:46 +0000 Subject: [PATCH] Accepting request 426125 from home:cxiong:branches:GNOME:Factory sle sync OBS-URL: https://build.opensuse.org/request/show/426125 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=272 --- gnome-shell-gdm-login-applet.patch | 59 +++++++++++++++++------------- gnome-shell.changes | 7 ++++ 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/gnome-shell-gdm-login-applet.patch b/gnome-shell-gdm-login-applet.patch index 76cd5d6..0541d94 100644 --- a/gnome-shell-gdm-login-applet.patch +++ b/gnome-shell-gdm-login-applet.patch @@ -4,11 +4,11 @@ js/ui/sessionMode.js | 2 - 3 files changed, 74 insertions(+), 1 deletion(-) -Index: gnome-shell-3.20.1/js/ui/aboutMenu.js +Index: gnome-shell-3.20.4/js/ui/aboutMenu.js =================================================================== --- /dev/null -+++ gnome-shell-3.20.1/js/ui/aboutMenu.js -@@ -0,0 +1,106 @@ ++++ gnome-shell-3.20.4/js/ui/aboutMenu.js +@@ -0,0 +1,115 @@ +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + +const GLib = imports.gi.GLib; @@ -46,23 +46,32 @@ Index: gnome-shell-3.20.1/js/ui/aboutMenu.js + vbox = new St.BoxLayout({vertical: true}); + hbox.add(vbox); + -+ this._os_release = Gio.File.new_for_path('/etc/os-release'); -+ let success, contents, tag; ++ ///// 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 { -+ [success, contents, tag] = this._os_release.load_contents(null); -+ } catch (e) { -+ contents = 'SUSE Linux Enterprise'; ++ 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]; ++ } ++ } + } -+ let match = new RegExp('(.+)PRETTY_NAME=(.+)ID(.+)').exec(contents.toString().replace(/\n/g, ' ')); -+ let sysinfo_text; -+ if (!match) { -+ sysinfo_text = 'SUSE Linux Enterprise'; -+ } else { -+ sysinfo_text = match[2].toString().replace(/"/g, ' '); ++ 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 }); ++ this._sysinfo = new St.Label({ text: sysinfo_text, can_focus: true }); + vbox.add(this._sysinfo); + this.actor.hide(); + @@ -115,10 +124,10 @@ Index: gnome-shell-3.20.1/js/ui/aboutMenu.js + }, + +}); -Index: gnome-shell-3.20.1/js/ui/panel.js +Index: gnome-shell-3.20.4/js/ui/panel.js =================================================================== ---- gnome-shell-3.20.1.orig/js/ui/panel.js -+++ gnome-shell-3.20.1/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({ }); @@ -127,10 +136,10 @@ Index: gnome-shell-3.20.1/js/ui/panel.js 'activities': ActivitiesButton, 'aggregateMenu': AggregateMenu, 'appMenu': AppMenuButton, -Index: gnome-shell-3.20.1/js/ui/sessionMode.js +Index: gnome-shell-3.20.4/js/ui/sessionMode.js =================================================================== ---- gnome-shell-3.20.1.orig/js/ui/sessionMode.js -+++ gnome-shell-3.20.1/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'], @@ -140,10 +149,10 @@ Index: gnome-shell-3.20.1/js/ui/sessionMode.js center: ['dateMenu'], right: ['a11yGreeter', 'keyboard', 'aggregateMenu'], }, -Index: gnome-shell-3.20.1/js/js-resources.gresource.xml +Index: gnome-shell-3.20.4/js/js-resources.gresource.xml =================================================================== ---- gnome-shell-3.20.1.orig/js/js-resources.gresource.xml -+++ gnome-shell-3.20.1/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 @@ misc/params.js misc/smartcardManager.js diff --git a/gnome-shell.changes b/gnome-shell.changes index 60e1a7f..8b3cc62 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 9 16:41:00 CST 2016 - cxiong@suse.com + +- Fix gnome-shell-gdm-login-applet.patch (boo#995296) + + Fix aboutMenu's distribution name to be more general, like openSUSE Leap + support. + ------------------------------------------------------------------- Tue Aug 30 11:28:02 UTC 2016 - zaitor@opensuse.org