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

[Marco Trevisan (Treviño)]

SRU-3.28.2

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 Bícha on 2018-04-23

releasing package gnome-shell version 3.28.1-0ubuntu2

f17a9e0... by Jeremy Bícha 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 Bícha 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

diff --git a/debian/changelog b/debian/changelog
index 1ecd17a..c64e80e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+gnome-shell (3.28.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Olivier Tilloy ]
+  * New upstream release
+    - 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
+
+  [ Andrea Azzarone ]
+  * 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)
+
+ -- Olivier Tilloy <[e-mail]>  Tue, 05 Jun 2018 17:05:42 +0200
+
 gnome-shell (3.28.1-0ubuntu2) bionic; urgency=medium
 
   [ 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
deleted file mode 100644
index 5338069..0000000
--- a/debian/patches/polkitAgent-Guard-against-repeated-close-calls.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
-Date: Sat, 21 Apr 2018 18:39:10 +0200
-Subject: polkitAgent: Guard against repeated close() calls
-
-We use the close() method to disconnect signal handlers set up in
-init(), however the handler ID is only valid in the first call in
-case the method is called more than once.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/issues/221
----
- js/ui/components/polkitAgent.js | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
-index 316bc2a..7a0682c 100644
---- a/js/ui/components/polkitAgent.js
-+++ b/js/ui/components/polkitAgent.js
-@@ -201,7 +201,9 @@ var AuthenticationDialog = new Lang.Class({
-     close(timestamp) {
-         this.parent(timestamp);
- 
--        Main.sessionMode.disconnect(this._sessionUpdatedId);
-+        if (this._sessionUpdatedId)
-+            Main.sessionMode.disconnect(this._sessionUpdatedId);
-+        this._sessionUpdatedId = 0;
-     },
- 
-     _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
deleted 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 @@
-From: Mario Sanchez Prada <[e-mail]>
-Date: Mon, 16 Apr 2018 05:47:57 -0500
-Subject: popupMenu: Fix wrong call to clutter_actor_add_child()
-
-Specify the horizontal alignment via the x_align property when creating
-the StIcon, since this function expects one argument, not two.
-
-Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/cdbc99e
----
- js/ui/popupMenu.js | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
-index 67b928c..83194d7 100644
---- a/js/ui/popupMenu.js
-+++ b/js/ui/popupMenu.js
-@@ -394,8 +394,9 @@ var PopupImageMenuItem = new Lang.Class({
-     _init(text, icon, params) {
-         this.parent(params);
- 
--        this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
--        this.actor.add_child(this._icon, { align: St.Align.END });
-+        this._icon = new St.Icon({ style_class: 'popup-menu-icon',
-+                                   x_align: Clutter.ActorAlign.END });
-+        this.actor.add_child(this._icon);
-         this.label = new St.Label({ text: text });
-         this.actor.add_child(this.label);
-         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
 ubuntu_block_mode_extension_update.patch
 # Cherry picks from upstream
 ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch
-workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
-workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
-workspaceThumbnail-initialize-porthole-based-on-workArea.patch
-popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch
 volume-Add-back-sound-feedback-on-scroll.patch
-polkitAgent-Guard-against-repeated-close-calls.patch
 # End of Cherry-picked patches
 workaround_crasher_fractional_scaling.patch
 shell-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
  js/ui/screenShield.js |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: gnome-shell-3.27.91/js/ui/screenShield.js
+Index: gnome-shell-3.28.1/js/ui/screenShield.js
 ===================================================================
---- gnome-shell-3.27.91.orig/js/ui/screenShield.js
-+++ gnome-shell-3.27.91/js/ui/screenShield.js
+--- gnome-shell-3.28.1.orig/js/ui/screenShield.js
++++ gnome-shell-3.28.1/js/ui/screenShield.js
 @@ -32,6 +32,7 @@ const Util = imports.misc.util;
  const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
  const LOCK_ENABLED_KEY = 'lock-enabled';
@@ -19,7 +19,25 @@ Index: gnome-shell-3.27.91/js/ui/screenShield.js
  
  const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
  const DISABLE_LOCK_KEY = 'disable-lock-screen';
-@@ -727,7 +728,7 @@ var ScreenShield = new Lang.Class({
+@@ -543,6 +544,7 @@ var ScreenShield = new Lang.Class({
+ 
+         this._settings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
+         this._settings.connect('changed::' + LOCK_ENABLED_KEY, this._syncInhibitor.bind(this));
++        this._settings.connect('changed::' + SUSPEND_LOCK_ENABLED_KEY, this._syncInhibitor.bind(this));
+ 
+         this._lockSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
+         this._lockSettings.connect('changed::' + DISABLE_LOCK_KEY, this._syncInhibitor.bind(this));
+@@ -707,7 +709,8 @@ var ScreenShield = new Lang.Class({
+     },
+ 
+     _syncInhibitor() {
+-        let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
++        let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY) ||
++                          this._settings.get_boolean(SUSPEND_LOCK_ENABLED_KEY);
+         let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);
+         let inhibit = (this._loginSession && this._loginSession.Active &&
+                        !this._isActive && lockEnabled && !lockLocked);
+@@ -727,7 +730,7 @@ var ScreenShield = new Lang.Class({
  
      _prepareForSleep(loginManager, aboutToSuspend) {
          if (aboutToSuspend) {
diff --git a/debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch b/debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch
deleted file mode 100644
index f53ea29..0000000
--- a/debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
-Date: Fri, 19 Jan 2018 10:37:20 -0600
-Subject: workspaceThumbnail: initialize porthole based on workArea
-
-https://bugzilla.gnome.org/show_bug.cgi?id=792687
-
-Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792687
-Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/b99e304
----
- js/ui/workspaceThumbnail.js | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
-index 3dffd12..c1b4bdd 100644
---- a/js/ui/workspaceThumbnail.js
-+++ b/js/ui/workspaceThumbnail.js
-@@ -275,8 +275,8 @@ var WorkspaceThumbnail = new Lang.Class({
- 
-         this._createBackground();
- 
--        let monitor = Main.layoutManager.primaryMonitor;
--        this.setPorthole(monitor.x, monitor.y, monitor.width, monitor.height);
-+        let workArea = Main.layoutManager.getWorkAreaForMonitor(this.monitorIndex);
-+        this.setPorthole(workArea.x, workArea.y, workArea.width, workArea.height);
- 
-         let windows = global.get_window_actors().filter(actor => {
-             let win = actor.meta_window;
-@@ -321,8 +321,6 @@ var WorkspaceThumbnail = new Lang.Class({
-     },
- 
-     setPorthole(x, y, width, height) {
--        this._portholeX = x;
--        this._portholeY = y;
-         this.actor.set_size(width, height);
-         this._contents.set_position(-x, -y);
-     },
diff --git a/debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch b/debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
deleted file mode 100644
index 80e1918..0000000
--- a/debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
-Date: Fri, 19 Jan 2018 09:31:01 -0600
-Subject: workspaceThumbnail: only update _porthole if the overview is visible
-
-Otherwise it happens that porthole is computed again after that the
-overlay is hidden (triggered by a layout reallocation) and thus not
-regenerated again afterwards.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=792687
-
-Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792687
-Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/5fcf40b
----
- js/ui/workspaceThumbnail.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
-index 7d5d2c0..5565a1e 100644
---- a/js/ui/workspaceThumbnail.js
-+++ b/js/ui/workspaceThumbnail.js
-@@ -1159,7 +1159,7 @@ var ThumbnailsBox = new Lang.Class({
-     // The "porthole" is the portion of the screen that we show in the
-     // workspaces
-     _ensurePorthole() {
--        if (!Main.layoutManager.primaryMonitor)
-+        if (!Main.layoutManager.primaryMonitor || !Main.overview.visible)
-             return false;
- 
-         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
deleted file mode 100644
index 9243cbc..0000000
--- a/debian/patches/workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
-Date: Fri, 19 Jan 2018 09:39:13 -0600
-Subject: workspaceThumbnail: rebuild thumbnails if workareas size changed
-
-https://bugzilla.gnome.org/show_bug.cgi?id=792687
-
-Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/c29bd46
-Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792687
----
- js/ui/workspaceThumbnail.js | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
-index 5565a1e..3dffd12 100644
---- a/js/ui/workspaceThumbnail.js
-+++ b/js/ui/workspaceThumbnail.js
-@@ -675,11 +675,7 @@ var ThumbnailsBox = new Lang.Class({
-         this._settings.connect('changed::dynamic-workspaces',
-             this._updateSwitcherVisibility.bind(this));
- 
--        Main.layoutManager.connect('monitors-changed', () => {
--            this._destroyThumbnails();
--            if (Main.overview.visible)
--                this._createThumbnails();
--        });
-+        Main.layoutManager.connect('monitors-changed', this._rebuildThumbnails.bind(this));
-     },
- 
-     _updateSwitcherVisibility() {
-@@ -872,6 +868,9 @@ var ThumbnailsBox = new Lang.Class({
-             Main.overview.connect('windows-restacked',
-                                   this._syncStacking.bind(this));
- 
-+        this._workareasChangedId =
-+            global.screen.connect('workareas-changed', this._rebuildThumbnails.bind(this));
-+
-         this._targetScale = 0;
-         this._scale = 0;
-         this._pendingScaleUpdate = false;
-@@ -901,12 +900,24 @@ var ThumbnailsBox = new Lang.Class({
-             this._syncStackingId = 0;
-         }
- 
-+        if (this._workareasChangedId > 0) {
-+            global.screen.disconnect(this._workareasChangedId);
-+            this._workareasChangedId = 0;
-+        }
-+
-         for (let w = 0; w < this._thumbnails.length; w++)
-             this._thumbnails[w].destroy();
-         this._thumbnails = [];
-         this._porthole = null;
-     },
- 
-+    _rebuildThumbnails() {
-+        this._destroyThumbnails();
-+
-+        if (Main.overview.visible)
-+            this._createThumbnails();
-+    },
-+
-     _workspacesChanged() {
-         let validThumbnails =
-             this._thumbnails.filter(t => t.state <= ThumbnailState.NORMAL);