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
1diff --git a/debian/changelog b/debian/changelog
2index 1ecd17a..c64e80e 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,22 @@
6+gnome-shell (3.28.2-0ubuntu1) UNRELEASED; urgency=medium
7+
8+ [ Olivier Tilloy ]
9+ * New upstream release
10+ - fixes valid password rejection at login screen (LP: #1765261)
11+ * Drop patches applied upstream:
12+ - debian/patches/polkitAgent-Guard-against-repeated-close-calls.patch
13+ - debian/patches/popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch
14+ - debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch
15+ - debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
16+ - debian/patches/workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
17+
18+ [ Andrea Azzarone ]
19+ * debian/patches/ubuntu_lock_on_suspend.patch: inhibit suspend until the
20+ screen is locked also in the case where automatic screen lock is disabled
21+ and screen lock on suspend is enabled (LP: #1768786)
22+
23+ -- Olivier Tilloy <olivier.tilloy@canonical.com> Tue, 05 Jun 2018 17:05:42 +0200
24+
25 gnome-shell (3.28.1-0ubuntu2) bionic; urgency=medium
26
27 [ Marco Trevisan (Treviño) ]
28diff --git a/debian/patches/polkitAgent-Guard-against-repeated-close-calls.patch b/debian/patches/polkitAgent-Guard-against-repeated-close-calls.patch
29deleted file mode 100644
30index 5338069..0000000
31--- a/debian/patches/polkitAgent-Guard-against-repeated-close-calls.patch
32+++ /dev/null
33@@ -1,28 +0,0 @@
34-From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
35-Date: Sat, 21 Apr 2018 18:39:10 +0200
36-Subject: polkitAgent: Guard against repeated close() calls
37-
38-We use the close() method to disconnect signal handlers set up in
39-init(), however the handler ID is only valid in the first call in
40-case the method is called more than once.
41-
42-https://gitlab.gnome.org/GNOME/gnome-shell/issues/221
43----
44- js/ui/components/polkitAgent.js | 4 +++-
45- 1 file changed, 3 insertions(+), 1 deletion(-)
46-
47-diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
48-index 316bc2a..7a0682c 100644
49---- a/js/ui/components/polkitAgent.js
50-+++ b/js/ui/components/polkitAgent.js
51-@@ -201,7 +201,9 @@ var AuthenticationDialog = new Lang.Class({
52- close(timestamp) {
53- this.parent(timestamp);
54-
55-- Main.sessionMode.disconnect(this._sessionUpdatedId);
56-+ if (this._sessionUpdatedId)
57-+ Main.sessionMode.disconnect(this._sessionUpdatedId);
58-+ this._sessionUpdatedId = 0;
59- },
60-
61- _ensureOpen() {
62diff --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
63deleted file mode 100644
64index f64d4c7..0000000
65--- a/debian/patches/popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch
66+++ /dev/null
67@@ -1,28 +0,0 @@
68-From: Mario Sanchez Prada <mario@endlessm.com>
69-Date: Mon, 16 Apr 2018 05:47:57 -0500
70-Subject: popupMenu: Fix wrong call to clutter_actor_add_child()
71-
72-Specify the horizontal alignment via the x_align property when creating
73-the StIcon, since this function expects one argument, not two.
74-
75-Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/cdbc99e
76----
77- js/ui/popupMenu.js | 5 +++--
78- 1 file changed, 3 insertions(+), 2 deletions(-)
79-
80-diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
81-index 67b928c..83194d7 100644
82---- a/js/ui/popupMenu.js
83-+++ b/js/ui/popupMenu.js
84-@@ -394,8 +394,9 @@ var PopupImageMenuItem = new Lang.Class({
85- _init(text, icon, params) {
86- this.parent(params);
87-
88-- this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
89-- this.actor.add_child(this._icon, { align: St.Align.END });
90-+ this._icon = new St.Icon({ style_class: 'popup-menu-icon',
91-+ x_align: Clutter.ActorAlign.END });
92-+ this.actor.add_child(this._icon);
93- this.label = new St.Label({ text: text });
94- this.actor.add_child(this.label);
95- this.actor.label_actor = this.label;
96diff --git a/debian/patches/series b/debian/patches/series
97index aaf1b09..9ce6808 100644
98--- a/debian/patches/series
99+++ b/debian/patches/series
100@@ -13,12 +13,7 @@ ubuntu_gdm_alternatives.patch
101 ubuntu_block_mode_extension_update.patch
102 # Cherry picks from upstream
103 ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch
104-workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
105-workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
106-workspaceThumbnail-initialize-porthole-based-on-workArea.patch
107-popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch
108 volume-Add-back-sound-feedback-on-scroll.patch
109-polkitAgent-Guard-against-repeated-close-calls.patch
110 # End of Cherry-picked patches
111 workaround_crasher_fractional_scaling.patch
112 shell-ignore-invalid-window-monitor-index.patch
113diff --git a/debian/patches/ubuntu_lock_on_suspend.patch b/debian/patches/ubuntu_lock_on_suspend.patch
114index 1ce5584..2587fae 100644
115--- a/debian/patches/ubuntu_lock_on_suspend.patch
116+++ b/debian/patches/ubuntu_lock_on_suspend.patch
117@@ -7,10 +7,10 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/1063110
118 js/ui/screenShield.js | 3 ++-
119 1 file changed, 2 insertions(+), 1 deletion(-)
120
121-Index: gnome-shell-3.27.91/js/ui/screenShield.js
122+Index: gnome-shell-3.28.1/js/ui/screenShield.js
123 ===================================================================
124---- gnome-shell-3.27.91.orig/js/ui/screenShield.js
125-+++ gnome-shell-3.27.91/js/ui/screenShield.js
126+--- gnome-shell-3.28.1.orig/js/ui/screenShield.js
127++++ gnome-shell-3.28.1/js/ui/screenShield.js
128 @@ -32,6 +32,7 @@ const Util = imports.misc.util;
129 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
130 const LOCK_ENABLED_KEY = 'lock-enabled';
131@@ -19,7 +19,25 @@ Index: gnome-shell-3.27.91/js/ui/screenShield.js
132
133 const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
134 const DISABLE_LOCK_KEY = 'disable-lock-screen';
135-@@ -727,7 +728,7 @@ var ScreenShield = new Lang.Class({
136+@@ -543,6 +544,7 @@ var ScreenShield = new Lang.Class({
137+
138+ this._settings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
139+ this._settings.connect('changed::' + LOCK_ENABLED_KEY, this._syncInhibitor.bind(this));
140++ this._settings.connect('changed::' + SUSPEND_LOCK_ENABLED_KEY, this._syncInhibitor.bind(this));
141+
142+ this._lockSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
143+ this._lockSettings.connect('changed::' + DISABLE_LOCK_KEY, this._syncInhibitor.bind(this));
144+@@ -707,7 +709,8 @@ var ScreenShield = new Lang.Class({
145+ },
146+
147+ _syncInhibitor() {
148+- let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
149++ let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY) ||
150++ this._settings.get_boolean(SUSPEND_LOCK_ENABLED_KEY);
151+ let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);
152+ let inhibit = (this._loginSession && this._loginSession.Active &&
153+ !this._isActive && lockEnabled && !lockLocked);
154+@@ -727,7 +730,7 @@ var ScreenShield = new Lang.Class({
155
156 _prepareForSleep(loginManager, aboutToSuspend) {
157 if (aboutToSuspend) {
158diff --git a/debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch b/debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch
159deleted file mode 100644
160index f53ea29..0000000
161--- a/debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch
162+++ /dev/null
163@@ -1,36 +0,0 @@
164-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
165-Date: Fri, 19 Jan 2018 10:37:20 -0600
166-Subject: workspaceThumbnail: initialize porthole based on workArea
167-
168-https://bugzilla.gnome.org/show_bug.cgi?id=792687
169-
170-Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792687
171-Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/b99e304
172----
173- js/ui/workspaceThumbnail.js | 6 ++----
174- 1 file changed, 2 insertions(+), 4 deletions(-)
175-
176-diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
177-index 3dffd12..c1b4bdd 100644
178---- a/js/ui/workspaceThumbnail.js
179-+++ b/js/ui/workspaceThumbnail.js
180-@@ -275,8 +275,8 @@ var WorkspaceThumbnail = new Lang.Class({
181-
182- this._createBackground();
183-
184-- let monitor = Main.layoutManager.primaryMonitor;
185-- this.setPorthole(monitor.x, monitor.y, monitor.width, monitor.height);
186-+ let workArea = Main.layoutManager.getWorkAreaForMonitor(this.monitorIndex);
187-+ this.setPorthole(workArea.x, workArea.y, workArea.width, workArea.height);
188-
189- let windows = global.get_window_actors().filter(actor => {
190- let win = actor.meta_window;
191-@@ -321,8 +321,6 @@ var WorkspaceThumbnail = new Lang.Class({
192- },
193-
194- setPorthole(x, y, width, height) {
195-- this._portholeX = x;
196-- this._portholeY = y;
197- this.actor.set_size(width, height);
198- this._contents.set_position(-x, -y);
199- },
200diff --git a/debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch b/debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
201deleted file mode 100644
202index 80e1918..0000000
203--- a/debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
204+++ /dev/null
205@@ -1,29 +0,0 @@
206-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
207-Date: Fri, 19 Jan 2018 09:31:01 -0600
208-Subject: workspaceThumbnail: only update _porthole if the overview is visible
209-
210-Otherwise it happens that porthole is computed again after that the
211-overlay is hidden (triggered by a layout reallocation) and thus not
212-regenerated again afterwards.
213-
214-https://bugzilla.gnome.org/show_bug.cgi?id=792687
215-
216-Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792687
217-Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/5fcf40b
218----
219- js/ui/workspaceThumbnail.js | 2 +-
220- 1 file changed, 1 insertion(+), 1 deletion(-)
221-
222-diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
223-index 7d5d2c0..5565a1e 100644
224---- a/js/ui/workspaceThumbnail.js
225-+++ b/js/ui/workspaceThumbnail.js
226-@@ -1159,7 +1159,7 @@ var ThumbnailsBox = new Lang.Class({
227- // The "porthole" is the portion of the screen that we show in the
228- // workspaces
229- _ensurePorthole() {
230-- if (!Main.layoutManager.primaryMonitor)
231-+ if (!Main.layoutManager.primaryMonitor || !Main.overview.visible)
232- return false;
233-
234- if (!this._porthole)
235diff --git a/debian/patches/workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch b/debian/patches/workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
236deleted file mode 100644
237index 9243cbc..0000000
238--- a/debian/patches/workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
239+++ /dev/null
240@@ -1,64 +0,0 @@
241-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
242-Date: Fri, 19 Jan 2018 09:39:13 -0600
243-Subject: workspaceThumbnail: rebuild thumbnails if workareas size changed
244-
245-https://bugzilla.gnome.org/show_bug.cgi?id=792687
246-
247-Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/c29bd46
248-Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792687
249----
250- js/ui/workspaceThumbnail.js | 21 ++++++++++++++++-----
251- 1 file changed, 16 insertions(+), 5 deletions(-)
252-
253-diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
254-index 5565a1e..3dffd12 100644
255---- a/js/ui/workspaceThumbnail.js
256-+++ b/js/ui/workspaceThumbnail.js
257-@@ -675,11 +675,7 @@ var ThumbnailsBox = new Lang.Class({
258- this._settings.connect('changed::dynamic-workspaces',
259- this._updateSwitcherVisibility.bind(this));
260-
261-- Main.layoutManager.connect('monitors-changed', () => {
262-- this._destroyThumbnails();
263-- if (Main.overview.visible)
264-- this._createThumbnails();
265-- });
266-+ Main.layoutManager.connect('monitors-changed', this._rebuildThumbnails.bind(this));
267- },
268-
269- _updateSwitcherVisibility() {
270-@@ -872,6 +868,9 @@ var ThumbnailsBox = new Lang.Class({
271- Main.overview.connect('windows-restacked',
272- this._syncStacking.bind(this));
273-
274-+ this._workareasChangedId =
275-+ global.screen.connect('workareas-changed', this._rebuildThumbnails.bind(this));
276-+
277- this._targetScale = 0;
278- this._scale = 0;
279- this._pendingScaleUpdate = false;
280-@@ -901,12 +900,24 @@ var ThumbnailsBox = new Lang.Class({
281- this._syncStackingId = 0;
282- }
283-
284-+ if (this._workareasChangedId > 0) {
285-+ global.screen.disconnect(this._workareasChangedId);
286-+ this._workareasChangedId = 0;
287-+ }
288-+
289- for (let w = 0; w < this._thumbnails.length; w++)
290- this._thumbnails[w].destroy();
291- this._thumbnails = [];
292- this._porthole = null;
293- },
294-
295-+ _rebuildThumbnails() {
296-+ this._destroyThumbnails();
297-+
298-+ if (Main.overview.visible)
299-+ this._createThumbnails();
300-+ },
301-+
302- _workspacesChanged() {
303- let validThumbnails =
304- this._thumbnails.filter(t => t.state <= ThumbnailState.NORMAL);

Subscribers

People subscribed via source and target branches

to all changes: