Add 30-gfxtablet.conf

5 files changed, 26 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af4fde94cb8e..535a199342ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gfxtablet-git
 	pkgdesc = Android app to control a virtual Network Tablet on Linux
-	pkgver = 23.ff865c2
+	pkgver = 46.78d9dc0
 	pkgrel = 1
 	url = http://github.com/rfc2822/GfxTablet
 	install = gfxtablet-git.install
@@ -8,10 +8,12 @@ pkgbase = gfxtablet-git
 	arch = x86_64
 	license = MIT
 	makedepends = git
-	source = gfxtablet-git::git://github.com/rfc2822/GfxTablet.git
+	source = gfxtablet-git::https://github.com/rfc2822/GfxTablet.git
 	source = 99-uinput.rules
+	source = 30-gfxtablet.conf
 	md5sums = SKIP
-	md5sums = 38b5c44b17429f384a00d625b4019d7e
+	md5sums = b5d5b8e5291c08302a7a6dff8aa1ebf2
+	md5sums = 18dd86149d20dfcda9dc65bc9a03d419
 
 pkgname = gfxtablet-git
 
diff --git a/30-gfxtablet.conf b/30-gfxtablet.conf
new file mode 100644
index 000000000000..f8f1d3b8f8c7
--- /dev/null
+++ b/30-gfxtablet.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+	Identifier "evdev tablet catchall"
+	MatchIsTablet "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "evdev"
+EndSection
diff --git a/99-uinput.rules b/99-uinput.rules
index c7bae553d646..1c6c9ccdcc9d 100644
--- a/99-uinput.rules
+++ b/99-uinput.rules
@@ -1 +1 @@
-KERNEL=="uinput", GROUP="uinput", MODE:="0660"
+KERNEL=="uinput", GROUP="wheel", MODE:="0660"
diff --git a/PKGBUILD b/PKGBUILD
index 207fd687c0a2..313ba3cc0b01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,19 @@
-# Maintainer: Can Altıparmak (gulaghad) <can6dev <AT> gmail <DOT> com>
+# Maintainer: c6parmak <can6parmak <AT> gmail <DOT> com>
 
 pkgname=gfxtablet-git
-pkgver=23.ff865c2
+pkgver=46.78d9dc0
 pkgrel=1
 pkgdesc="Android app to control a virtual Network Tablet on Linux"
 arch=('i686' 'x86_64')
 url="http://github.com/rfc2822/GfxTablet"
 license=('MIT')
 makedepends=('git')
-source=("$pkgname"::'git://github.com/rfc2822/GfxTablet.git'
-        '99-uinput.rules')
+source=("$pkgname"::'https://github.com/rfc2822/GfxTablet.git'
+        '99-uinput.rules'
+        '30-gfxtablet.conf')
 md5sums=('SKIP'
-         '38b5c44b17429f384a00d625b4019d7e')
+         'b5d5b8e5291c08302a7a6dff8aa1ebf2'
+         '18dd86149d20dfcda9dc65bc9a03d419')
 install="${pkgname}.install"
 
 pkgver() {
@@ -27,5 +29,6 @@ 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"
 }
diff --git a/gfxtablet-git.install b/gfxtablet-git.install
index 298e87f7aaab..d2629c023b4c 100644
--- a/gfxtablet-git.install
+++ b/gfxtablet-git.install
@@ -1,9 +1,9 @@
 post_install() {
-  groupadd -r uinput
-  echo "To run as normal user, update udev rules:"
-  echo "# udevadm control -R"
-  echo "# udevadm trigger"
-  echo "Then add yourself to 'uinput' group."
-  echo "# gpasswd -a $USER uinput"
+  groupadd -r wheel
+  udevadm control -R
+  udevadm trigger
+  echo "Add yourself to 'wheel' group."
+  echo "# gpasswd -a <USER> wheel"
+  echo "You may need to restart X server."
 }