From 6f7b06393dc434ca7acc03d11f08e52e1bfe813a Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 1 Jun 2019 06:31:02 +0000
Subject: user/libwacom: jingle bells, this patch smells

---
 user/libwacom/APKBUILD           | 12 ++++++------
 user/libwacom/fix-database.patch | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 user/libwacom/fix-database.patch

diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD
index 52326df1f..56464b2a0 100644
--- a/user/libwacom/APKBUILD
+++ b/user/libwacom/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libwacom
 pkgver=0.33
-pkgrel=0
+pkgrel=1
 pkgdesc="Tablet description library"
 url="http://linuxwacom.sourceforge.net/"
 arch="all"
@@ -11,7 +11,9 @@ depends=""
 makedepends="libgudev-dev"
 checkdepends="bash findutils"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/linuxwacom/libwacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+source="https://github.com/linuxwacom/libwacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2
+	fix-database.patch
+	"
 
 build() {
 	./configure \
@@ -20,9 +22,6 @@ build() {
 		--prefix=/usr \
 		--disable-static
 	make
-	# conflicts with TS-6610 tablet
-	rm "$builddir"/data/huion-h420.tablet
-	rm "$builddir"/data/layouts/huion-h420.svg
 }
 
 check() {
@@ -36,4 +35,5 @@ package() {
 		> "$pkgdir"/usr/lib/udev/rules.d/65-libwacom.rules
 }
 
-sha512sums="de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d  libwacom-0.33.tar.bz2"
+sha512sums="de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d  libwacom-0.33.tar.bz2
+d1ac1176aa4a95991330e23fb84868d65a1b2e81d68173c990f885af1ce591de7aca16e21db8128e4f1975bca22b8014a6fa2ca8c0458dce464568239d75263c  fix-database.patch"
diff --git a/user/libwacom/fix-database.patch b/user/libwacom/fix-database.patch
new file mode 100644
index 000000000..d367ca997
--- /dev/null
+++ b/user/libwacom/fix-database.patch
@@ -0,0 +1,15 @@
+https://github.com/linuxwacom/libwacom/issues/85
+
+Awful, cheesy hack.
+
+--- libwacom-0.33/libwacom/libwacom-database.c.old	2019-04-12 03:10:21.000000000 +0000
++++ libwacom-0.33/libwacom/libwacom-database.c	2019-06-01 06:24:56.290159726 +0000
+@@ -152,7 +152,7 @@
+ 
+ 	memset(namestr, 0, sizeof(namestr));
+ 
+-	rc = sscanf(str, "%63[^:]:%x:%x:%63c", busstr, vendor_id, product_id, namestr);
++	rc = sscanf(str, "%63[^:]:%x:%x:%63[^\b]", busstr, vendor_id, product_id, namestr);
+ 	if (rc == 4) {
+ 		*name = g_strdup(namestr);
+ 	} else if (rc == 3) {
-- 
cgit v1.2.3-60-g2f50