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

[Jan Steffens]

    Date: Thursday, May 3, 2012 @ 13:43:41
  Author: heftig
Revision: 158334

add patch

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

-------------+
 PKGBUILD    |   11 ++++++++---
 wacom.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-03 17:21:20 UTC (rev 158333)
+++ PKGBUILD	2012-05-03 17:43:41 UTC (rev 158334)
@@ -3,7 +3,7 @@
 
 pkgname=gtk3
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -14,11 +14,16 @@
 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)
+        settings.ini wacom.patch)
 sha256sums=('b1ab72bc61434418160ff0c7edfd93c74758ed8a35e2ed3d07e3e218c2705480'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
+            '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5')
 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 \

Added: wacom.patch
===================================================================
--- wacom.patch	                        (rev 0)
+++ wacom.patch	2012-05-03 17:43:41 UTC (rev 158334)
@@ -0,0 +1,12 @@
+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;