Update to libwacom-2.5.0

14 files changed, 57 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba7664a7eab2..123285bb18c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libwacom-surface
 	pkgdesc = Patched libwacom for Microsoft Surface devices
-	pkgver = 2.4.0
+	pkgver = 2.5.0
 	pkgrel = 1
 	url = https://github.com/linux-surface/libwacom
 	arch = x86_64
@@ -14,10 +14,10 @@ pkgbase = libwacom-surface
 	depends = systemd
 	depends = libgudev
 	optdepends = python-libevdev: for libwacom-show-stylus
-	provides = libwacom=2.4.0
+	provides = libwacom=2.5.0
 	conflicts = libwacom
-	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.4.0/libwacom-2.4.0.tar.xz
-	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.4.0/libwacom-2.4.0.tar.xz.sig
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.5.0/libwacom-2.5.0.tar.xz
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.5.0/libwacom-2.5.0.tar.xz.sig
 	source = 0001-Add-support-for-BUS_VIRTUAL.patch
 	source = 0002-Add-support-for-Intel-Management-Engine-bus.patch
 	source = 0003-data-Add-Microsoft-Surface-Pro-3.patch
@@ -30,20 +30,20 @@ pkgbase = libwacom-surface
 	source = 0010-data-Add-Microsoft-Surface-Book-2-15.patch
 	source = 0011-data-Add-Microsoft-Surface-Book-3-13.5.patch
 	source = 0012-data-Add-Microsoft-Surface-Book-3-15.patch
-	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
-	sha256sums = d0d022761e3f9ab23e329583b7d2bd470b0450dfb077caeb22c5a0d66c2bd414
+	validpgpkeys = 594ABBA066118C7A02D10A80A8AF906D9307FBAD
+	sha256sums = 40b69a4c38bbcbc80b1231bc115551107ebbc0ba14d2ad1c3e54355dcd876816
 	sha256sums = SKIP
-	sha256sums = c35a556533f7c05b6515b2d3cb2319e7cd16e6fb3d6db8cd8c8496b71735dfec
-	sha256sums = 5856fe9d9b90be0bbf2bcb549d8e9d556f35d745049ea5a47c5371d21b8d3db4
-	sha256sums = 003b70d83f28d090e8609cd31af8f1c31f55061af8d41b65fc469e68e68c4a9a
-	sha256sums = cc5dcba04f2f5bc577e34452adee616fbe14c25a74b0afb3b8fedb5f6fcca4a9
-	sha256sums = 93b38899da0ec01c4b7f3867b4952c04cd8dfd2ec3fd8e434204b2dc6fb35df5
-	sha256sums = c878f100f1731da4a7e856cde6c2975bae1a23dac839a80c95ce82f55415c073
-	sha256sums = d2afac640d0b99bb1f4a993a74683b0b696edff155a75154c1332e46051187d3
-	sha256sums = 57cb891958ee8b6b087e5b396135c26538d1f4009938868dac7c45c1f1a0808b
-	sha256sums = 869f935219ec3bff3f7fa57fcb16dc4d75ac9ee43c780de559a50f70057f4dd2
-	sha256sums = 67d4af120e6c513a39af995cd3b52d2e42bde478b68897ef90c1c619a5dac66f
-	sha256sums = f31afb2745ba4340c5fef1e0424da63059d9b41260d7f8963482ed89d16c7503
-	sha256sums = 00907868d6d14032071886961c1499981928f21f20c731b54026ccbcd1d0e59c
+	sha256sums = df74a5120abd8b36387910f7a10bcc6e55d27d78e7870fac86d0209cfe0ec690
+	sha256sums = 2479522c18575c673c822614d680d59d4a3e61aab53bcfc8b214504924db3b77
+	sha256sums = 120efc9ccfcf159f8f5bce9d48838dd9febc3661827cf37bd4d2b01f78487569
+	sha256sums = 167c55b625c98b9620ae65b82bb6b83ad59326a73ef2952e65fb57622ab9d43b
+	sha256sums = 85e767c6b981c83a80e435f9aa313eac92b6e5056272e484e9881de91fc06965
+	sha256sums = dd9c3ad59d6f51368616afc1485abab09a5d5300fb48a92fb03f1e59074d3f11
+	sha256sums = 8f4572ef5a45a09160a85e2483bedc53f0e299ddae681b9b24f7b6b2dcc7241a
+	sha256sums = 20267f19f35476fa915cdbcec310995efb6af0d64ba0ebc321b1661fe686ba26
+	sha256sums = 44770f5dc6d019021f5ee8dd59f8fca2e2b687f817d4f889d635c4e18aa5a7a4
+	sha256sums = a13b958804c3a76e8feab26b544552ae6f536b9dcf1391128537be597eb6fc80
+	sha256sums = 4db44bd2f0923325dbcc95cb83bd2507d9c7dcecebcaece3f78c183dca22f737
+	sha256sums = 4e8786a24b412f51c07db9f45e72da532c2524ff4ba8a71339a6ba3a021a37d7
 
 pkgname = libwacom-surface
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index ad83db803226..eef3886e995f 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From f3428ccebde7f189c6f3fb6fd21803d57b22e9ba Mon Sep 17 00:00:00 2001
+From 9d10eb342207b97731d2577f6cd3a50283b64a5a Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 27 Jun 2020 18:21:11 +0200
 Subject: [PATCH 01/12] Add support for BUS_VIRTUAL
@@ -102,5 +102,5 @@ index d732bd1..4b21b6a 100755
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
  
 -- 
-2.37.2
+2.38.0
 
diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
index 0a9edcc2eb31..22b5f9e335aa 100644
--- a/0002-Add-support-for-Intel-Management-Engine-bus.patch
+++ b/0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -1,4 +1,4 @@
-From 3a4e439bd6e027d31820cf1d1023ad6193d4191b Mon Sep 17 00:00:00 2001
+From 4fd524a0397c1364d7963462b0134cb88f1de9bb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
 Subject: [PATCH 02/12] Add support for Intel Management Engine bus
@@ -97,5 +97,5 @@ index 4b21b6a..04a1310 100755
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
  
 -- 
-2.37.2
+2.38.0
 
diff --git a/0003-data-Add-Microsoft-Surface-Pro-3.patch b/0003-data-Add-Microsoft-Surface-Pro-3.patch
index b714427cf47f..6612a0842c19 100644
--- a/0003-data-Add-Microsoft-Surface-Pro-3.patch
+++ b/0003-data-Add-Microsoft-Surface-Pro-3.patch
@@ -1,4 +1,4 @@
-From 913a6c22318047c8d62d0d53d12d04e2fb5ed9fd Mon Sep 17 00:00:00 2001
+From 589c61539f8a518a2b65958781f395aafb0b8388 Mon Sep 17 00:00:00 2001
 From: "Antony Jordan (Tablet)" <wiccan.two@gmail.com>
 Date: Wed, 8 Jun 2022 22:03:33 +0200
 Subject: [PATCH 03/12] data: Add Microsoft Surface Pro 3
@@ -29,5 +29,5 @@ index 0000000..3238d43
 +Touch=true
 +Buttons=0
 -- 
-2.37.2
+2.38.0
 
diff --git a/0004-data-Add-Microsoft-Surface-Pro-4.patch b/0004-data-Add-Microsoft-Surface-Pro-4.patch
index 7793a9192c1c..80391097f23b 100644
--- a/0004-data-Add-Microsoft-Surface-Pro-4.patch
+++ b/0004-data-Add-Microsoft-Surface-Pro-4.patch
@@ -1,4 +1,4 @@
-From d8fb8a48d10385b2369bc0531af904b3e0eb8f1a Mon Sep 17 00:00:00 2001
+From 1545af0b14af46f137647cf115a7d12f8e6b8d23 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:18:55 +0200
 Subject: [PATCH 04/12] data: Add Microsoft Surface Pro 4
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.37.2
+2.38.0
 
diff --git a/0005-data-Add-Microsoft-Surface-Pro-5.patch b/0005-data-Add-Microsoft-Surface-Pro-5.patch
index 13972fb07cd1..6c7216ec2d3b 100644
--- a/0005-data-Add-Microsoft-Surface-Pro-5.patch
+++ b/0005-data-Add-Microsoft-Surface-Pro-5.patch
@@ -1,4 +1,4 @@
-From 709e1009903ee1bf74352baac678188646780ca2 Mon Sep 17 00:00:00 2001
+From 3f0d519017d62cfed890f14e9a590344a88037bb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:02 +0200
 Subject: [PATCH 05/12] data: Add Microsoft Surface Pro 5
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.37.2
+2.38.0
 
diff --git a/0006-data-Add-Microsoft-Surface-Pro-6.patch b/0006-data-Add-Microsoft-Surface-Pro-6.patch
index cee8d1ceb5c5..3a5c5c437d23 100644
--- a/0006-data-Add-Microsoft-Surface-Pro-6.patch
+++ b/0006-data-Add-Microsoft-Surface-Pro-6.patch
@@ -1,4 +1,4 @@
-From 984ddd4dd486af468da521be5b60a33a971911b3 Mon Sep 17 00:00:00 2001
+From 0cda0ec5ee39dae761414dd396988fcc600473ed Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:07 +0200
 Subject: [PATCH 06/12] data: Add Microsoft Surface Pro 6
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.37.2
+2.38.0
 
diff --git a/0007-data-Add-Microsoft-Surface-Pro-7.patch b/0007-data-Add-Microsoft-Surface-Pro-7.patch
index cb92377bf6cf..aab2f53d9ce7 100644
--- a/0007-data-Add-Microsoft-Surface-Pro-7.patch
+++ b/0007-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,4 +1,4 @@
-From c9ba3c1c8623a77036e9f846a069485c3992edec Mon Sep 17 00:00:00 2001
+From 2ae0860ff8d01cb38e4536f8d274f1ec65354e0e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:13 +0200
 Subject: [PATCH 07/12] data: Add Microsoft Surface Pro 7
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.37.2
+2.38.0
 
diff --git a/0008-data-Add-Microsoft-Surface-Book.patch b/0008-data-Add-Microsoft-Surface-Book.patch
index b49928de21cf..3cb186342125 100644
--- a/0008-data-Add-Microsoft-Surface-Book.patch
+++ b/0008-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From 94635cf9138790fb53d2cf41657c0eb231892c3a Mon Sep 17 00:00:00 2001
+From 575cf1c7bb7b1c025a9f21a8fbf82fd935a5090b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
 Subject: [PATCH 08/12] data: Add Microsoft Surface Book
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.37.2
+2.38.0
 
diff --git a/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch b/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch
index ea276705a5b0..c598d2074dfc 100644
--- a/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch
+++ b/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,4 +1,4 @@
-From 4689fdb5f2980915c586c398c17a354993a6998c Mon Sep 17 00:00:00 2001
+From 4aeb66bc104959078be387b4d7772fe5b50de83e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
 Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (13.5")
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.37.2
+2.38.0
 
diff --git a/0010-data-Add-Microsoft-Surface-Book-2-15.patch b/0010-data-Add-Microsoft-Surface-Book-2-15.patch
index 632fcf8e5805..114faaef7e8c 100644
--- a/0010-data-Add-Microsoft-Surface-Book-2-15.patch
+++ b/0010-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,4 +1,4 @@
-From 7e9ec922e91ccc194dca364bf348a99608103e23 Mon Sep 17 00:00:00 2001
+From 5c0f9befb9207cc6031f5a98f76f2dbfa310a741 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
 Subject: [PATCH 10/12] data: Add Microsoft Surface Book 2 (15")
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.37.2
+2.38.0
 
diff --git a/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch b/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch
index 16d81b2de201..99336327aab4 100644
--- a/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch
+++ b/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,4 +1,4 @@
-From bc3115761f804ca7592027cdd4782b82493acfec Mon Sep 17 00:00:00 2001
+From 5478a259e51dcb0fa383b59dc0b50cf19d918c8f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:29 +0200
 Subject: [PATCH 11/12] data: Add Microsoft Surface Book 3 (13.5")
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
 +Touch=true
 +Buttons=0
 -- 
-2.37.2
+2.38.0
 
diff --git a/0012-data-Add-Microsoft-Surface-Book-3-15.patch b/0012-data-Add-Microsoft-Surface-Book-3-15.patch
index e1802c88a0fa..dd16c0e9e88b 100644
--- a/0012-data-Add-Microsoft-Surface-Book-3-15.patch
+++ b/0012-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,4 +1,4 @@
-From 25fa0365e7f69052ebbd51d91eaf2395cfa4067c Mon Sep 17 00:00:00 2001
+From 7487dd6a7e80d597283ba5cca8a7069b0cec26b8 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:42 +0200
 Subject: [PATCH 12/12] data: Add Microsoft Surface Book 3 (15")
@@ -29,5 +29,5 @@ index 0000000..291321f
 +Touch=true
 +Buttons=0
 -- 
-2.37.2
+2.38.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 34b5a534c788..9107a6f1802c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Based on official Arch Linux PKGBUILD
 
 pkgname=libwacom-surface
-pkgver=2.4.0
+pkgver=2.5.0
 pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('x86_64')
@@ -12,7 +12,7 @@ depends=('glib2' 'systemd' 'libgudev')
 makedepends=('libxml2' 'meson')
 checkdepends=('python-pytest' 'python-libevdev' 'python-pyudev')
 optdepends=('python-libevdev: for libwacom-show-stylus')
-validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF')
+validpgpkeys=('594ABBA066118C7A02D10A80A8AF906D9307FBAD')
 conflicts=('libwacom')
 provides=("libwacom=${pkgver}")
 
@@ -31,20 +31,20 @@ source=(
     "0011-data-Add-Microsoft-Surface-Book-3-13.5.patch"
     "0012-data-Add-Microsoft-Surface-Book-3-15.patch"
 )
-sha256sums=('d0d022761e3f9ab23e329583b7d2bd470b0450dfb077caeb22c5a0d66c2bd414'
+sha256sums=('40b69a4c38bbcbc80b1231bc115551107ebbc0ba14d2ad1c3e54355dcd876816'
             'SKIP'
-            'c35a556533f7c05b6515b2d3cb2319e7cd16e6fb3d6db8cd8c8496b71735dfec'
-            '5856fe9d9b90be0bbf2bcb549d8e9d556f35d745049ea5a47c5371d21b8d3db4'
-            '003b70d83f28d090e8609cd31af8f1c31f55061af8d41b65fc469e68e68c4a9a'
-            'cc5dcba04f2f5bc577e34452adee616fbe14c25a74b0afb3b8fedb5f6fcca4a9'
-            '93b38899da0ec01c4b7f3867b4952c04cd8dfd2ec3fd8e434204b2dc6fb35df5'
-            'c878f100f1731da4a7e856cde6c2975bae1a23dac839a80c95ce82f55415c073'
-            'd2afac640d0b99bb1f4a993a74683b0b696edff155a75154c1332e46051187d3'
-            '57cb891958ee8b6b087e5b396135c26538d1f4009938868dac7c45c1f1a0808b'
-            '869f935219ec3bff3f7fa57fcb16dc4d75ac9ee43c780de559a50f70057f4dd2'
-            '67d4af120e6c513a39af995cd3b52d2e42bde478b68897ef90c1c619a5dac66f'
-            'f31afb2745ba4340c5fef1e0424da63059d9b41260d7f8963482ed89d16c7503'
-            '00907868d6d14032071886961c1499981928f21f20c731b54026ccbcd1d0e59c')
+            'df74a5120abd8b36387910f7a10bcc6e55d27d78e7870fac86d0209cfe0ec690'
+            '2479522c18575c673c822614d680d59d4a3e61aab53bcfc8b214504924db3b77'
+            '120efc9ccfcf159f8f5bce9d48838dd9febc3661827cf37bd4d2b01f78487569'
+            '167c55b625c98b9620ae65b82bb6b83ad59326a73ef2952e65fb57622ab9d43b'
+            '85e767c6b981c83a80e435f9aa313eac92b6e5056272e484e9881de91fc06965'
+            'dd9c3ad59d6f51368616afc1485abab09a5d5300fb48a92fb03f1e59074d3f11'
+            '8f4572ef5a45a09160a85e2483bedc53f0e299ddae681b9b24f7b6b2dcc7241a'
+            '20267f19f35476fa915cdbcec310995efb6af0d64ba0ebc321b1661fe686ba26'
+            '44770f5dc6d019021f5ee8dd59f8fca2e2b687f817d4f889d635c4e18aa5a7a4'
+            'a13b958804c3a76e8feab26b544552ae6f536b9dcf1391128537be597eb6fc80'
+            '4db44bd2f0923325dbcc95cb83bd2507d9c7dcecebcaece3f78c183dca22f737'
+            '4e8786a24b412f51c07db9f45e72da532c2524ff4ba8a71339a6ba3a021a37d7')
 
 prepare() {
     cd "libwacom-${pkgver}"