Date: Saturday, February 24, 2018 @ 12:10:09 Author: jgc Revision: 317472
upgpkg: libwacom 0.28-2 Add upstream patch to fix device/vendor IDs in udev rules generation (FS#57619) Added: libwacom/trunk/fix-pairedid-entry.patch Modified: libwacom/trunk/PKGBUILD --------------------------+ PKGBUILD | 15 +++++++++++---- fix-pairedid-entry.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-24 08:57:40 UTC (rev 317471) +++ PKGBUILD 2018-02-24 12:10:09 UTC (rev 317472) @@ -3,7 +3,7 @@ pkgname=libwacom pkgver=0.28 -pkgrel=1 +pkgrel=2 pkgdesc="Library to identify Wacom tablets and their features" arch=('x86_64') url="http://linuxwacom.sourceforge.net/wiki/index.php/Libwacom" @@ -10,12 +10,19 @@ license=('MIT') depends=('glib2' 'systemd' 'libgudev') validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') -source=(https://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2{,.sig}) +source=(https://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2{,.sig} + fix-pairedid-entry.patch) sha1sums=('6a6b19a587087412753ab69a2179f5f408f49ba2' - 'SKIP') + 'SKIP' + 'e9dbc6f8d6922ca02fd7efb003c785307dff2d6e') sha256sums=('e7d632301288b221cb5af69b4c5e57fd062bafd9a9acd6f9ce271570103267ef' - 'SKIP') + 'SKIP' + 'ed9a5500359c84d7f8784025185c7e66df7726d52b74170e15c17d64d871d51b') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../fix-pairedid-entry.patch +} build() { cd $pkgname-$pkgver ./configure --prefix=/usr Added: fix-pairedid-entry.patch =================================================================== --- fix-pairedid-entry.patch (rev 0) +++ fix-pairedid-entry.patch 2018-02-24 12:10:09 UTC (rev 317472) @@ -0,0 +1,43 @@ +From 007c25052bf20adc1f5311c3e5668f6f343ac18b Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue, 13 Feb 2018 15:01:40 +1000 +Subject: [PATCH] data: fix PairedID entry for the DTH-2452 + +Missing the 'usb' prefix which wasn't caught by the test suite. Add the entry +to libwacom_compare() to make sure this doesn't happen again. + +Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> +--- + data/dth-2452.tablet | 2 +- + libwacom/libwacom.c | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/data/dth-2452.tablet b/data/dth-2452.tablet +index 12309db..54f8191 100644 +--- a/data/dth-2452.tablet ++++ b/data/dth-2452.tablet +@@ -16,7 +16,7 @@ + [Device] + Name=Wacom DTH2452 + DeviceMatch=usb:056a:037d +-PairedID=056a:037e ++PairedID=usb:056a:037e + Class=PenDisplay + Width=20 + Height=12 +diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c +index 3daff81..b813d5e 100644 +--- a/libwacom/libwacom.c ++++ b/libwacom/libwacom.c +@@ -460,6 +460,11 @@ libwacom_compare(const WacomDevice *a, const WacomDevice *b, WacomCompareFlags f + if (memcmp(a->button_codes, b->button_codes, sizeof(int) * a->num_buttons) != 0) + return 1; + ++ if ((a->paired == NULL && b->paired != NULL) || ++ (a->paired != NULL && b->paired == NULL) || ++ (a->paired && b->paired && strcmp(a->paired->match, b->paired->match) != 0)) ++ return 1; ++ + if ((flags & WCOMPARE_MATCHES) && compare_matches(a, b) != 0) + return 1; + else if (strcmp(a->matches[a->match]->match, b->matches[b->match]->match) != 0)