r35560 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/24-common-Try-XI-2.2-if-XI-2.0-fails.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Fri Jul 27 14:05:20 2012
New Revision: 35560

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35560
Log:
* debian/patches/24-common-Try-XI-2.2-if-XI-2.0-fails.patch:
  * Added: Fix keybindings for newer libxi2 (Closes: #678250) (From
    upstream git)

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/24-common-Try-XI-2.2-if-XI-2.0-fails.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/patches/series

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=35560&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Fri Jul 27 14:05:20 2012
@@ -1,3 +1,11 @@
+gnome-settings-daemon (3.4.2-4) UNRELEASED; urgency=low
+
+  * debian/patches/24-common-Try-XI-2.2-if-XI-2.0-fails.patch:
+    * Added: Fix keybindings for newer libxi2 (Closes: #678250) (From
+      upstream git)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 27 Jul 2012 15:37:31 +0200
+
 gnome-settings-daemon (3.4.2-3) unstable; urgency=low
 
   [ Jeremy Bicha ]

Added: desktop/unstable/gnome-settings-daemon/debian/patches/24-common-Try-XI-2.2-if-XI-2.0-fails.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/24-common-Try-XI-2.2-if-XI-2.0-fails.patch?rev=35560&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/24-common-Try-XI-2.2-if-XI-2.0-fails.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/24-common-Try-XI-2.2-if-XI-2.0-fails.patch [utf-8] Fri Jul 27 14:05:20 2012
@@ -1,0 +1,44 @@
+From 9d23fac4ce927cd27964323aa4cf8138e5128ba0 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Thu, 12 Apr 2012 13:51:09 +1000
+Subject: [PATCH] common: Try XI 2.2 if XI 2.0 fails
+
+The media-keys plugin calls supports_xinput2_devices(). That again calls
+XIQueryDevice with a major/minor of 2.0. The upstream server has a check
+for this in place and responds BadValue if a client initiates XI2 twice
+with two different versions (such both us and GTK+ checking for
+different versions). This happens here, and thus the plugin fails
+to load.
+
+The X server was fixed, but this is still required for older versions
+of the Xi code:
+http://cgit.freedesktop.org/xorg/xserver/commit/?id=ea51e9b2877df60135edaf2a8f88d0f2a2b41060
+
+https://bugzilla.gnome.org/show_bug.cgi?id=673964
+---
+ plugins/common/gsd-input-helper.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
+index cf9e83d..f06b507 100644
+--- a/plugins/common/gsd-input-helper.c
++++ b/plugins/common/gsd-input-helper.c
+@@ -129,7 +129,14 @@ supports_xinput2_devices (int *opcode)
+ 
+         if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
+                 gdk_error_trap_pop_ignored ();
+-                return FALSE;
++                /* try for 2.2, maybe gtk has already announced 2.2 support */
++                gdk_error_trap_push ();
++                major = 2;
++                minor = 2;
++                if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
++                    gdk_error_trap_pop_ignored ();
++                    return FALSE;
++                }
+         }
+         gdk_error_trap_pop_ignored ();
+ 
+-- 
+1.7.10.4
+

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=35560&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Fri Jul 27 14:05:20 2012
@@ -6,3 +6,4 @@
 20_disable-wacom-support-on-s390-s390x.patch
 21_disable-wacom-on-non-Linux-platforms.patch
 22_backlight_optional.patch
+24-common-Try-XI-2.2-if-XI-2.0-fails.patch