Accepting request 491267 from GNOME:Factory
1 OBS-URL: https://build.opensuse.org/request/show/491267 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=126
This commit is contained in:
commit
8f8a18db73
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:86e1bd1ee9f721b25ebcf7edd80f39fafe7342fc0695ba6ddf804152cd45ada7
|
|
||||||
size 1980436
|
|
3
gnome-shell-3.24.1.tar.xz
Normal file
3
gnome-shell-3.24.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:53f93d64307a3c74dd9854a311a82d9ea9671dd424560f5a6f61dbf9474f423f
|
||||||
|
size 1980704
|
@ -1,14 +1,21 @@
|
|||||||
---
|
diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
|
||||||
js/ui/aboutMenu.js | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
index a1a4196..fa01cee 100644
|
||||||
js/ui/panel.js | 1
|
--- a/js/js-resources.gresource.xml
|
||||||
js/ui/sessionMode.js | 2 -
|
+++ b/js/js-resources.gresource.xml
|
||||||
3 files changed, 74 insertions(+), 1 deletion(-)
|
@@ -33,6 +33,7 @@
|
||||||
|
|
||||||
Index: gnome-shell-3.20.4/js/ui/aboutMenu.js
|
<file>portalHelper/main.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
|
--- /dev/null
|
||||||
+++ gnome-shell-3.20.4/js/ui/aboutMenu.js
|
+++ b/js/ui/aboutMenu.js
|
||||||
@@ -0,0 +1,115 @@
|
@@ -0,0 +1,150 @@
|
||||||
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||||
+
|
+
|
||||||
+const GLib = imports.gi.GLib;
|
+const GLib = imports.gi.GLib;
|
||||||
@ -16,6 +23,7 @@ Index: gnome-shell-3.20.4/js/ui/aboutMenu.js
|
|||||||
+const Lang = imports.lang;
|
+const Lang = imports.lang;
|
||||||
+const Clutter = imports.gi.Clutter;
|
+const Clutter = imports.gi.Clutter;
|
||||||
+const St = imports.gi.St;
|
+const St = imports.gi.St;
|
||||||
|
+const DBus = imports.gi.DBus;
|
||||||
+
|
+
|
||||||
+const PanelMenu = imports.ui.panelMenu;
|
+const PanelMenu = imports.ui.panelMenu;
|
||||||
+
|
+
|
||||||
@ -89,14 +97,7 @@ Index: gnome-shell-3.20.4/js/ui/aboutMenu.js
|
|||||||
+ },
|
+ },
|
||||||
+
|
+
|
||||||
+ _updateHostname: function(){
|
+ _updateHostname: function(){
|
||||||
+ let command = 'hostname';
|
+ let hostname_text = get_hostname();
|
||||||
+ let hostname_text;
|
|
||||||
+ try {
|
|
||||||
+ let [res, stdout, stderr, status] = GLib.spawn_command_line_sync(command);
|
|
||||||
+ hostname_text = String.fromCharCode.apply(null, stdout);
|
|
||||||
+ } catch (e) {
|
|
||||||
+ hostname_text = 'localhost';
|
|
||||||
+ }
|
|
||||||
+
|
+
|
||||||
+ if ((this._hostname == null) || (this._hostname != hostname_text)) {
|
+ if ((this._hostname == null) || (this._hostname != hostname_text)) {
|
||||||
+ this._ticket = 1;
|
+ this._ticket = 1;
|
||||||
@ -124,11 +125,52 @@ Index: gnome-shell-3.20.4/js/ui/aboutMenu.js
|
|||||||
+ },
|
+ },
|
||||||
+
|
+
|
||||||
+});
|
+});
|
||||||
Index: gnome-shell-3.20.4/js/ui/panel.js
|
+
|
||||||
===================================================================
|
+function get_hostname() {
|
||||||
--- gnome-shell-3.20.4.orig/js/ui/panel.js
|
+ let hostname;
|
||||||
+++ gnome-shell-3.20.4/js/ui/panel.js
|
+ let interface_name = [GLib.Variant.new_string('org.freedesktop.hostname1'),
|
||||||
@@ -755,6 +755,7 @@ const AggregateMenu = new Lang.Class({
|
+ 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({
|
||||||
});
|
});
|
||||||
|
|
||||||
const PANEL_ITEM_IMPLEMENTATIONS = {
|
const PANEL_ITEM_IMPLEMENTATIONS = {
|
||||||
@ -136,29 +178,16 @@ Index: gnome-shell-3.20.4/js/ui/panel.js
|
|||||||
'activities': ActivitiesButton,
|
'activities': ActivitiesButton,
|
||||||
'aggregateMenu': AggregateMenu,
|
'aggregateMenu': AggregateMenu,
|
||||||
'appMenu': AppMenuButton,
|
'appMenu': AppMenuButton,
|
||||||
Index: gnome-shell-3.20.4/js/ui/sessionMode.js
|
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
|
||||||
===================================================================
|
index ae08d08..99465d4 100644
|
||||||
--- gnome-shell-3.20.4.orig/js/ui/sessionMode.js
|
--- a/js/ui/sessionMode.js
|
||||||
+++ gnome-shell-3.20.4/js/ui/sessionMode.js
|
+++ b/js/ui/sessionMode.js
|
||||||
@@ -48,7 +48,7 @@ const _modes = {
|
@@ -48,7 +48,7 @@ const _modes = {
|
||||||
unlockDialog: imports.gdm.loginDialog.LoginDialog,
|
unlockDialog: imports.gdm.loginDialog.LoginDialog,
|
||||||
components: ['polkitAgent'],
|
components: ['polkitAgent'],
|
||||||
panel: {
|
panel: {
|
||||||
- left: [],
|
- left: [],
|
||||||
+ left: ['aboutMenu'],
|
+ left: ['aboutMenu']
|
||||||
center: ['dateMenu'],
|
center: ['dateMenu'],
|
||||||
right: ['a11yGreeter', 'keyboard', 'aggregateMenu'],
|
right: ['a11yGreeter', 'keyboard', 'aggregateMenu'],
|
||||||
},
|
},
|
||||||
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>perf/core.js</file>
|
|
||||||
<file>perf/hwtest.js</file>
|
|
||||||
|
|
||||||
|
43
gnome-shell-login-fix-session-button-can-be-clicked.patch
Normal file
43
gnome-shell-login-fix-session-button-can-be-clicked.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
From debe4b096445e25cfc098564d6ff22e32dba5324 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Xiaoguang Wang <xwang@suse.com>
|
||||||
|
Date: Wed, 19 Apr 2017 13:29:59 +0800
|
||||||
|
Subject: [PATCH] loginDialog: Fix session button can be clicked
|
||||||
|
|
||||||
|
When session menu button is hidden, button can be clicked and show popup
|
||||||
|
menu.
|
||||||
|
|
||||||
|
https://bugzilla.gnome.org/show_bug.cgi?id=781482
|
||||||
|
---
|
||||||
|
js/gdm/loginDialog.js | 7 +++++--
|
||||||
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
|
||||||
|
index 0b6c0b50a..a43544742 100644
|
||||||
|
--- a/js/gdm/loginDialog.js
|
||||||
|
+++ b/js/gdm/loginDialog.js
|
||||||
|
@@ -775,10 +775,12 @@ const LoginDialog = new Lang.Class({
|
||||||
|
},
|
||||||
|
|
||||||
|
_onPrompted: function() {
|
||||||
|
- this._sessionMenuButton.updateSensitivity(true);
|
||||||
|
+ this._sessionMenuButton.updateSensitivity(false);
|
||||||
|
|
||||||
|
- if (this._shouldShowSessionMenuButton())
|
||||||
|
+ if (this._shouldShowSessionMenuButton()) {
|
||||||
|
+ this._sessionMenuButton.updateSensitivity(true);
|
||||||
|
this._authPrompt.setActorInDefaultButtonWell(this._sessionMenuButton.actor);
|
||||||
|
+ }
|
||||||
|
this._showPrompt();
|
||||||
|
},
|
||||||
|
|
||||||
|
@@ -881,6 +883,7 @@ const LoginDialog = new Lang.Class({
|
||||||
|
}));
|
||||||
|
this._updateCancelButton();
|
||||||
|
|
||||||
|
+ this._sessionMenuButton.updateSensitivity(false);
|
||||||
|
this._authPrompt.updateSensitivity(true);
|
||||||
|
this._showPrompt();
|
||||||
|
},
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -1,3 +1,32 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 26 02:22:44 UTC 2017 - qzheng@suse.com
|
||||||
|
|
||||||
|
- Add gnome-shell-login-fix-session-button-can-be-clicked.patch:
|
||||||
|
Disable session selection button when it's hidden in user switch
|
||||||
|
dialog (bsc#1034827, bgo#781482).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Apr 25 02:52:28 UTC 2017 - qzheng@suse.com
|
||||||
|
|
||||||
|
- rebase gnome-shell-gdm-login-applet.patch.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Apr 15 21:50:44 UTC 2017 - zaitor@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.24.1:
|
||||||
|
+ Close Wifi selection dialog on lock (bgo#780054).
|
||||||
|
+ Fix DND over window previews in overview (bgo#737166).
|
||||||
|
+ Do not lock the screen when disabled by lockdown settings
|
||||||
|
(bgo#780212).
|
||||||
|
+ Follow GNOME Weather's location permissions (bgo#780252).
|
||||||
|
+ Fix portals that require a new window to be loaded
|
||||||
|
(bgo#759044).
|
||||||
|
+ Fix restricting menus to screen height on HiDPI displays
|
||||||
|
(bgo#753305).
|
||||||
|
+ Misc. bug fixes and cleanups: bgo#780063, bgo#780321,
|
||||||
|
bgo#780381, bgo#780453, bgo#758873, bgo#780606, bgo#642652.
|
||||||
|
+ Updated translations.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 20 20:39:20 UTC 2017 - dimstar@opensuse.org
|
Mon Mar 20 20:39:20 UTC 2017 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
%global __requires_exclude typelib\\(Meta\\)
|
%global __requires_exclude typelib\\(Meta\\)
|
||||||
|
|
||||||
Name: gnome-shell
|
Name: gnome-shell
|
||||||
Version: 3.24.0
|
Version: 3.24.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: GNOME Shell
|
Summary: GNOME Shell
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
@ -56,6 +56,9 @@ Patch10: gnome-shell-970480-authprompt-wrapping-message.patch
|
|||||||
Patch11: gs-fate318433-prevent-same-account-multi-logins.patch
|
Patch11: gs-fate318433-prevent-same-account-multi-logins.patch
|
||||||
# PATCH-FEATURE-SLE gnome-shell-sle-theme.patch dliang@suse.com -- Use sle theme avatar
|
# PATCH-FEATURE-SLE gnome-shell-sle-theme.patch dliang@suse.com -- Use sle theme avatar
|
||||||
Patch12: gnome-shell-sle-theme.patch
|
Patch12: gnome-shell-sle-theme.patch
|
||||||
|
# PATCH-FIX-UPSTREAM gnome-shell-login-fix-session-button-can-be-clicked.patch bsc#1034827 bgo#781482 xwang@suse.com -- Disable session selection button function when it does not display.
|
||||||
|
Patch13: gnome-shell-login-fix-session-button-can-be-clicked.patch
|
||||||
|
## NOTE: Keep SLE Classic pathes at bottom.
|
||||||
## NOTE: Keep SLE Classic pathes at bottom.
|
## NOTE: Keep SLE Classic pathes at bottom.
|
||||||
# PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 cxiong@suse.com -- add SLE Classic support
|
# PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 cxiong@suse.com -- add SLE Classic support
|
||||||
Patch1000: gs-sle-classic-ext.patch
|
Patch1000: gs-sle-classic-ext.patch
|
||||||
@ -202,6 +205,7 @@ into GNOME Shell calendar.
|
|||||||
%patch12 -p1
|
%patch12 -p1
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
%patch13 -p1
|
||||||
%if !0%{?is_opensuse}
|
%if !0%{?is_opensuse}
|
||||||
%patch1000 -p1
|
%patch1000 -p1
|
||||||
translation-update-upstream
|
translation-update-upstream
|
||||||
|
Loading…
x
Reference in New Issue
Block a user