libwacom 0.29

This commit is contained in:
Peter Hutterer 2018-03-06 13:50:37 +10:00
parent e17f637cc4
commit e7213409e1
3 changed files with 6 additions and 51 deletions

View File

@ -1,46 +0,0 @@
From b64c15fed97f2374fcf1cf511f4f087a3405644c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 13 Feb 2018 15:01:40 +1000
Subject: [PATCH libwacom] 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.hutterer@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)
--
2.14.3

View File

@ -1,6 +1,6 @@
Name: libwacom
Version: 0.28
Release: 3%{?dist}
Version: 0.29
Release: 1%{?dist}
Summary: Tablet Information Client Library
Requires: %{name}-data
@ -10,8 +10,6 @@ URL: http://linuxwacom.sourceforge.net
Source0: http://prdownloads.sourceforge.net/linuxwacom/%{name}/%{name}-%{version}.tar.bz2
Patch01: 0001-data-fix-PairedID-entry-for-the-DTH-2452.patch
BuildRequires: autoconf automake libtool doxygen
BuildRequires: glib2-devel libgudev1-devel
BuildRequires: systemd systemd-devel
@ -84,6 +82,9 @@ make %{?_smp_mflags} check
%{_datadir}/libwacom/layouts/*.svg
%changelog
* Mon Mar 05 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.29-1
- libwacom 0.29
* Tue Feb 13 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.28-3
- Fix PairedID entry causing a debug message in the udev rules

View File

@ -1 +1 @@
SHA512 (libwacom-0.28.tar.bz2) = 8bc09da6671e5766591ad6b37afe76ae1b48c75b9bc69d67d9a285a83030da26a9a13950b7811103db6d0e328a20afb743ded9efd23d2f338552e4b7d7be2075
SHA512 (libwacom-0.29.tar.bz2) = 22fb7610a21a577d7ebc567e14ed1135b883723bc6c37adda540915261ebaea2365e4ab19339beefe6c412ba3c45e85b958129ddb24bff8ec73338b7a63a70ff