Ubuntu
gnome-shell package

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

  1. Git
  2. lp:~3v1n0/ubuntu/+source/gnome-shell
  3. ubuntu/bionic
  4. Merge into ubuntu/bionic
Proposed by Marco Trevisan (Treviño)
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
Daniel van Vugt (community) Approve
git-ubuntu developers 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.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

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

review: Approve
Revision history for this message
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
diff --git a/debian/changelog b/debian/changelog
index 24ac316..ab73a62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1gnome-shell (3.28.3+git20190124-0ubuntu18.04.4) UNRELEASED; urgency=medium
2
3 * d/p/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch:
4 - Fix regression on missing spread animation (LP: #1827284)
5 * Refreshed patches
6
7 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 08 May 2019 14:49:43 -0500
8
1gnome-shell (3.28.3+git20190124-0ubuntu18.04.3) bionic; urgency=medium9gnome-shell (3.28.3+git20190124-0ubuntu18.04.3) bionic; urgency=medium
210
3 * d/p/switchMonitor-switch-to-next-config-upon-initial-keypress.patch11 * d/p/switchMonitor-switch-to-next-config-upon-initial-keypress.patch
diff --git a/debian/patches/CVE-2019-3820-1.patch b/debian/patches/CVE-2019-3820-1.patch
index b637c27..f704252 100644
--- a/debian/patches/CVE-2019-3820-1.patch
+++ b/debian/patches/CVE-2019-3820-1.patch
@@ -1,5 +1,4 @@
1From 511e8c658445377b044c6dfb241709142c97a8ce Mon Sep 17 00:00:00 20011From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
2From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
3Date: Wed, 23 Jan 2019 23:55:12 +01002Date: Wed, 23 Jan 2019 23:55:12 +0100
4Subject: [PATCH] panel: Don't allow opening hidden menus via keybindings3Subject: [PATCH] panel: Don't allow opening hidden menus via keybindings
54
@@ -13,10 +12,10 @@ https://gitlab.gnome.org/GNOME/gnome-shell/issues/851
13 js/ui/panel.js | 4 ++--12 js/ui/panel.js | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)13 1 file changed, 2 insertions(+), 2 deletions(-)
1514
16Index: gnome-shell-3.28.3+git20190124/js/ui/panel.js15diff --git a/js/ui/panel.js b/js/ui/panel.js
17===================================================================16index a76916b..85572e2 100644
18--- gnome-shell-3.28.3+git20190124.orig/js/ui/panel.js17--- a/js/ui/panel.js
19+++ gnome-shell-3.28.3+git20190124/js/ui/panel.js18+++ b/js/ui/panel.js
20@@ -992,8 +992,8 @@ var Panel = new Lang.Class({19@@ -992,8 +992,8 @@ var Panel = new Lang.Class({
21 },20 },
22 21
diff --git a/debian/patches/CVE-2019-3820-2.patch b/debian/patches/CVE-2019-3820-2.patch
index 51a8297..dc6e562 100644
--- a/debian/patches/CVE-2019-3820-2.patch
+++ b/debian/patches/CVE-2019-3820-2.patch
@@ -1,4 +1,3 @@
1From e23f4d6c7c300e579db21bb9dffeeaace6f39959 Mon Sep 17 00:00:00 2001
2From: Ray Strode <rstrode@redhat.com>1From: Ray Strode <rstrode@redhat.com>
3Date: Wed, 23 Jan 2019 15:59:42 -05002Date: Wed, 23 Jan 2019 15:59:42 -0500
4Subject: [PATCH] shellActionModes: disable POPUP keybindings in unlock screen3Subject: [PATCH] shellActionModes: disable POPUP keybindings in unlock screen
@@ -30,10 +29,10 @@ Closes https://gitlab.gnome.org/GNOME/gnome-shell/issues/851
30 js/ui/shellEntry.js | 6 ++++--29 js/ui/shellEntry.js | 6 ++++--
31 3 files changed, 8 insertions(+), 4 deletions(-)30 3 files changed, 8 insertions(+), 4 deletions(-)
3231
33Index: gnome-shell-3.28.3/js/gdm/authPrompt.js32diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
34===================================================================33index a0a4a21..78e0454 100644
35--- gnome-shell-3.28.3.orig/js/gdm/authPrompt.js34--- a/js/gdm/authPrompt.js
36+++ gnome-shell-3.28.3/js/gdm/authPrompt.js35+++ b/js/gdm/authPrompt.js
37@@ -11,6 +11,7 @@ const Animation = imports.ui.animation;36@@ -11,6 +11,7 @@ const Animation = imports.ui.animation;
38 const Batch = imports.gdm.batch;37 const Batch = imports.gdm.batch;
39 const GdmUtil = imports.gdm.util;38 const GdmUtil = imports.gdm.util;
@@ -51,10 +50,10 @@ Index: gnome-shell-3.28.3/js/gdm/authPrompt.js
51 50
52 this.actor.add(this._entry,51 this.actor.add(this._entry,
53 { expand: true,52 { expand: true,
54Index: gnome-shell-3.28.3/js/gdm/loginDialog.js53diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
55===================================================================54index 4a93545..5ab8525 100644
56--- gnome-shell-3.28.3.orig/js/gdm/loginDialog.js55--- a/js/gdm/loginDialog.js
57+++ gnome-shell-3.28.3/js/gdm/loginDialog.js56+++ b/js/gdm/loginDialog.js
58@@ -338,7 +338,8 @@ var SessionMenuButton = new Lang.Class({57@@ -338,7 +338,8 @@ var SessionMenuButton = new Lang.Class({
59 this._button.remove_style_pseudo_class('active');58 this._button.remove_style_pseudo_class('active');
60 });59 });
@@ -65,11 +64,11 @@ Index: gnome-shell-3.28.3/js/gdm/loginDialog.js
65 this._manager.addMenu(this._menu);64 this._manager.addMenu(this._menu);
66 65
67 this._button.connect('clicked', () => { this._menu.toggle(); });66 this._button.connect('clicked', () => { this._menu.toggle(); });
68Index: gnome-shell-3.28.3/js/ui/shellEntry.js67diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
69===================================================================68index 9db5136..09bb9bb 100644
70--- gnome-shell-3.28.3.orig/js/ui/shellEntry.js69--- a/js/ui/shellEntry.js
71+++ gnome-shell-3.28.3/js/ui/shellEntry.js70+++ b/js/ui/shellEntry.js
72@@ -9,6 +9,7 @@ const BoxPointer = imports.ui.boxpointer71@@ -9,6 +9,7 @@ const BoxPointer = imports.ui.boxpointer;
73 const Main = imports.ui.main;72 const Main = imports.ui.main;
74 const Params = imports.misc.params;73 const Params = imports.misc.params;
75 const PopupMenu = imports.ui.popupMenu;74 const PopupMenu = imports.ui.popupMenu;
diff --git a/debian/patches/series b/debian/patches/series
index 0cea11a..944c446 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@ dnd-Only-handle-touch-events-in-wayland.patch
28st-widget-Add-missing-g_return_val_if_fail.patch28st-widget-Add-missing-g_return_val_if_fail.patch
29windowManager-listen-actively-to-windows-being-destroyed-.patch29windowManager-listen-actively-to-windows-being-destroyed-.patch
30dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch30dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
31st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch
diff --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
31new file mode 10064432new file mode 100644
index 0000000..65a15de
--- /dev/null
+++ b/debian/patches/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch
@@ -0,0 +1,85 @@
1From: Carlos Garnacho <carlosg@gnome.org>
2Date: Thu, 28 Jun 2018 20:22:40 +0200
3Subject: st-adjustment: Mark all properties as EXPLICIT_NOTIFY
4
5All adjustment setter functions take good care of avoiding emission of
6notify:: when it's not needed. The set_property() implementation already
7calls into the setter functions, so mark the properties as EXPLICITY_NOTIFY
8in order to optimize notify:: emission away through g_object_set (rather
9common from JS code).
10
11(cherry picked from commit b1b455ff1a0e856149142747e77fb1c98df34c03)
12
13Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1270
14
15Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/8702d66
16Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1827284
17Applied-Upstream: 3.28.4
18---
19 src/st/st-adjustment.c | 18 ++++++++++++------
20 1 file changed, 12 insertions(+), 6 deletions(-)
21
22diff --git a/src/st/st-adjustment.c b/src/st/st-adjustment.c
23index 005c6eb..598df4e 100644
24--- a/src/st/st-adjustment.c
25+++ b/src/st/st-adjustment.c
26@@ -205,7 +205,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
27 G_MAXDOUBLE,
28 0.0,
29 ST_PARAM_READWRITE |
30- G_PARAM_CONSTRUCT));
31+ G_PARAM_CONSTRUCT |
32+ G_PARAM_EXPLICIT_NOTIFY));
33 g_object_class_install_property (object_class,
34 PROP_UPPER,
35 g_param_spec_double ("upper",
36@@ -215,7 +216,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
37 G_MAXDOUBLE,
38 0.0,
39 ST_PARAM_READWRITE |
40- G_PARAM_CONSTRUCT));
41+ G_PARAM_CONSTRUCT |
42+ G_PARAM_EXPLICIT_NOTIFY));
43 g_object_class_install_property (object_class,
44 PROP_VALUE,
45 g_param_spec_double ("value",
46@@ -225,7 +227,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
47 G_MAXDOUBLE,
48 0.0,
49 ST_PARAM_READWRITE |
50- G_PARAM_CONSTRUCT));
51+ G_PARAM_CONSTRUCT |
52+ G_PARAM_EXPLICIT_NOTIFY));
53 g_object_class_install_property (object_class,
54 PROP_STEP_INC,
55 g_param_spec_double ("step-increment",
56@@ -235,7 +238,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
57 G_MAXDOUBLE,
58 0.0,
59 ST_PARAM_READWRITE |
60- G_PARAM_CONSTRUCT));
61+ G_PARAM_CONSTRUCT |
62+ G_PARAM_EXPLICIT_NOTIFY));
63 g_object_class_install_property (object_class,
64 PROP_PAGE_INC,
65 g_param_spec_double ("page-increment",
66@@ -245,7 +249,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
67 G_MAXDOUBLE,
68 0.0,
69 ST_PARAM_READWRITE |
70- G_PARAM_CONSTRUCT));
71+ G_PARAM_CONSTRUCT |
72+ G_PARAM_EXPLICIT_NOTIFY));
73 g_object_class_install_property (object_class,
74 PROP_PAGE_SIZE,
75 g_param_spec_double ("page-size",
76@@ -255,7 +260,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
77 G_MAXDOUBLE,
78 0.0,
79 ST_PARAM_READWRITE |
80- G_PARAM_CONSTRUCT));
81+ G_PARAM_CONSTRUCT |
82+ G_PARAM_EXPLICIT_NOTIFY));
83 /**
84 * StAdjustment::changed:
85 * @self: the #StAdjustment

Subscribers

People subscribed via source and target branches