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

[Marco Trevisan (Treviño)]

[Daniel van Vugt (vanvugt)]

Status should be "Merged" now. It looks like it's already merged.

[Marco Trevisan (Treviño) (3v1n0)]

Well, I've rebased this.

So we can reuse the same PR.
This depends on https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/366676

[Daniel van Vugt (vanvugt)]

OK then. I can confirm that last commit 78e6f42 looks correct and is what I expected.

review: Approve

[Daniel van Vugt (vanvugt)]

That last commit also looks good.

[Daniel van Vugt (vanvugt)]

review: Approve

[Daniel van Vugt (vanvugt)]

Sorry, please also grab https://gitlab.gnome.org/GNOME/gnome-shell/commit/8702d66 to fix LP: #1827284

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Oops. Too late. This already merged.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index bfb427a..773bd14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+gnome-shell (3.28.3+git20190124-0ubuntu18.04.2) UNRELEASED; urgency=medium
+
+  * d/p/switchMonitor-switch-to-next-config-upon-initial-keypress.patch
+    - Ensure switch display mode is cyclic (LP: #1772811)
+  * debian/control:
+    - Depends on mutter 3.28.3+git20190124-0ubuntu18.04.3
+  * d/p/dnd-Only-handle-touch-events-in-wayland.patch:
+    - dnd: Only handle touch events in wayland (LP: #1817020)
+  * d/p/st-widget-Add-missing-g_return_val_if_fail.patch:
+    - st-widget: Protect from NULL obj in get_theme_node (LP: #1796606)
+  * d/p/windowManager-listen-actively-to-windows-being-destroyed-.patch:
+    - windowManager: listen actively to windows being destroyed during WS switch
+      (LP: #1812527)
+  * d/p/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch:
+    - Really set ellipsize mode in subtitle and body (LP: #1809788)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Mon, 29 Apr 2019 23:53:08 -0500
+
 gnome-shell (3.28.3+git20190124-0ubuntu18.04.1) bionic; urgency=medium
 
   * New git snapshot release up to commit 24cdcc56d (LP: #1811900)
diff --git a/debian/control b/debian/control
index 1c0834d..7b29d44 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Depends: ${gir:Depends},
          gir1.2-gtk-3.0 (>= 3.16),
          gir1.2-gweather-3.0,
          gir1.2-ibus-1.0 (>= 1.5.2),
-         gir1.2-mutter-2 (>= 3.27.91),
+         gir1.2-mutter-2 (>= 3.28.3+git20190124-0ubuntu18.04.3),
          gir1.2-nm-1.0 [linux-any],
          gir1.2-nma-1.0 [linux-any],
          gir1.2-pango-1.0,
@@ -96,7 +96,7 @@ Depends: ${gir:Depends},
          gnome-shell-common (= ${source:Version}),
          ubuntu-wallpapers,
          gsettings-desktop-schemas (>= 3.21.3),
-         mutter (>= 3.27.91),
+         mutter (>= 3.28.3+git20190124-0ubuntu18.04.3),
          python3,
          libglib2.0-bin (>= 2.53.0),
 Recommends: xserver-xorg-legacy,
diff --git a/debian/control.in b/debian/control.in
index 4224314..0b0bb20 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -79,7 +79,7 @@ Depends: ${gir:Depends},
          gir1.2-gtk-3.0 (>= 3.16),
          gir1.2-gweather-3.0,
          gir1.2-ibus-1.0 (>= 1.5.2),
-         gir1.2-mutter-2 (>= 3.27.91),
+         gir1.2-mutter-2 (>= 3.28.3+git20190124-0ubuntu18.04.3),
          gir1.2-nm-1.0 [linux-any],
          gir1.2-nma-1.0 [linux-any],
          gir1.2-pango-1.0,
@@ -92,7 +92,7 @@ Depends: ${gir:Depends},
          gnome-shell-common (= ${source:Version}),
          ubuntu-wallpapers,
          gsettings-desktop-schemas (>= 3.21.3),
-         mutter (>= 3.27.91),
+         mutter (>= 3.28.3+git20190124-0ubuntu18.04.3),
          python3,
          libglib2.0-bin (>= 2.53.0),
 Recommends: xserver-xorg-legacy,
diff --git a/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
new file mode 100644
index 0000000..9f1787e
--- /dev/null
+++ b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
@@ -0,0 +1,40 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Fri, 3 May 2019 15:27:13 -0500
+Subject: dialog: Really set ellipsize mode in subtitle and body
+
+Dialog's subtitle or body could not be properly wrapped, while it's ellipsized
+when the text's width doesn't exceed the container size.
+
+Clutter text has an `ellipsize` property, however in dialog's subtitle and body
+we have been setting the `ellipsize-mode` property to Pango.EllipsizeMode.NONE
+that is not present in the underlying GObject.
+
+Not being an error in javascript, gjs didn't warn us about this, while at the
+same time the St.Label's default Pango.EllipsizeMode.END was used.
+
+Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/922
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/531
+
+(cherry picked from commit 3121c9aa29406ad85e949b697e90092f1fa6fc2e)
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/5703a25e
+Bug-Ubuntu: https://bugs.launchpad.net/oem-priority/+bug/1809788
+Applied: 3.28.4
+---
+ js/ui/dialog.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/dialog.js b/js/ui/dialog.js
+index 89db963..3377957 100644
+--- a/js/ui/dialog.js
++++ b/js/ui/dialog.js
+@@ -185,7 +185,7 @@ var MessageDialogContent = new Lang.Class({
+             this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
+         });
+ 
+-        let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
++        let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
+                           line_wrap: true };
+         Object.assign(this._subtitle.clutter_text, textProps);
+         Object.assign(this._body.clutter_text, textProps);
diff --git a/debian/patches/dnd-Only-handle-touch-events-in-wayland.patch b/debian/patches/dnd-Only-handle-touch-events-in-wayland.patch
new file mode 100644
index 0000000..adb0ad8
--- /dev/null
+++ b/debian/patches/dnd-Only-handle-touch-events-in-wayland.patch
@@ -0,0 +1,40 @@
+From: Andrea Azzarone <[e-mail]>
+Date: Mon, 4 Mar 2019 16:14:22 +0000
+Subject: dnd: Only handle touch events in wayland
+
+There are serveral issues around touch passive grab and touch/pointer doubly
+handling to use these on X11, so we stick to single-touch/pointer there.
+
+Cherry picked from commit 60ccdc2deb746c0d96b0268ee5034b65478ce779
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1015
+
+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1817020
+GNOME-Bug: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1015
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/457
+Applied-Upstream: 3.28.4
+---
+ js/ui/dnd.js | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/js/ui/dnd.js b/js/ui/dnd.js
+index 9e961a1..af7a27a 100644
+--- a/js/ui/dnd.js
++++ b/js/ui/dnd.js
+@@ -132,6 +132,16 @@ var _Draggable = new Lang.Class({
+     },
+ 
+     _onTouchEvent(actor, event) {
++        // Here we only handle touch events on wayland. On X11
++        // we do get emulated pointer events, which already works
++        // for single-touch cases. Besides, the X11 passive touch grab
++        // set up by Mutter will make us see first the touch events
++        // and later the pointer events, so it will look like two
++        // unrelated series of events, we want to avoid double handling
++        // in these cases.
++        if (!Meta.is_wayland_compositor())
++            return Clutter.EVENT_PROPAGATE;
++
+         if (event.type() != Clutter.EventType.TOUCH_BEGIN ||
+             !global.display.is_pointer_emulating_sequence(event.get_event_sequence()))
+             return Clutter.EVENT_PROPAGATE;
diff --git a/debian/patches/series b/debian/patches/series
index 072136d..8602934 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,8 @@ st-scroll-view-Remove-scrollbars-references-on-dispose.patch
 keyboard-Filter-redundant-FocusTracker-position-changed-s.patch
 keyboard-Listen-to-IbusPanelService-focus-in-out-to-track.patch
 power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch
+switchMonitor-switch-to-next-config-upon-initial-keypress.patch
+dnd-Only-handle-touch-events-in-wayland.patch
+st-widget-Add-missing-g_return_val_if_fail.patch
+windowManager-listen-actively-to-windows-being-destroyed-.patch
+dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
diff --git a/debian/patches/st-widget-Add-missing-g_return_val_if_fail.patch b/debian/patches/st-widget-Add-missing-g_return_val_if_fail.patch
new file mode 100644
index 0000000..4af9547
--- /dev/null
+++ b/debian/patches/st-widget-Add-missing-g_return_val_if_fail.patch
@@ -0,0 +1,32 @@
+From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
+Date: Tue, 5 Mar 2019 19:42:01 +0100
+Subject: st-widget: Add missing g_return_val_if_fail()
+
+It's a public function, so it's good practice to sanity-check its
+input (unless disabled at compile time of course).
+
+https://gitlab.gnome.org/GNOME/gnome-shell/issues/1018
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/438
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1796606
+---
+ src/st/st-widget.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/st/st-widget.c b/src/st/st-widget.c
+index 7c39b35..09a06e7 100644
+--- a/src/st/st-widget.c
++++ b/src/st/st-widget.c
+@@ -571,7 +571,11 @@ get_root_theme_node (ClutterStage *stage)
+ StThemeNode *
+ st_widget_get_theme_node (StWidget *widget)
+ {
+-  StWidgetPrivate *priv = st_widget_get_instance_private (widget);
++  StWidgetPrivate *priv;
++
++  g_return_val_if_fail (ST_IS_WIDGET (widget), NULL);
++
++  priv = st_widget_get_instance_private (widget);
+ 
+   if (priv->theme_node == NULL)
+     {
diff --git a/debian/patches/switchMonitor-switch-to-next-config-upon-initial-keypress.patch b/debian/patches/switchMonitor-switch-to-next-config-upon-initial-keypress.patch
new file mode 100644
index 0000000..4f9a217
--- /dev/null
+++ b/debian/patches/switchMonitor-switch-to-next-config-upon-initial-keypress.patch
@@ -0,0 +1,58 @@
+From: Daniel Drake <[e-mail]>
+Date: Mon, 30 Jul 2018 21:17:44 -0300
+Subject: switchMonitor: switch to next config upon initial keypress
+
+In GNOME-3.24, pressing Super+P or a similar function key would cause
+a switch to the next available monitor configuration.
+
+However, in GNOME-3.26, this was reimplemented in mutter and gnome-shell
+and the behaviour is now different: pressing Super+P and releasing will
+cause no change in montor configuration[1]. In this new design you have
+to press Super+P and keep holding Super in order to keep the switcher
+open, then press P again (or use the arrow keys or mouse) to
+select the next one in the list.
+
+This is incompatible with many Asus products such as Asus X530UN, where
+pressing the presentation mode media key (Fn+F8) actually generates
+the following keypress events from the keyboard controller:
+
+Fn pressed: nothing
+F8 pressed: nothing
+F8 released: Super press, p press, p release, Super release (quick burst)
+Fn released: nothing
+
+With this firmware behaviour it's not possible to hold the keys and have
+the dialog come up so that you can select another new mode.
+
+To solve this, when the switcher is opened, select the next available
+display config by default, which is more similar to the pre-GNOME-3.26
+behaviour. Now pressing Fn+F8 on this laptop will result in the display
+mode switch taking place.
+
+[1]: The mentioned desired behaviour will at least happen after
+https://gitlab.gnome.org/GNOME/mutter/issues/281 has been fixed
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/208
+
+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1772811
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/208
+Applied-Upstream: yes, 3.30.1
+---
+ js/ui/switchMonitor.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/switchMonitor.js b/js/ui/switchMonitor.js
+index 96fb854..31b4f33 100644
+--- a/js/ui/switchMonitor.js
++++ b/js/ui/switchMonitor.js
+@@ -49,8 +49,8 @@ var SwitchMonitorPopup = new Lang.Class({
+ 
+     _initialSelection() {
+         let currentConfig = Meta.MonitorManager.get().get_switch_config();
+-        currentConfig %= Meta.MonitorSwitchConfigType.UNKNOWN;
+-        this._select(currentConfig);
++        let selectConfig = (currentConfig + 1) % Meta.MonitorSwitchConfigType.UNKNOWN;
++        this._select(selectConfig);
+     },
+ 
+     _keyPressHandler(keysym, action) {
diff --git a/debian/patches/windowManager-listen-actively-to-windows-being-destroyed-.patch b/debian/patches/windowManager-listen-actively-to-windows-being-destroyed-.patch
new file mode 100644
index 0000000..76cbcf0
--- /dev/null
+++ b/debian/patches/windowManager-listen-actively-to-windows-being-destroyed-.patch
@@ -0,0 +1,47 @@
+From: Carlos Garnacho <[e-mail]>
+Date: Thu, 6 Sep 2018 21:50:21 +0200
+Subject: windowManager: listen actively to windows being destroyed during WS
+ switch
+
+Prevents gjs from dealing with already dispose()d objects.
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/539
+
+(cherry-picked from b087752b5539a8cbb1d61979cb069aef8a3475be)
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/b087752b
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1812527
+---
+ js/ui/windowManager.js | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
+index 8e7e7a6..49d7035 100644
+--- a/js/ui/windowManager.js
++++ b/js/ui/windowManager.js
+@@ -1763,6 +1763,14 @@ var WindowManager = new Lang.Class({
+             }
+         }
+ 
++        for (let i = 0; i < switchData.windows.length; i++) {
++            let w = switchData.windows[i];
++
++            w.windowDestroyId = w.window.connect('destroy', () => {
++                switchData.windows.splice(switchData.windows.indexOf(w), 1);
++            });
++        }
++
+         switchData.inGroup.set_position(-xDest, -yDest);
+         switchData.inGroup.raise_top();
+ 
+@@ -1793,8 +1801,8 @@ var WindowManager = new Lang.Class({
+ 
+         for (let i = 0; i < switchData.windows.length; i++) {
+                 let w = switchData.windows[i];
+-                if (w.window.is_destroyed()) // Window gone
+-                    continue;
++                w.window.disconnect(w.windowDestroyId);
++
+                 if (w.window.get_parent() == switchData.outGroup) {
+                     w.window.reparent(w.parent);
+                     w.window.hide();