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

Proposed by Marco Trevisan (Treviño) on 2019-05-08
Status: Merged
Merged at revision: b44e3b178575ca0e8b7b23610d5cff8646c5c8e7
Proposed branch: ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Diff against target: 198 lines (+112/-20)
5 files modified
debian/changelog (+8/-0)
debian/patches/CVE-2019-3820-1.patch (+5/-6)
debian/patches/CVE-2019-3820-2.patch (+13/-14)
debian/patches/series (+1/-0)
debian/patches/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch (+85/-0)
Reviewer Review Type Date Requested Status
Iain Lane Approve on 2019-05-10
Daniel van Vugt (community) Approve on 2019-05-09
Ubuntu Server Dev import team 2019-05-08 Pending
Review via email: mp+367149@code.launchpad.net

This proposal supersedes a proposal from 2019-05-08.

To post a comment you must log in.
Daniel van Vugt (vanvugt) wrote :

Once again, I was planning on proposing this today. But thanks for beating me to it.

review: Approve
Iain Lane (laney) wrote :

Thanks, will merge and upload.

==============================

Feedback: it'd be helpful to keep debian/changelog entries separate from the functional change. In this case the 18.04.3 version number is not yet burned because the upload isn't accepted. I'm going to replace it in the queue - if I could just take the functional change and run `gbp dch' myself that'd be easier. (I've reverted ebdff17eb876e7e95aad847dc89d32e510b5f10b locally.)

review: Approve

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 24ac316..ab73a62 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+gnome-shell (3.28.3+git20190124-0ubuntu18.04.4) UNRELEASED; urgency=medium
7+
8+ * d/p/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch:
9+ - Fix regression on missing spread animation (LP: #1827284)
10+ * Refreshed patches
11+
12+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 08 May 2019 14:49:43 -0500
13+
14 gnome-shell (3.28.3+git20190124-0ubuntu18.04.3) bionic; urgency=medium
15
16 * d/p/switchMonitor-switch-to-next-config-upon-initial-keypress.patch
17diff --git a/debian/patches/CVE-2019-3820-1.patch b/debian/patches/CVE-2019-3820-1.patch
18index b637c27..f704252 100644
19--- a/debian/patches/CVE-2019-3820-1.patch
20+++ b/debian/patches/CVE-2019-3820-1.patch
21@@ -1,5 +1,4 @@
22-From 511e8c658445377b044c6dfb241709142c97a8ce Mon Sep 17 00:00:00 2001
23-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
24+From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
25 Date: Wed, 23 Jan 2019 23:55:12 +0100
26 Subject: [PATCH] panel: Don't allow opening hidden menus via keybindings
27
28@@ -13,10 +12,10 @@ https://gitlab.gnome.org/GNOME/gnome-shell/issues/851
29 js/ui/panel.js | 4 ++--
30 1 file changed, 2 insertions(+), 2 deletions(-)
31
32-Index: gnome-shell-3.28.3+git20190124/js/ui/panel.js
33-===================================================================
34---- gnome-shell-3.28.3+git20190124.orig/js/ui/panel.js
35-+++ gnome-shell-3.28.3+git20190124/js/ui/panel.js
36+diff --git a/js/ui/panel.js b/js/ui/panel.js
37+index a76916b..85572e2 100644
38+--- a/js/ui/panel.js
39++++ b/js/ui/panel.js
40 @@ -992,8 +992,8 @@ var Panel = new Lang.Class({
41 },
42
43diff --git a/debian/patches/CVE-2019-3820-2.patch b/debian/patches/CVE-2019-3820-2.patch
44index 51a8297..dc6e562 100644
45--- a/debian/patches/CVE-2019-3820-2.patch
46+++ b/debian/patches/CVE-2019-3820-2.patch
47@@ -1,4 +1,3 @@
48-From e23f4d6c7c300e579db21bb9dffeeaace6f39959 Mon Sep 17 00:00:00 2001
49 From: Ray Strode <rstrode@redhat.com>
50 Date: Wed, 23 Jan 2019 15:59:42 -0500
51 Subject: [PATCH] shellActionModes: disable POPUP keybindings in unlock screen
52@@ -30,10 +29,10 @@ Closes https://gitlab.gnome.org/GNOME/gnome-shell/issues/851
53 js/ui/shellEntry.js | 6 ++++--
54 3 files changed, 8 insertions(+), 4 deletions(-)
55
56-Index: gnome-shell-3.28.3/js/gdm/authPrompt.js
57-===================================================================
58---- gnome-shell-3.28.3.orig/js/gdm/authPrompt.js
59-+++ gnome-shell-3.28.3/js/gdm/authPrompt.js
60+diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
61+index a0a4a21..78e0454 100644
62+--- a/js/gdm/authPrompt.js
63++++ b/js/gdm/authPrompt.js
64 @@ -11,6 +11,7 @@ const Animation = imports.ui.animation;
65 const Batch = imports.gdm.batch;
66 const GdmUtil = imports.gdm.util;
67@@ -51,10 +50,10 @@ Index: gnome-shell-3.28.3/js/gdm/authPrompt.js
68
69 this.actor.add(this._entry,
70 { expand: true,
71-Index: gnome-shell-3.28.3/js/gdm/loginDialog.js
72-===================================================================
73---- gnome-shell-3.28.3.orig/js/gdm/loginDialog.js
74-+++ gnome-shell-3.28.3/js/gdm/loginDialog.js
75+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
76+index 4a93545..5ab8525 100644
77+--- a/js/gdm/loginDialog.js
78++++ b/js/gdm/loginDialog.js
79 @@ -338,7 +338,8 @@ var SessionMenuButton = new Lang.Class({
80 this._button.remove_style_pseudo_class('active');
81 });
82@@ -65,11 +64,11 @@ Index: gnome-shell-3.28.3/js/gdm/loginDialog.js
83 this._manager.addMenu(this._menu);
84
85 this._button.connect('clicked', () => { this._menu.toggle(); });
86-Index: gnome-shell-3.28.3/js/ui/shellEntry.js
87-===================================================================
88---- gnome-shell-3.28.3.orig/js/ui/shellEntry.js
89-+++ gnome-shell-3.28.3/js/ui/shellEntry.js
90-@@ -9,6 +9,7 @@ const BoxPointer = imports.ui.boxpointer
91+diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
92+index 9db5136..09bb9bb 100644
93+--- a/js/ui/shellEntry.js
94++++ b/js/ui/shellEntry.js
95+@@ -9,6 +9,7 @@ const BoxPointer = imports.ui.boxpointer;
96 const Main = imports.ui.main;
97 const Params = imports.misc.params;
98 const PopupMenu = imports.ui.popupMenu;
99diff --git a/debian/patches/series b/debian/patches/series
100index 0cea11a..944c446 100644
101--- a/debian/patches/series
102+++ b/debian/patches/series
103@@ -28,3 +28,4 @@ dnd-Only-handle-touch-events-in-wayland.patch
104 st-widget-Add-missing-g_return_val_if_fail.patch
105 windowManager-listen-actively-to-windows-being-destroyed-.patch
106 dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
107+st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch
108diff --git a/debian/patches/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch b/debian/patches/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch
109new file mode 100644
110index 0000000..65a15de
111--- /dev/null
112+++ b/debian/patches/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch
113@@ -0,0 +1,85 @@
114+From: Carlos Garnacho <carlosg@gnome.org>
115+Date: Thu, 28 Jun 2018 20:22:40 +0200
116+Subject: st-adjustment: Mark all properties as EXPLICIT_NOTIFY
117+
118+All adjustment setter functions take good care of avoiding emission of
119+notify:: when it's not needed. The set_property() implementation already
120+calls into the setter functions, so mark the properties as EXPLICITY_NOTIFY
121+in order to optimize notify:: emission away through g_object_set (rather
122+common from JS code).
123+
124+(cherry picked from commit b1b455ff1a0e856149142747e77fb1c98df34c03)
125+
126+Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1270
127+
128+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/8702d66
129+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1827284
130+Applied-Upstream: 3.28.4
131+---
132+ src/st/st-adjustment.c | 18 ++++++++++++------
133+ 1 file changed, 12 insertions(+), 6 deletions(-)
134+
135+diff --git a/src/st/st-adjustment.c b/src/st/st-adjustment.c
136+index 005c6eb..598df4e 100644
137+--- a/src/st/st-adjustment.c
138++++ b/src/st/st-adjustment.c
139+@@ -205,7 +205,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
140+ G_MAXDOUBLE,
141+ 0.0,
142+ ST_PARAM_READWRITE |
143+- G_PARAM_CONSTRUCT));
144++ G_PARAM_CONSTRUCT |
145++ G_PARAM_EXPLICIT_NOTIFY));
146+ g_object_class_install_property (object_class,
147+ PROP_UPPER,
148+ g_param_spec_double ("upper",
149+@@ -215,7 +216,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
150+ G_MAXDOUBLE,
151+ 0.0,
152+ ST_PARAM_READWRITE |
153+- G_PARAM_CONSTRUCT));
154++ G_PARAM_CONSTRUCT |
155++ G_PARAM_EXPLICIT_NOTIFY));
156+ g_object_class_install_property (object_class,
157+ PROP_VALUE,
158+ g_param_spec_double ("value",
159+@@ -225,7 +227,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
160+ G_MAXDOUBLE,
161+ 0.0,
162+ ST_PARAM_READWRITE |
163+- G_PARAM_CONSTRUCT));
164++ G_PARAM_CONSTRUCT |
165++ G_PARAM_EXPLICIT_NOTIFY));
166+ g_object_class_install_property (object_class,
167+ PROP_STEP_INC,
168+ g_param_spec_double ("step-increment",
169+@@ -235,7 +238,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
170+ G_MAXDOUBLE,
171+ 0.0,
172+ ST_PARAM_READWRITE |
173+- G_PARAM_CONSTRUCT));
174++ G_PARAM_CONSTRUCT |
175++ G_PARAM_EXPLICIT_NOTIFY));
176+ g_object_class_install_property (object_class,
177+ PROP_PAGE_INC,
178+ g_param_spec_double ("page-increment",
179+@@ -245,7 +249,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
180+ G_MAXDOUBLE,
181+ 0.0,
182+ ST_PARAM_READWRITE |
183+- G_PARAM_CONSTRUCT));
184++ G_PARAM_CONSTRUCT |
185++ G_PARAM_EXPLICIT_NOTIFY));
186+ g_object_class_install_property (object_class,
187+ PROP_PAGE_SIZE,
188+ g_param_spec_double ("page-size",
189+@@ -255,7 +260,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
190+ G_MAXDOUBLE,
191+ 0.0,
192+ ST_PARAM_READWRITE |
193+- G_PARAM_CONSTRUCT));
194++ G_PARAM_CONSTRUCT |
195++ G_PARAM_EXPLICIT_NOTIFY));
196+ /**
197+ * StAdjustment::changed:
198+ * @self: the #StAdjustment

Subscribers

People subscribed via source and target branches