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

[Marco Trevisan (Treviño)]

3b931f7... by Marco Trevisan (Treviño) on 2019-05-07

debian/patches: Don't crash if world clocks are enabled

Fixes LP: #1827953

[Iain Lane (laney)]

thanks Marco - just saw this but we'll get it via 3.32.2 now :>

Unmerged commits

3b931f7... by Marco Trevisan (Treviño) on 2019-05-07

debian/patches: Don't crash if world clocks are enabled

Fixes LP: #1827953

8ac798a... by Marco Trevisan (Treviño) on 2019-05-03

debian/patches: Really set ellipsize mode in subtitle and body

Fixes LP: #1809788

diff --git a/debian/changelog b/debian/changelog
index 53e0239..e5dfea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnome-shell (3.32.1-1ubuntu2) UNRELEASED; urgency=medium
+
+  * d/p/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch:
+    - Really set ellipsize mode in subtitle and body (LP: #1809788)
+  * d/p/worldClocks-Ignore-locations-with-unknown-timezone.patch:
+    - Don't crash if world clocks are enabled (LP: #1827953)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Fri, 03 May 2019 16:49:55 -0500
+
 gnome-shell (3.32.1-1ubuntu1) eoan; urgency=medium
 
   [ Marco Trevisan (Treviño) ]
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..07395fb
--- /dev/null
+++ b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
@@ -0,0 +1,38 @@
+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
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/3121c9aa
+Bug-Ubuntu: https://bugs.launchpad.net/oem-priority/+bug/1809788
+Applied: 3.33.1
+---
+ 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 809acff..41a0763 100644
+--- a/js/ui/dialog.js
++++ b/js/ui/dialog.js
+@@ -175,7 +175,7 @@ var MessageDialogContent = GObject.registerClass({
+             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/series b/debian/patches/series
index adbf4d0..b32b5e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,5 +15,7 @@ sessionMode-add-support-for-debugFlags-parameter.patch
 st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
 st-scroll-view-Remove-scrollbars-references-on-dispose.patch
 magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
+dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
+worldClocks-Ignore-locations-with-unknown-timezone.patch
 ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
 ubuntu/resolve_alternate_theme_path.patch
diff --git a/debian/patches/worldClocks-Ignore-locations-with-unknown-timezone.patch b/debian/patches/worldClocks-Ignore-locations-with-unknown-timezone.patch
new file mode 100644
index 0000000..26fc791
--- /dev/null
+++ b/debian/patches/worldClocks-Ignore-locations-with-unknown-timezone.patch
@@ -0,0 +1,38 @@
+From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
+Date: Sun, 28 Apr 2019 12:33:41 +0200
+Subject: worldClocks: Ignore locations with unknown timezone
+
+We currently assume that every location has an associated timezone.
+While this is sound in the real world, in practise it depends on
+whether or not libgweather can find a corresponding timezone DB
+entry.
+
+This used to be a fringe case, but has become more likely when commit
+https://gitlab.gnome.org/GNOME/libgweather/commit/d7682676ac9 moved
+weather stations from cities to countries - the station itself is un-
+likely to have a timezone entry, and the country may be part of more
+than a single timezone.
+
+It would be good for libgweather to return a timezone for those
+locations again, but we should defend against the case anyway.
+We cannot tell what time it is at a particular location without
+knowing the timezone, so simply filter them out.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/issues/1062
+---
+ js/ui/dateMenu.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
+index fb32fbb..06ea2b5 100644
+--- a/js/ui/dateMenu.js
++++ b/js/ui/dateMenu.js
+@@ -118,7 +118,7 @@ var WorldClocksSection = class WorldClocksSection {
+             if (!clocks[i].location)
+                 continue;
+             let l = world.deserialize(clocks[i].location);
+-            if (l)
++            if (l && l.get_timezone() != null)
+                 this._locations.push({ location: l });
+         }
+