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

Proposed by Marco Trevisan (Treviño) on 2019-05-03
Status: Rejected
Rejected by: Iain Lane on 2019-06-26
Proposed branch: ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/disco
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/disco
Diff against target: 119 lines (+89/-0)
4 files modified
debian/changelog (+9/-0)
debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch (+40/-0)
debian/patches/series (+2/-0)
debian/patches/worldClocks-Ignore-locations-with-unknown-timezone.patch (+38/-0)
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2019-05-03 Pending
Review via email: mp+366944@code.launchpad.net
To post a comment you must log in.
7f25865... by Marco Trevisan (Treviño) on 2019-05-07

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

Fixes LP: #1827953

Marco Trevisan (Treviño) (3v1n0) wrote :

This can be rejected since it's going to be overridden by 3.32.2

Unmerged commits

7f25865... by Marco Trevisan (Treviño) on 2019-05-07

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

Fixes LP: #1827953

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

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

Fixes LP: #1809788

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 fd27385..54063f3 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,12 @@
6+gnome-shell (3.32.1-1ubuntu1~19.04.2) UNRELEASED; urgency=medium
7+
8+ * d/p/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch:
9+ - Really set ellipsize mode in subtitle and body (LP: #1809788)
10+ * d/p/worldClocks-Ignore-locations-with-unknown-timezone.patch:
11+ - Don't crash if world clocks are enabled (LP: #1827953)
12+
13+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 03 May 2019 16:49:55 -0500
14+
15 gnome-shell (3.32.1-1ubuntu1~19.04.1) disco; urgency=medium
16
17 * Backport from eoan to disco
18diff --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
19new file mode 100644
20index 0000000..8a9cf0e
21--- /dev/null
22+++ b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
23@@ -0,0 +1,40 @@
24+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
25+Date: Fri, 3 May 2019 15:27:13 -0500
26+Subject: dialog: Really set ellipsize mode in subtitle and body
27+
28+Dialog's subtitle or body could not be properly wrapped, while it's ellipsized
29+when the text's width doesn't exceed the container size.
30+
31+Clutter text has an `ellipsize` property, however in dialog's subtitle and body
32+we have been setting the `ellipsize-mode` property to Pango.EllipsizeMode.NONE
33+that is not present in the underlying GObject.
34+
35+Not being an error in javascript, gjs didn't warn us about this, while at the
36+same time the St.Label's default Pango.EllipsizeMode.END was used.
37+
38+Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/922
39+
40+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/531
41+
42+(cherry picked from commit 0539efc8df23909a5396194ca780613f21bb63d8)
43+
44+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/0539efc8
45+Bug-Ubuntu: https://bugs.launchpad.net/oem-priority/+bug/1809788
46+Applied: 3.32.2
47+---
48+ js/ui/dialog.js | 2 +-
49+ 1 file changed, 1 insertion(+), 1 deletion(-)
50+
51+diff --git a/js/ui/dialog.js b/js/ui/dialog.js
52+index 809acff..41a0763 100644
53+--- a/js/ui/dialog.js
54++++ b/js/ui/dialog.js
55+@@ -175,7 +175,7 @@ var MessageDialogContent = GObject.registerClass({
56+ this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
57+ });
58+
59+- let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
60++ let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
61+ line_wrap: true };
62+ Object.assign(this._subtitle.clutter_text, textProps);
63+ Object.assign(this._body.clutter_text, textProps);
64diff --git a/debian/patches/series b/debian/patches/series
65index adbf4d0..b32b5e4 100644
66--- a/debian/patches/series
67+++ b/debian/patches/series
68@@ -15,5 +15,7 @@ sessionMode-add-support-for-debugFlags-parameter.patch
69 st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
70 st-scroll-view-Remove-scrollbars-references-on-dispose.patch
71 magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
72+dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
73+worldClocks-Ignore-locations-with-unknown-timezone.patch
74 ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
75 ubuntu/resolve_alternate_theme_path.patch
76diff --git a/debian/patches/worldClocks-Ignore-locations-with-unknown-timezone.patch b/debian/patches/worldClocks-Ignore-locations-with-unknown-timezone.patch
77new file mode 100644
78index 0000000..26fc791
79--- /dev/null
80+++ b/debian/patches/worldClocks-Ignore-locations-with-unknown-timezone.patch
81@@ -0,0 +1,38 @@
82+From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
83+Date: Sun, 28 Apr 2019 12:33:41 +0200
84+Subject: worldClocks: Ignore locations with unknown timezone
85+
86+We currently assume that every location has an associated timezone.
87+While this is sound in the real world, in practise it depends on
88+whether or not libgweather can find a corresponding timezone DB
89+entry.
90+
91+This used to be a fringe case, but has become more likely when commit
92+https://gitlab.gnome.org/GNOME/libgweather/commit/d7682676ac9 moved
93+weather stations from cities to countries - the station itself is un-
94+likely to have a timezone entry, and the country may be part of more
95+than a single timezone.
96+
97+It would be good for libgweather to return a timezone for those
98+locations again, but we should defend against the case anyway.
99+We cannot tell what time it is at a particular location without
100+knowing the timezone, so simply filter them out.
101+
102+https://gitlab.gnome.org/GNOME/gnome-shell/issues/1062
103+---
104+ js/ui/dateMenu.js | 2 +-
105+ 1 file changed, 1 insertion(+), 1 deletion(-)
106+
107+diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
108+index fb32fbb..06ea2b5 100644
109+--- a/js/ui/dateMenu.js
110++++ b/js/ui/dateMenu.js
111+@@ -118,7 +118,7 @@ var WorldClocksSection = class WorldClocksSection {
112+ if (!clocks[i].location)
113+ continue;
114+ let l = world.deserialize(clocks[i].location);
115+- if (l)
116++ if (l && l.get_timezone() != null)
117+ this._locations.push({ location: l });
118+ }
119+

Subscribers

People subscribed via source and target branches