r54368 - in /desktop/unstable/gnome-shell/debian: changelog patches/fix_reset_initial_focus.patch patches/git_layout-unset-when-headless.patch patches/series patches/workaround_crasher_fractional_scaling.patch

jbicha at users.alioth.debian.org jbicha at users.alioth.debian.org
Fri Oct 13 20:32:16 UTC 2017 

Author: jbicha
Date: Fri Oct 13 20:32:15 2017
New Revision: 54368

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54368
Log:
Import 3 patches from Ubuntu

Added:
    desktop/unstable/gnome-shell/debian/patches/fix_reset_initial_focus.patch
    desktop/unstable/gnome-shell/debian/patches/git_layout-unset-when-headless.patch
    desktop/unstable/gnome-shell/debian/patches/workaround_crasher_fractional_scaling.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=54368&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Fri Oct 13 20:32:15 2017
@@ -1,3 +1,21 @@
+gnome-shell (3.26.1-2) UNRELEASED; urgency=medium
+
+  [ Jeremy Bicha ]
+  * Cherry-pick git_layout-unset-when-headless.patch from gnome-3-26
+    branch to fix crash bug (LP: #1717170)
+
+  [ Andrea Azzarone ]
+  * debian/patches/workaround_crasher_fractional_scaling.patch:
+    workaround a popular crash for now when fractional scaling is enabled.
+    Andrea is working on a proper fix/debug (LP: #1714542)
+
+  [ Didier Roche ]
+  * debian/patches/fix_reset_initial_focus.patch:
+    - cherry-pick fix proposed by upstream to avoid regression when keyboard
+      is used the second time a modal dialog is drawn.
+
+ -- Jeremy Bicha <jbicha at debian.org>  Fri, 13 Oct 2017 16:28:52 -0400
+
 gnome-shell (3.26.1-1) experimental; urgency=medium
 
   * Team upload

Added: desktop/unstable/gnome-shell/debian/patches/fix_reset_initial_focus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/fix_reset_initial_focus.patch?rev=54368&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/fix_reset_initial_focus.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/fix_reset_initial_focus.patch	[utf-8] Fri Oct 13 20:32:15 2017
@@ -0,0 +1,29 @@
+From d361e5fc66e7ceb005732089e2335ed54f38cd6b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Thu, 5 Oct 2017 10:06:10 +0200
+Subject: [PATCH] dialog: Reset initial focus on clear
+
+Since 0b02f757f862 we track the button that should have key focus
+when the dialog is opened. However when the dialog is reused, the
+button may get removed - clear the initial focus in that case to
+allow setButton() to set a new one.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788542
+---
+ js/ui/dialog.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/dialog.js b/js/ui/dialog.js
+index 781fe0a97..273b1717d 100644
+--- a/js/ui/dialog.js
++++ b/js/ui/dialog.js
+@@ -135,6 +135,7 @@ var Dialog = new Lang.Class({
+     clearButtons: function () {
+         this.buttonLayout.destroy_all_children();
+         this._buttonKeys = {};
++        this._initialKeyFocus = null;
+     },
+ });
+ 
+-- 
+2.13.5

Added: desktop/unstable/gnome-shell/debian/patches/git_layout-unset-when-headless.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/git_layout-unset-when-headless.patch?rev=54368&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/git_layout-unset-when-headless.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/git_layout-unset-when-headless.patch	[utf-8] Fri Oct 13 20:32:15 2017
@@ -0,0 +1,38 @@
+1717170From 5f8a5114833d7d31d4bd64affbd323bb7252c3d0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
+Date: Fri, 6 Oct 2017 20:26:24 -0400
+Subject: layout: Unset primary and bottom monitor when headless
+
+We were handling being initially headless by only setting the primary
+and bottom monitor if there was any primary monitor, then checking the
+primary monitor reference before making calls assuming there was any
+monitors.
+
+What we didn't do was unset the primary and bottom monitor when going
+headless, meaning that temporarly disconnecting a monitor while having
+windows open caused an assert to be triggered due to various code paths
+taking the path assuming there are valid monitors.
+
+Unsetting both the primary and bottom monitor when going headless avoids
+the code paths in the same way as they were avoided when starting
+headless.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788607
+---
+ js/ui/layout.js | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/js/ui/layout.js b/js/ui/layout.js
+index 304c2a1..2f18947 100644
+--- a/js/ui/layout.js
++++ b/js/ui/layout.js
+@@ -351,6 +351,9 @@ var LayoutManager = new Lang.Class({
+                 this._loadBackground();
+                 this._pendingLoadBackground = false;
+             }
++        } else {
++            this.primaryMonitor = null;
++            this.bottomMonitor = null;
+         }
+     },
+ 

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=54368&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Fri Oct 13 20:32:15 2017
@@ -1 +1,4 @@
 27-nm-libexec-path.patch
+workaround_crasher_fractional_scaling.patch
+fix_reset_initial_focus.patch
+git_layout-unset-when-headless.patch

Added: desktop/unstable/gnome-shell/debian/patches/workaround_crasher_fractional_scaling.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/workaround_crasher_fractional_scaling.patch?rev=54368&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/workaround_crasher_fractional_scaling.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/workaround_crasher_fractional_scaling.patch	[utf-8] Fri Oct 13 20:32:15 2017
@@ -0,0 +1,19 @@
+Description: Avoid crashing if width or height are NaNs.
+ This is a temporary workaround that avoid a crash if width or height are NaNs.
+ The true fix would be to avoid width and height to get NaN values.
+Origin: ubuntu
+Bug-Ubuntu: https://launchpad.net/bugs/1714542
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788316
+
+--- a/src/st/st-theme-node-drawing.c
++++ b/src/st/st-theme-node-drawing.c
+@@ -2505,7 +2505,7 @@
+   allocation.x2 = width;
+   allocation.y2 = height;
+ 
+-  if (width <= 0 || height <= 0)
++  if (width <= 0 || height <= 0 || isnan (width) || isnan (height))
+     return;
+ 
+   /* Check whether we need to recreate the textures of the paint
+

More information about the pkg-gnome-commits mailing list