[arch-commits] Commit in gtk3/trunk (PKGBUILD wacom.patch)

[Jan Steffens]

    Date: Wednesday, November 21, 2012 @ 04:40:34
  Author: heftig
Revision: 171679

Drop wacom patch. Ineffective with XI2.2

Modified:
  gtk3/trunk/PKGBUILD
Deleted:
  gtk3/trunk/wacom.patch

-------------+
 PKGBUILD    |    8 ++------
 wacom.patch |   12 ------------
 2 files changed, 2 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-21 07:36:28 UTC (rev 171678)
+++ PKGBUILD	2012-11-21 09:40:34 UTC (rev 171679)
@@ -14,16 +14,12 @@
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
-        settings.ini wacom.patch)
+        settings.ini)
 sha256sums=('aaccf2e1576338acf37816290578e8f19888935f381665b3847076be25fe513c'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5')
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 build() {
     cd "gtk+-$pkgver"
 
-    # Partially revert BGO#673440 in order to fix BGO#674157
-    patch -Np1 -i ../wacom.patch
-
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \

Deleted: wacom.patch
===================================================================
--- wacom.patch	2012-11-21 07:36:28 UTC (rev 171678)
+++ wacom.patch	2012-11-21 09:40:34 UTC (rev 171679)
@@ -1,12 +0,0 @@
-diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c
---- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c	2012-05-02 14:45:04.000000000 +0200
-+++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c	2012-05-03 18:34:18.034807644 +0200
-@@ -331,6 +331,8 @@
-         input_source = GDK_SOURCE_ERASER;
-       else if (strstr (tmp_name, "cursor"))
-         input_source = GDK_SOURCE_CURSOR;
-+      else if (strstr (tmp_name, "finger"))
-+        input_source = GDK_SOURCE_TOUCHSCREEN;
-       else if (strstr (tmp_name, "wacom") ||
-                strstr (tmp_name, "pen"))
-         input_source = GDK_SOURCE_PEN;