diff options
| author | root <root@rshg054.dnsready.net> | 2012-05-05 00:01:14 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-05-05 00:01:14 +0000 |
| commit | 5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (patch) | |
| tree | eb041f2a83edee4a597678749b22181df9a32ecb /extra/gtk3 | |
| parent | b2c353d874b85e06f355a9419852e2616613c7d0 (diff) | |
Sat May 5 00:01:14 UTC 2012
Diffstat (limited to 'extra/gtk3')
| -rw-r--r-- | extra/gtk3/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/gtk3/wacom.patch | 12 |
2 files changed, 23 insertions, 6 deletions
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index ab9cdb7c0..48779accb 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156874 2012-04-23 09:08:04Z ibiru $ +# $Id: PKGBUILD 158335 2012-05-03 17:45:08Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.4.1 -pkgrel=1 +pkgver=3.4.2 +pkgrel=2 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -14,11 +14,16 @@ options=('!libtool') 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) -sha256sums=('0716b533de0ff2ffdec1076bb85c7a95e2b7b6ac9ece71e84625043ae3eb25f7' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + settings.ini wacom.patch) +sha256sums=('b1ab72bc61434418160ff0c7edfd93c74758ed8a35e2ed3d07e3e218c2705480' + '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 \ diff --git a/extra/gtk3/wacom.patch b/extra/gtk3/wacom.patch new file mode 100644 index 000000000..79ad84fc6 --- /dev/null +++ b/extra/gtk3/wacom.patch @@ -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; |