[cinnamon-settings-daemon/f19] start to fix media keys

[leigh123linux]

commit c7cbe47965848a3b15adcb1684f75e3dcc44e642
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jul 24 11:15:56 2013 +0100

    start to fix media keys

 cinnamon-settings-daemon.spec |    9 ++++++++-
 media_keys_fix.patch          |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index afc78d0..12e0da7 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon-settings-daemon
 Version:        1.0.0
-Release:        0.2.git%{_internal_version}%{?dist}
+Release:        0.3.git%{_internal_version}%{?dist}
 Summary:        The daemon sharing settings from CINNAMON to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -12,6 +12,9 @@ URL:            http://cinnamon.linuxmint.com
 # wget https://github.com/linuxmint/cinnamon-settings-daemon/tarball/%%{_internal_version} -O cinnamon-settings-daemon-%%{version}.git%%{_internal_version}.tar.gz
 Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon-settings-daemon/source/cinnamon-settings-daemon-%{version}.git%{_internal_version}.tar.gz
 
+# https://git.gnome.org/browse/gnome-settings-daemon/commit/plugins/common/gsd-input-helper.c?id=14f92b1479aa065edf3f0aa86b87d4c4ff1fe2ba
+Patch0:         media_keys_fix.patch
+
 Requires:       control-center-filesystem
 Requires:       hicolor-icon-theme
 
@@ -73,6 +76,7 @@ This package contains the updates plugin for %{name}
 
 %prep
 %setup -q -n linuxmint-cinnamon-settings-daemon-%{_internal_version}
+%patch0 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -246,6 +250,9 @@ fi
 %{_datadir}/dbus-1/interfaces/org.cinnamon.SettingsDaemonUpdates.xml
 
 %changelog
+* Wed Jul 24 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.0.0-0.3.git42cc1ce
+- add patch to fix media keys
+
 * Thu Jul 18 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.0.0-0.2.git42cc1ce
 - add %%config to files
 - fix directory ownership on %%{_libdir}/cinnamon-settings-daemon-3.0
diff --git a/media_keys_fix.patch b/media_keys_fix.patch
new file mode 100644
index 0000000..7a77c86
--- /dev/null
+++ b/media_keys_fix.patch
@@ -0,0 +1,22 @@
+--- a/plugins/common/csd-input-helper.c
++++ b/plugins/common/csd-input-helper.c
+@@ -127,18 +127,11 @@ supports_xinput2_devices (int *opcode)
+         gdk_error_trap_push ();
+ 
+         major = 2;
+-        minor = 0;
++        minor = 3;
+ 
+         if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
+                 gdk_error_trap_pop_ignored ();
+-                /* 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 ();
+