[Python-apps-commits] r7664 - in packages/sonata/trunk/debian (3 files)

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

    Date: Sunday, October 16, 2011 @ 21:29:43
  Author: vicho-guest
Revision: 7664

Fix "Breaks gnome-settings-daemon media-keys plugin" by applying a patch in quodlibet's version of mmkeys (Closes: #644735)

Added:
  packages/sonata/trunk/debian/patches/from_upstream__fix-mmkeys.patch
Modified:
  packages/sonata/trunk/debian/changelog
  packages/sonata/trunk/debian/patches/series

Modified: packages/sonata/trunk/debian/changelog
===================================================================
--- packages/sonata/trunk/debian/changelog	2011-10-16 19:11:30 UTC (rev 7663)
+++ packages/sonata/trunk/debian/changelog	2011-10-16 21:29:43 UTC (rev 7664)
@@ -1,3 +1,10 @@
+sonata (1.6.2.1-5) unstable; urgency=low
+
+  * Fix "Breaks gnome-settings-daemon media-keys plugin" by applying a
+    patch in quodlibet's version of mmkeys (Closes: #644735)
+
+ -- Javi Merino <cibervicho at gmail.com>  Sun, 16 Oct 2011 22:22:04 +0100
+
 sonata (1.6.2.1-4) unstable; urgency=low
 
   [ Michal ÄŒihaÅ™ ]

Added: packages/sonata/trunk/debian/patches/from_upstream__fix-mmkeys.patch
===================================================================
--- packages/sonata/trunk/debian/patches/from_upstream__fix-mmkeys.patch	                        (rev 0)
+++ packages/sonata/trunk/debian/patches/from_upstream__fix-mmkeys.patch	2011-10-16 21:29:43 UTC (rev 7664)
@@ -0,0 +1,44 @@
+From: Christoph Reiter <reiter.christoph at gmail.com>
+Description: Upgrade mmkeys.c to the version in quodlibet
+  Sonata's version of mmkeys misses some changes from upstream that prevent gnome-settings-daemon from getting multimedia keys
+Bug-Debian: http://bugs.debian.org/644735
+
+--- a/mmkeys/mmkeys.c
++++ b/mmkeys/mmkeys.c
+@@ -165,35 +165,7 @@
+ 	gdk_error_trap_push ();
+ 
+ 	XGrabKey (GDK_DISPLAY (), key_code,
+-		  0,
+-		  GDK_WINDOW_XID (root), True,
+-		  GrabModeAsync, GrabModeAsync);
+-	XGrabKey (GDK_DISPLAY (), key_code,
+-		  Mod2Mask,
+-		  GDK_WINDOW_XID (root), True,
+-		  GrabModeAsync, GrabModeAsync);
+-	XGrabKey (GDK_DISPLAY (), key_code,
+-		  Mod5Mask,
+-		  GDK_WINDOW_XID (root), True,
+-		  GrabModeAsync, GrabModeAsync);
+-	XGrabKey (GDK_DISPLAY (), key_code,
+-		  LockMask,
+-		  GDK_WINDOW_XID (root), True,
+-		  GrabModeAsync, GrabModeAsync);
+-	XGrabKey (GDK_DISPLAY (), key_code,
+-		  Mod2Mask | Mod5Mask,
+-		  GDK_WINDOW_XID (root), True,
+-		  GrabModeAsync, GrabModeAsync);
+-	XGrabKey (GDK_DISPLAY (), key_code,
+-		  Mod2Mask | LockMask,
+-		  GDK_WINDOW_XID (root), True,
+-		  GrabModeAsync, GrabModeAsync);
+-	XGrabKey (GDK_DISPLAY (), key_code,
+-		  Mod5Mask | LockMask,
+-		  GDK_WINDOW_XID (root), True,
+-		  GrabModeAsync, GrabModeAsync);
+-	XGrabKey (GDK_DISPLAY (), key_code,
+-		  Mod2Mask | Mod5Mask | LockMask,
++		  AnyModifier,
+ 		  GDK_WINDOW_XID (root), True,
+ 		  GrabModeAsync, GrabModeAsync);
+ 

Modified: packages/sonata/trunk/debian/patches/series
===================================================================
--- packages/sonata/trunk/debian/patches/series	2011-10-16 19:11:30 UTC (rev 7663)
+++ packages/sonata/trunk/debian/patches/series	2011-10-16 21:29:43 UTC (rev 7664)
@@ -1,2 +1,3 @@
 fix-cras-on-no-albums.patch
 fix-lyrics-fetching.patch
+from_upstream__fix-mmkeys.patch