summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch')
-rw-r--r--gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch21
1 files changed, 10 insertions, 11 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch b/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch
index 204c9a54..6ffcf585 100644
--- a/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch
+++ b/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch
@@ -1,19 +1,18 @@
-From fa78cb1359e50c87e36f2422148120f605185aef Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Mon, 12 Dec 2011 14:38:16 +0100
-Subject: [PATCH 2/2] Disable wacom
+From 9e97002b4c9149c480ce996071cba9c058a7546a Mon Sep 17 00:00:00 2001
+From: Julien Durillon <julien.durillon@gmail.com>
+Date: Mon, 23 Jan 2012 15:51:36 +0100
+Subject: [PATCH 2/2] remove wacom support
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---
configure.ac | 6 ------
plugins/Makefile.am | 1 -
2 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
-index a83f1a9..574d41e 100644
+index 63f1158..d73e5d9 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -243,12 +243,6 @@ dnl ---------------------------------------------------------------------------
+@@ -227,12 +227,6 @@ dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra])
@@ -21,16 +20,16 @@ index a83f1a9..574d41e 100644
-dnl - wacom
-dnl ---------------------------------------------------------------------------
-
--PKG_CHECK_MODULES(WACOM, [libwacom x11 xi])
+-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION])
-
dnl ==============================================
dnl PackageKit section
dnl ==============================================
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index ad88aa9..9ce88f7 100644
+index 31fcb74..e40d9b9 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
-@@ -15,7 +15,6 @@ enabled_plugins = \
+@@ -14,7 +14,6 @@ enabled_plugins = \
media-keys \
mouse \
sound \
@@ -39,5 +38,5 @@ index ad88aa9..9ce88f7 100644
xsettings \
$(NULL)
--
-1.7.8.163.g9859a.dirty
+1.7.9.rc2