r51761 - in /desktop/unstable/mutter/debian: changelog patches/git_dont_set_unavailable_scroll_methods.patch patches/series

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Tue Nov 22 17:50:41 2016
New Revision: 51761

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51761
Log:
Add patch from 3.22 branch that prevented logging into GNOME on X for some users (LP: #1643370)

Added:
    desktop/unstable/mutter/debian/patches/git_dont_set_unavailable_scroll_methods.patch
Modified:
    desktop/unstable/mutter/debian/changelog
    desktop/unstable/mutter/debian/patches/series

Modified: desktop/unstable/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/changelog?rev=51761&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/changelog	[utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog	[utf-8] Tue Nov 22 17:50:41 2016
@@ -1,3 +1,11 @@
+mutter (3.22.2-2) UNRELEASED; urgency=medium
+
+  * Add git_stack-docks-below-fullscreen-windows.patch:
+    - Add patch from 3.22 branch that prevented logging into GNOME on X
+      for some users (LP: #1643370)
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 22 Nov 2016 12:22:52 -0500
+
 mutter (3.22.2-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/mutter/debian/patches/git_dont_set_unavailable_scroll_methods.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/git_dont_set_unavailable_scroll_methods.patch?rev=51761&op=file
==============================================================================
--- desktop/unstable/mutter/debian/patches/git_dont_set_unavailable_scroll_methods.patch	(added)
+++ desktop/unstable/mutter/debian/patches/git_dont_set_unavailable_scroll_methods.patch	[utf-8] Tue Nov 22 17:50:41 2016
@@ -0,0 +1,77 @@
+From 5c46094d67f2e5cdafe6edcfd8c0d5894a2dafc6 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos at gmail.com>
+Date: Mon, 14 Nov 2016 17:33:11 +0100
+Subject: meta-input-settings-x11: Don't try setting unavailable scroll methods
+
+Since doing so causes BadValue X errors.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=771744
+---
+ src/backends/x11/meta-input-settings-x11.c | 24 ++++++++++++++++++++----
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c
+index 332997b..eccc68a 100644
+--- a/src/backends/x11/meta-input-settings-x11.c
++++ b/src/backends/x11/meta-input-settings-x11.c
+@@ -222,19 +222,27 @@ meta_input_settings_x11_set_edge_scroll (MetaInputSettings            *settings,
+                                          gboolean                      edge_scroll_enabled)
+ {
+   guchar values[SCROLL_METHOD_NUM_FIELDS] = { 0 }; /* 2fg, edge, button. The last value is unused */
+-  guchar *current;
++  guchar *current = NULL;
++  guchar *available = NULL;
++
++  available = get_property (device, "libinput Scroll Methods Available",
++                            XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS);
++  if (!available || !available[SCROLL_METHOD_FIELD_EDGE])
++    goto out;
+ 
+   current = get_property (device, "libinput Scroll Method Enabled",
+                           XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS);
+   if (!current)
+-    return;
++    goto out;
+ 
+   memcpy (values, current, SCROLL_METHOD_NUM_FIELDS);
+ 
+   values[SCROLL_METHOD_FIELD_EDGE] = !!edge_scroll_enabled;
+   change_property (device, "libinput Scroll Method Enabled",
+                    XA_INTEGER, 8, &values, SCROLL_METHOD_NUM_FIELDS);
++ out:
+   meta_XFree (current);
++  meta_XFree (available);
+ }
+ 
+ static void
+@@ -243,19 +251,27 @@ meta_input_settings_x11_set_two_finger_scroll (MetaInputSettings            *set
+                                                gboolean                      two_finger_scroll_enabled)
+ {
+   guchar values[SCROLL_METHOD_NUM_FIELDS] = { 0 }; /* 2fg, edge, button. The last value is unused */
+-  guchar *current;
++  guchar *current = NULL;
++  guchar *available = NULL;
++
++  available = get_property (device, "libinput Scroll Methods Available",
++                            XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS);
++  if (!available || !available[SCROLL_METHOD_FIELD_2FG])
++    goto out;
+ 
+   current = get_property (device, "libinput Scroll Method Enabled",
+                           XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS);
+   if (!current)
+-    return;
++    goto out;
+ 
+   memcpy (values, current, SCROLL_METHOD_NUM_FIELDS);
+ 
+   values[SCROLL_METHOD_FIELD_2FG] = !!two_finger_scroll_enabled;
+   change_property (device, "libinput Scroll Method Enabled",
+                    XA_INTEGER, 8, &values, SCROLL_METHOD_NUM_FIELDS);
++ out:
+   meta_XFree (current);
++  meta_XFree (available);
+ }
+ 
+ static void
+

Modified: desktop/unstable/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/series?rev=51761&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/series	[utf-8] Tue Nov 22 17:50:41 2016
@@ -0,0 +1 @@
+git_dont_set_unavailable_scroll_methods.patch