Date: Wednesday, June 20, 2018 @ 21:53:25 Author: jgc Revision: 327381
archrelease: copy trunk to extra-x86_64 Added: libwacom/repos/extra-x86_64/PKGBUILD (from rev 327380, libwacom/trunk/PKGBUILD) Deleted: libwacom/repos/extra-x86_64/PKGBUILD libwacom/repos/extra-x86_64/fix-pairedid-entry.patch --------------------------+ PKGBUILD | 78 ++++++++++++++++++++++----------------------- fix-pairedid-entry.patch | 43 ------------------------ 2 files changed, 39 insertions(+), 82 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-20 21:53:21 UTC (rev 327380) +++ PKGBUILD 2018-06-20 21:53:25 UTC (rev 327381) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> - -pkgname=libwacom -pkgver=0.29 -pkgrel=1 -pkgdesc="Library to identify Wacom tablets and their features" -arch=('x86_64') -url="https://github.com/linuxwacom/libwacom/wiki" -license=('MIT') -depends=('glib2' 'systemd' 'libgudev') -makedepends=('libxml2') -validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') -source=(https://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2{,.sig}) -sha1sums=('6782d32af328bc984d7c4f65062f04a9172d342c' - 'SKIP') -sha256sums=('9cea00e68ddf342c3f749f6628d33fd3646f1937d7c57053ec6c5728d9a333b6' - 'SKIP') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -m755 -d ${pkgdir}/usr/lib/udev/rules.d - cd tools - ./generate-udev-rules > ${pkgdir}/usr/lib/udev/rules.d/65-libwacom.rules - -} Copied: libwacom/repos/extra-x86_64/PKGBUILD (from rev 327380, libwacom/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-20 21:53:25 UTC (rev 327381) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> + +pkgname=libwacom +pkgver=0.30 +pkgrel=1 +pkgdesc="Library to identify Wacom tablets and their features" +arch=('x86_64') +url="https://github.com/linuxwacom/libwacom/wiki" +license=('MIT') +depends=('glib2' 'systemd' 'libgudev') +makedepends=('libxml2') +validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') +source=(https://github.com/linuxwacom/libwacom/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2{,.sig}) +sha1sums=('f1f75093309a792343872835865573206a0f2ef0' + 'SKIP') +sha256sums=('523408680514c0f01052e478503d8e89f86d72ddc7129fdd63988c221c492259' + 'SKIP') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -m755 -d ${pkgdir}/usr/lib/udev/rules.d + cd tools + ./generate-udev-rules > ${pkgdir}/usr/lib/udev/rules.d/65-libwacom.rules + +} Deleted: fix-pairedid-entry.patch =================================================================== --- fix-pairedid-entry.patch 2018-06-20 21:53:21 UTC (rev 327380) +++ fix-pairedid-entry.patch 2018-06-20 21:53:25 UTC (rev 327381) @@ -1,43 +0,0 @@ -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)