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

Proposed by Marco Trevisan (Treviño)
Status: Rejected
Rejected by: Iain Lane
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 Pending
Review via email: mp+366944@code.launchpad.net
To post a comment you must log in.
7f25865... by Marco Trevisan (Treviño)

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

Fixes LP: #1827953

Revision history for this message
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)

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

Fixes LP: #1827953

cf7c62f... by Marco Trevisan (Treviño)

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
diff --git a/debian/changelog b/debian/changelog
index fd27385..54063f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
1gnome-shell (3.32.1-1ubuntu1~19.04.2) UNRELEASED; urgency=medium
2
3 * d/p/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch:
4 - Really set ellipsize mode in subtitle and body (LP: #1809788)
5 * d/p/worldClocks-Ignore-locations-with-unknown-timezone.patch:
6 - Don't crash if world clocks are enabled (LP: #1827953)
7
8 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 03 May 2019 16:49:55 -0500
9
1gnome-shell (3.32.1-1ubuntu1~19.04.1) disco; urgency=medium10gnome-shell (3.32.1-1ubuntu1~19.04.1) disco; urgency=medium
211
3 * Backport from eoan to disco12 * Backport from eoan to disco
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
4new file mode 10064413new file mode 100644
index 0000000..8a9cf0e
--- /dev/null
+++ b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
@@ -0,0 +1,40 @@
1From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
2Date: Fri, 3 May 2019 15:27:13 -0500
3Subject: dialog: Really set ellipsize mode in subtitle and body
4
5Dialog's subtitle or body could not be properly wrapped, while it's ellipsized
6when the text's width doesn't exceed the container size.
7
8Clutter text has an `ellipsize` property, however in dialog's subtitle and body
9we have been setting the `ellipsize-mode` property to Pango.EllipsizeMode.NONE
10that is not present in the underlying GObject.
11
12Not being an error in javascript, gjs didn't warn us about this, while at the
13same time the St.Label's default Pango.EllipsizeMode.END was used.
14
15Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/922
16
17https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/531
18
19(cherry picked from commit 0539efc8df23909a5396194ca780613f21bb63d8)
20
21Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/0539efc8
22Bug-Ubuntu: https://bugs.launchpad.net/oem-priority/+bug/1809788
23Applied: 3.32.2
24---
25 js/ui/dialog.js | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/js/ui/dialog.js b/js/ui/dialog.js
29index 809acff..41a0763 100644
30--- a/js/ui/dialog.js
31+++ b/js/ui/dialog.js
32@@ -175,7 +175,7 @@ var MessageDialogContent = GObject.registerClass({
33 this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
34 });
35
36- let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
37+ let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
38 line_wrap: true };
39 Object.assign(this._subtitle.clutter_text, textProps);
40 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
15st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch15st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
16st-scroll-view-Remove-scrollbars-references-on-dispose.patch16st-scroll-view-Remove-scrollbars-references-on-dispose.patch
17magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch17magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
18dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
19worldClocks-Ignore-locations-with-unknown-timezone.patch
18ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch20ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
19ubuntu/resolve_alternate_theme_path.patch21ubuntu/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
20new file mode 10064422new file mode 100644
index 0000000..26fc791
--- /dev/null
+++ b/debian/patches/worldClocks-Ignore-locations-with-unknown-timezone.patch
@@ -0,0 +1,38 @@
1From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
2Date: Sun, 28 Apr 2019 12:33:41 +0200
3Subject: worldClocks: Ignore locations with unknown timezone
4
5We currently assume that every location has an associated timezone.
6While this is sound in the real world, in practise it depends on
7whether or not libgweather can find a corresponding timezone DB
8entry.
9
10This used to be a fringe case, but has become more likely when commit
11https://gitlab.gnome.org/GNOME/libgweather/commit/d7682676ac9 moved
12weather stations from cities to countries - the station itself is un-
13likely to have a timezone entry, and the country may be part of more
14than a single timezone.
15
16It would be good for libgweather to return a timezone for those
17locations again, but we should defend against the case anyway.
18We cannot tell what time it is at a particular location without
19knowing the timezone, so simply filter them out.
20
21https://gitlab.gnome.org/GNOME/gnome-shell/issues/1062
22---
23 js/ui/dateMenu.js | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
27index fb32fbb..06ea2b5 100644
28--- a/js/ui/dateMenu.js
29+++ b/js/ui/dateMenu.js
30@@ -118,7 +118,7 @@ var WorldClocksSection = class WorldClocksSection {
31 if (!clocks[i].location)
32 continue;
33 let l = world.deserialize(clocks[i].location);
34- if (l)
35+ if (l && l.get_timezone() != null)
36 this._locations.push({ location: l });
37 }
38

Subscribers

People subscribed via source and target branches