Marco Trevisan (Treviño) has proposed merging 
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into 
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.

Requested reviews:
  Ubuntu Server Dev import team (usd-import-team)
Related bugs:
  Bug #1827284 in gnome-shell (Ubuntu): "[regression] No window spread 
animation in gnome-shell 3.28.3+git20190124"
  https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1827284

For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/367149
-- 
Your team Ubuntu Desktop is subscribed to branch 
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 24ac316..ab73a62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnome-shell (3.28.3+git20190124-0ubuntu18.04.4) UNRELEASED; urgency=medium
+
+  * d/p/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch:
+    - Fix regression on missing spread animation (LP: #1827284)
+  * Refreshed patches
+
+ -- Marco Trevisan (Treviño) <[email protected]>  Wed, 08 May 2019 14:49:43 -0500
+
 gnome-shell (3.28.3+git20190124-0ubuntu18.04.3) bionic; urgency=medium
 
   * 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 @@
-From 511e8c658445377b044c6dfb241709142c97a8ce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <[email protected]>
+From: =?utf-8?q?Florian_M=C3=BCllner?= <[email protected]>
 Date: Wed, 23 Jan 2019 23:55:12 +0100
 Subject: [PATCH] panel: Don't allow opening hidden menus via keybindings
 
@@ -13,10 +12,10 @@ https://gitlab.gnome.org/GNOME/gnome-shell/issues/851
  js/ui/panel.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: gnome-shell-3.28.3+git20190124/js/ui/panel.js
-===================================================================
---- gnome-shell-3.28.3+git20190124.orig/js/ui/panel.js
-+++ gnome-shell-3.28.3+git20190124/js/ui/panel.js
+diff --git a/js/ui/panel.js b/js/ui/panel.js
+index a76916b..85572e2 100644
+--- a/js/ui/panel.js
++++ b/js/ui/panel.js
 @@ -992,8 +992,8 @@ var Panel = new Lang.Class({
      },
  
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 @@
-From e23f4d6c7c300e579db21bb9dffeeaace6f39959 Mon Sep 17 00:00:00 2001
 From: Ray Strode <[email protected]>
 Date: Wed, 23 Jan 2019 15:59:42 -0500
 Subject: [PATCH] shellActionModes: disable POPUP keybindings in unlock screen
@@ -30,10 +29,10 @@ Closes https://gitlab.gnome.org/GNOME/gnome-shell/issues/851
  js/ui/shellEntry.js   | 6 ++++--
  3 files changed, 8 insertions(+), 4 deletions(-)
 
-Index: gnome-shell-3.28.3/js/gdm/authPrompt.js
-===================================================================
---- gnome-shell-3.28.3.orig/js/gdm/authPrompt.js
-+++ gnome-shell-3.28.3/js/gdm/authPrompt.js
+diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
+index a0a4a21..78e0454 100644
+--- a/js/gdm/authPrompt.js
++++ b/js/gdm/authPrompt.js
 @@ -11,6 +11,7 @@ const Animation = imports.ui.animation;
  const Batch = imports.gdm.batch;
  const GdmUtil = imports.gdm.util;
@@ -51,10 +50,10 @@ Index: gnome-shell-3.28.3/js/gdm/authPrompt.js
  
          this.actor.add(this._entry,
                         { expand: true,
-Index: gnome-shell-3.28.3/js/gdm/loginDialog.js
-===================================================================
---- gnome-shell-3.28.3.orig/js/gdm/loginDialog.js
-+++ gnome-shell-3.28.3/js/gdm/loginDialog.js
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index 4a93545..5ab8525 100644
+--- a/js/gdm/loginDialog.js
++++ b/js/gdm/loginDialog.js
 @@ -338,7 +338,8 @@ var SessionMenuButton = new Lang.Class({
                   this._button.remove_style_pseudo_class('active');
          });
@@ -65,11 +64,11 @@ Index: gnome-shell-3.28.3/js/gdm/loginDialog.js
          this._manager.addMenu(this._menu);
  
          this._button.connect('clicked', () => { this._menu.toggle(); });
-Index: gnome-shell-3.28.3/js/ui/shellEntry.js
-===================================================================
---- gnome-shell-3.28.3.orig/js/ui/shellEntry.js
-+++ gnome-shell-3.28.3/js/ui/shellEntry.js
-@@ -9,6 +9,7 @@ const BoxPointer = imports.ui.boxpointer
+diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
+index 9db5136..09bb9bb 100644
+--- a/js/ui/shellEntry.js
++++ b/js/ui/shellEntry.js
+@@ -9,6 +9,7 @@ const BoxPointer = imports.ui.boxpointer;
  const Main = imports.ui.main;
  const Params = imports.misc.params;
  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
 st-widget-Add-missing-g_return_val_if_fail.patch
 windowManager-listen-actively-to-windows-being-destroyed-.patch
 dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
+st-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
new file mode 100644
index 0000000..65a15de
--- /dev/null
+++ b/debian/patches/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch
@@ -0,0 +1,85 @@
+From: Carlos Garnacho <[email protected]>
+Date: Thu, 28 Jun 2018 20:22:40 +0200
+Subject: st-adjustment: Mark all properties as EXPLICIT_NOTIFY
+
+All adjustment setter functions take good care of avoiding emission of
+notify:: when it's not needed. The set_property() implementation already
+calls into the setter functions, so mark the properties as EXPLICITY_NOTIFY
+in order to optimize notify:: emission away through g_object_set (rather
+common from JS code).
+
+(cherry picked from commit b1b455ff1a0e856149142747e77fb1c98df34c03)
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1270
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/8702d66
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1827284
+Applied-Upstream: 3.28.4
+---
+ src/st/st-adjustment.c | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/st/st-adjustment.c b/src/st/st-adjustment.c
+index 005c6eb..598df4e 100644
+--- a/src/st/st-adjustment.c
++++ b/src/st/st-adjustment.c
+@@ -205,7 +205,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   g_object_class_install_property (object_class,
+                                    PROP_UPPER,
+                                    g_param_spec_double ("upper",
+@@ -215,7 +216,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   g_object_class_install_property (object_class,
+                                    PROP_VALUE,
+                                    g_param_spec_double ("value",
+@@ -225,7 +227,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   g_object_class_install_property (object_class,
+                                    PROP_STEP_INC,
+                                    g_param_spec_double ("step-increment",
+@@ -235,7 +238,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   g_object_class_install_property (object_class,
+                                    PROP_PAGE_INC,
+                                    g_param_spec_double ("page-increment",
+@@ -245,7 +249,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   g_object_class_install_property (object_class,
+                                    PROP_PAGE_SIZE,
+                                    g_param_spec_double ("page-size",
+@@ -255,7 +260,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   /**
+    * StAdjustment::changed:
+    * @self: the #StAdjustment
-- 
ubuntu-desktop mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop

Reply via email to