Use libinput PR

3 files changed, 12 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac2a63c3ee9f..f5e9d7f1b610 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,16 @@
 pkgbase = gfxtablet-git
 	pkgdesc = Android app to control a virtual Network Tablet on Linux
-	pkgver = 47.54140b9
+	pkgver = 48.f0f20fa
 	pkgrel = 1
 	url = http://github.com/rfc2822/GfxTablet
-	install = gfxtablet-git.install
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = git
 	source = gfxtablet-git::git://github.com/rfc2822/GfxTablet.git
 	source = 99-uinput.rules
-	source = 30-gfxtablet.conf
 	md5sums = SKIP
 	md5sums = b5d5b8e5291c08302a7a6dff8aa1ebf2
-	md5sums = 18dd86149d20dfcda9dc65bc9a03d419
 
 pkgname = gfxtablet-git
 
diff --git a/30-gfxtablet.conf b/30-gfxtablet.conf
deleted file mode 100644
index f8f1d3b8f8c7..000000000000
--- a/30-gfxtablet.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
-	Identifier "evdev tablet catchall"
-	MatchIsTablet "on"
-	MatchDevicePath "/dev/input/event*"
-	Driver "evdev"
-EndSection
diff --git a/PKGBUILD b/PKGBUILD
index 6604df1ff79a..78f92488d269 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: c6parmak <can6parmak <AT> gmail <DOT> com>
+# Contributor: Lucki <Lucki <AT> holarse-linuxgaming <DOT> de>
 
 pkgname=gfxtablet-git
-pkgver=47.54140b9
+pkgver=48.f0f20fa
 pkgrel=1
 pkgdesc="Android app to control a virtual Network Tablet on Linux"
 arch=('i686' 'x86_64')
@@ -9,11 +10,9 @@ url="http://github.com/rfc2822/GfxTablet"
 license=('MIT')
 makedepends=('git')
 source=("$pkgname"::'git://github.com/rfc2822/GfxTablet.git'
-        '99-uinput.rules'
-        '30-gfxtablet.conf')
+        '99-uinput.rules')
 md5sums=('SKIP'
-         'b5d5b8e5291c08302a7a6dff8aa1ebf2'
-         '18dd86149d20dfcda9dc65bc9a03d419')
+         'b5d5b8e5291c08302a7a6dff8aa1ebf2')
 install="${pkgname}.install"
 
 pkgver() {
@@ -21,6 +20,13 @@ pkgver() {
 	printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+   cd "$pkgname"
+   git remote add tonyg https://github.com/tonyg/GfxTablet.git || _r=$?
+   git fetch tonyg
+   git -c user.email="your@email.com" -c user.name="Your Name" merge -s recursive -Xours tonyg/master
+}
+
 build() {
 	cd "$pkgname/driver-uinput"
 	make
@@ -29,6 +35,5 @@ build() {
 package() {
 	install -Dm755 "$srcdir/$pkgname/driver-uinput/networktablet" "$pkgdir/usr/bin/networktablet"
 	install -Dm644 "$srcdir/99-uinput.rules" "$pkgdir/etc/udev/rules.d/99-uinput.rules"
-	install -Dm644 "$srcdir/30-gfxtablet.conf" "$pkgdir/etc/X11/xorg.conf.d/30-gfxtablet.conf"
     install -Dm644 "$srcdir/$pkgname/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }