Merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-3.28.2-sru into ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic

Proposed by Marco Trevisan (Treviño) on 2018-06-15
Status: Work in progress
Proposed branch: ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-3.28.2-sru
Merge into: ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic
Diff against target: 304 lines (+41/-73)
4 files modified
debian/changelog (+19/-0)
debian/patches/series (+0/-5)
debian/patches/ubuntu_lock_on_suspend.patch (+22/-4)
dev/null (+0/-64)
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Pending
Review via email: mp+348099@code.launchpad.net

Description of the change

SRU-3.28.2

To post a comment you must log in.

Unmerged commits

985297b... by Andrea Azzarone on 2018-06-05

debian/patches: avoid screen visibility on lock on suspend

debian/patches/ubuntu_lock_on_suspend.patch:
  inhibit suspend until the screen is locked also in the case where automatic
  screen lock is disabled and screen lock on suspend is enabled (LP: #1768786)

0495b38... by Olivier Tilloy on 2018-06-05

New upstream release: 3.28.2
  - fixes valid password rejection at login screen (LP: #1765261)

Drop patches applied upstream:
  - debian/patches/polkitAgent-Guard-against-repeated-close-calls.patch
  - debian/patches/popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch
  - debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch
  - debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
  - debian/patches/workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch

1aa8ce7... by Marco Trevisan (Treviño) on 2018-06-15

Merge 'debian/3.22.3-2' into ubuntu/bionic

That was the last version where ubuntu was merged with debian

310240b... by Marco Trevisan (Treviño) on 2018-06-15

Importing lp:~ubuntu-desktop/gnome-shell/ubuntu as subtree

48f0e20... by Jeremy Bicha on 2018-04-23

releasing package gnome-shell version 3.28.1-0ubuntu2

f17a9e0... by Jeremy Bicha on 2018-04-23

Cherry-pick polkitAgent-Guard-against-repeated-close-calls.patch:

- Fix PolicyKit authorization prompt after cancelling once (LP: #1765353)

6bf9d47... by Marco Trevisan (Treviño) on 2018-04-23

* js-ui-Choose-some-actors-to-cache-on-the-GPU.patch:
  - Improve rendering of shell elements moving rendering to GPU
    (LP: #1744001)

112716e... by Marco Trevisan (Treviño) on 2018-04-19

debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch: include duflu change

6155116... by Jeremy Bicha on 2018-04-18

releasing package gnome-shell version 3.28.1-0ubuntu1

70fa8cf... by Marco Trevisan (Treviño) on 2018-04-18

Rebase ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch & sort d/p/series

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 1ecd17a..c64e80e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
1gnome-shell (3.28.2-0ubuntu1) UNRELEASED; urgency=medium
2
3 [ Olivier Tilloy ]
4 * New upstream release
5 - fixes valid password rejection at login screen (LP: #1765261)
6 * Drop patches applied upstream:
7 - debian/patches/polkitAgent-Guard-against-repeated-close-calls.patch
8 - debian/patches/popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch
9 - debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch
10 - debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
11 - debian/patches/workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
12
13 [ Andrea Azzarone ]
14 * debian/patches/ubuntu_lock_on_suspend.patch: inhibit suspend until the
15 screen is locked also in the case where automatic screen lock is disabled
16 and screen lock on suspend is enabled (LP: #1768786)
17
18 -- Olivier Tilloy <olivier.tilloy@canonical.com> Tue, 05 Jun 2018 17:05:42 +0200
19
1gnome-shell (3.28.1-0ubuntu2) bionic; urgency=medium20gnome-shell (3.28.1-0ubuntu2) bionic; urgency=medium
221
3 [ Marco Trevisan (Treviño) ]22 [ Marco Trevisan (Treviño) ]
diff --git a/debian/patches/polkitAgent-Guard-against-repeated-close-calls.patch b/debian/patches/polkitAgent-Guard-against-repeated-close-calls.patch
4deleted file mode 10064423deleted file mode 100644
index 5338069..0000000
--- a/debian/patches/polkitAgent-Guard-against-repeated-close-calls.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
2Date: Sat, 21 Apr 2018 18:39:10 +0200
3Subject: polkitAgent: Guard against repeated close() calls
4
5We use the close() method to disconnect signal handlers set up in
6init(), however the handler ID is only valid in the first call in
7case the method is called more than once.
8
9https://gitlab.gnome.org/GNOME/gnome-shell/issues/221
10---
11 js/ui/components/polkitAgent.js | 4 +++-
12 1 file changed, 3 insertions(+), 1 deletion(-)
13
14diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
15index 316bc2a..7a0682c 100644
16--- a/js/ui/components/polkitAgent.js
17+++ b/js/ui/components/polkitAgent.js
18@@ -201,7 +201,9 @@ var AuthenticationDialog = new Lang.Class({
19 close(timestamp) {
20 this.parent(timestamp);
21
22- Main.sessionMode.disconnect(this._sessionUpdatedId);
23+ if (this._sessionUpdatedId)
24+ Main.sessionMode.disconnect(this._sessionUpdatedId);
25+ this._sessionUpdatedId = 0;
26 },
27
28 _ensureOpen() {
diff --git a/debian/patches/popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch b/debian/patches/popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch
29deleted file mode 1006440deleted file mode 100644
index f64d4c7..0000000
--- a/debian/patches/popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From: Mario Sanchez Prada <mario@endlessm.com>
2Date: Mon, 16 Apr 2018 05:47:57 -0500
3Subject: popupMenu: Fix wrong call to clutter_actor_add_child()
4
5Specify the horizontal alignment via the x_align property when creating
6the StIcon, since this function expects one argument, not two.
7
8Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/cdbc99e
9---
10 js/ui/popupMenu.js | 5 +++--
11 1 file changed, 3 insertions(+), 2 deletions(-)
12
13diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
14index 67b928c..83194d7 100644
15--- a/js/ui/popupMenu.js
16+++ b/js/ui/popupMenu.js
17@@ -394,8 +394,9 @@ var PopupImageMenuItem = new Lang.Class({
18 _init(text, icon, params) {
19 this.parent(params);
20
21- this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
22- this.actor.add_child(this._icon, { align: St.Align.END });
23+ this._icon = new St.Icon({ style_class: 'popup-menu-icon',
24+ x_align: Clutter.ActorAlign.END });
25+ this.actor.add_child(this._icon);
26 this.label = new St.Label({ text: text });
27 this.actor.add_child(this.label);
28 this.actor.label_actor = this.label;
diff --git a/debian/patches/series b/debian/patches/series
index aaf1b09..9ce6808 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,12 +13,7 @@ ubuntu_gdm_alternatives.patch
13ubuntu_block_mode_extension_update.patch13ubuntu_block_mode_extension_update.patch
14# Cherry picks from upstream14# Cherry picks from upstream
15ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch15ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch
16workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
17workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
18workspaceThumbnail-initialize-porthole-based-on-workArea.patch
19popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch
20volume-Add-back-sound-feedback-on-scroll.patch16volume-Add-back-sound-feedback-on-scroll.patch
21polkitAgent-Guard-against-repeated-close-calls.patch
22# End of Cherry-picked patches17# End of Cherry-picked patches
23workaround_crasher_fractional_scaling.patch18workaround_crasher_fractional_scaling.patch
24shell-ignore-invalid-window-monitor-index.patch19shell-ignore-invalid-window-monitor-index.patch
diff --git a/debian/patches/ubuntu_lock_on_suspend.patch b/debian/patches/ubuntu_lock_on_suspend.patch
index 1ce5584..2587fae 100644
--- a/debian/patches/ubuntu_lock_on_suspend.patch
+++ b/debian/patches/ubuntu_lock_on_suspend.patch
@@ -7,10 +7,10 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/1063110
7 js/ui/screenShield.js | 3 ++-7 js/ui/screenShield.js | 3 ++-
8 1 file changed, 2 insertions(+), 1 deletion(-)8 1 file changed, 2 insertions(+), 1 deletion(-)
99
10Index: gnome-shell-3.27.91/js/ui/screenShield.js10Index: gnome-shell-3.28.1/js/ui/screenShield.js
11===================================================================11===================================================================
12--- gnome-shell-3.27.91.orig/js/ui/screenShield.js12--- gnome-shell-3.28.1.orig/js/ui/screenShield.js
13+++ gnome-shell-3.27.91/js/ui/screenShield.js13+++ gnome-shell-3.28.1/js/ui/screenShield.js
14@@ -32,6 +32,7 @@ const Util = imports.misc.util;14@@ -32,6 +32,7 @@ const Util = imports.misc.util;
15 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';15 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
16 const LOCK_ENABLED_KEY = 'lock-enabled';16 const LOCK_ENABLED_KEY = 'lock-enabled';
@@ -19,7 +19,25 @@ Index: gnome-shell-3.27.91/js/ui/screenShield.js
19 19
20 const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';20 const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
21 const DISABLE_LOCK_KEY = 'disable-lock-screen';21 const DISABLE_LOCK_KEY = 'disable-lock-screen';
22@@ -727,7 +728,7 @@ var ScreenShield = new Lang.Class({22@@ -543,6 +544,7 @@ var ScreenShield = new Lang.Class({
23
24 this._settings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
25 this._settings.connect('changed::' + LOCK_ENABLED_KEY, this._syncInhibitor.bind(this));
26+ this._settings.connect('changed::' + SUSPEND_LOCK_ENABLED_KEY, this._syncInhibitor.bind(this));
27
28 this._lockSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
29 this._lockSettings.connect('changed::' + DISABLE_LOCK_KEY, this._syncInhibitor.bind(this));
30@@ -707,7 +709,8 @@ var ScreenShield = new Lang.Class({
31 },
32
33 _syncInhibitor() {
34- let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
35+ let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY) ||
36+ this._settings.get_boolean(SUSPEND_LOCK_ENABLED_KEY);
37 let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);
38 let inhibit = (this._loginSession && this._loginSession.Active &&
39 !this._isActive && lockEnabled && !lockLocked);
40@@ -727,7 +730,7 @@ var ScreenShield = new Lang.Class({
23 41
24 _prepareForSleep(loginManager, aboutToSuspend) {42 _prepareForSleep(loginManager, aboutToSuspend) {
25 if (aboutToSuspend) {43 if (aboutToSuspend) {
diff --git a/debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch b/debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch
26deleted file mode 10064444deleted file mode 100644
index f53ea29..0000000
--- a/debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
2Date: Fri, 19 Jan 2018 10:37:20 -0600
3Subject: workspaceThumbnail: initialize porthole based on workArea
4
5https://bugzilla.gnome.org/show_bug.cgi?id=792687
6
7Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792687
8Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/b99e304
9---
10 js/ui/workspaceThumbnail.js | 6 ++----
11 1 file changed, 2 insertions(+), 4 deletions(-)
12
13diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
14index 3dffd12..c1b4bdd 100644
15--- a/js/ui/workspaceThumbnail.js
16+++ b/js/ui/workspaceThumbnail.js
17@@ -275,8 +275,8 @@ var WorkspaceThumbnail = new Lang.Class({
18
19 this._createBackground();
20
21- let monitor = Main.layoutManager.primaryMonitor;
22- this.setPorthole(monitor.x, monitor.y, monitor.width, monitor.height);
23+ let workArea = Main.layoutManager.getWorkAreaForMonitor(this.monitorIndex);
24+ this.setPorthole(workArea.x, workArea.y, workArea.width, workArea.height);
25
26 let windows = global.get_window_actors().filter(actor => {
27 let win = actor.meta_window;
28@@ -321,8 +321,6 @@ var WorkspaceThumbnail = new Lang.Class({
29 },
30
31 setPorthole(x, y, width, height) {
32- this._portholeX = x;
33- this._portholeY = y;
34 this.actor.set_size(width, height);
35 this._contents.set_position(-x, -y);
36 },
diff --git a/debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch b/debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
37deleted file mode 1006440deleted file mode 100644
index 80e1918..0000000
--- a/debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
2Date: Fri, 19 Jan 2018 09:31:01 -0600
3Subject: workspaceThumbnail: only update _porthole if the overview is visible
4
5Otherwise it happens that porthole is computed again after that the
6overlay is hidden (triggered by a layout reallocation) and thus not
7regenerated again afterwards.
8
9https://bugzilla.gnome.org/show_bug.cgi?id=792687
10
11Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792687
12Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/5fcf40b
13---
14 js/ui/workspaceThumbnail.js | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
18index 7d5d2c0..5565a1e 100644
19--- a/js/ui/workspaceThumbnail.js
20+++ b/js/ui/workspaceThumbnail.js
21@@ -1159,7 +1159,7 @@ var ThumbnailsBox = new Lang.Class({
22 // The "porthole" is the portion of the screen that we show in the
23 // workspaces
24 _ensurePorthole() {
25- if (!Main.layoutManager.primaryMonitor)
26+ if (!Main.layoutManager.primaryMonitor || !Main.overview.visible)
27 return false;
28
29 if (!this._porthole)
diff --git a/debian/patches/workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch b/debian/patches/workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
30deleted file mode 1006440deleted file mode 100644
index 9243cbc..0000000
--- a/debian/patches/workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
2Date: Fri, 19 Jan 2018 09:39:13 -0600
3Subject: workspaceThumbnail: rebuild thumbnails if workareas size changed
4
5https://bugzilla.gnome.org/show_bug.cgi?id=792687
6
7Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/c29bd46
8Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792687
9---
10 js/ui/workspaceThumbnail.js | 21 ++++++++++++++++-----
11 1 file changed, 16 insertions(+), 5 deletions(-)
12
13diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
14index 5565a1e..3dffd12 100644
15--- a/js/ui/workspaceThumbnail.js
16+++ b/js/ui/workspaceThumbnail.js
17@@ -675,11 +675,7 @@ var ThumbnailsBox = new Lang.Class({
18 this._settings.connect('changed::dynamic-workspaces',
19 this._updateSwitcherVisibility.bind(this));
20
21- Main.layoutManager.connect('monitors-changed', () => {
22- this._destroyThumbnails();
23- if (Main.overview.visible)
24- this._createThumbnails();
25- });
26+ Main.layoutManager.connect('monitors-changed', this._rebuildThumbnails.bind(this));
27 },
28
29 _updateSwitcherVisibility() {
30@@ -872,6 +868,9 @@ var ThumbnailsBox = new Lang.Class({
31 Main.overview.connect('windows-restacked',
32 this._syncStacking.bind(this));
33
34+ this._workareasChangedId =
35+ global.screen.connect('workareas-changed', this._rebuildThumbnails.bind(this));
36+
37 this._targetScale = 0;
38 this._scale = 0;
39 this._pendingScaleUpdate = false;
40@@ -901,12 +900,24 @@ var ThumbnailsBox = new Lang.Class({
41 this._syncStackingId = 0;
42 }
43
44+ if (this._workareasChangedId > 0) {
45+ global.screen.disconnect(this._workareasChangedId);
46+ this._workareasChangedId = 0;
47+ }
48+
49 for (let w = 0; w < this._thumbnails.length; w++)
50 this._thumbnails[w].destroy();
51 this._thumbnails = [];
52 this._porthole = null;
53 },
54
55+ _rebuildThumbnails() {
56+ this._destroyThumbnails();
57+
58+ if (Main.overview.visible)
59+ this._createThumbnails();
60+ },
61+
62 _workspacesChanged() {
63 let validThumbnails =
64 this._thumbnails.filter(t => t.state <= ThumbnailState.NORMAL);

Subscribers

People subscribed via source and target branches

to all changes: