Skip to content

Commit 8b647db

Browse files
committed
Update patches for libwacom-1.6
1 parent 758afdf commit 8b647db

12 files changed

+33
-33
lines changed

0001-Add-support-for-BUS_VIRTUAL.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 958ee8b63cdcd7347a1999bb94c0226e93025fd6 Mon Sep 17 00:00:00 2001
1+
From 232486e70e95297ac1e5f9cb32974f69e762c93f Mon Sep 17 00:00:00 2001
22
From: Dorian Stoll <[email protected]>
33
Date: Sat, 27 Jun 2020 18:21:11 +0200
44
Subject: [PATCH 01/12] Add support for BUS_VIRTUAL
@@ -41,7 +41,7 @@ index 9f2657b..7be5247 100644
4141
g_assert_not_reached ();
4242
}
4343
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
44-
index 627354c..aa1d47f 100644
44+
index 062b313..7b97bb1 100644
4545
--- a/libwacom/libwacom.c
4646
+++ b/libwacom/libwacom.c
4747
@@ -147,6 +147,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -64,7 +64,7 @@ index 627354c..aa1d47f 100644
6464
default: g_assert_not_reached(); break;
6565
}
6666
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
67-
index a848133..30636b4 100644
67+
index 1b9bc2c..24e99cd 100644
6868
--- a/libwacom/libwacom.h
6969
+++ b/libwacom/libwacom.h
7070
@@ -117,6 +117,7 @@ typedef enum {
@@ -76,17 +76,17 @@ index a848133..30636b4 100644
7676

7777
/**
7878
diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
79-
index 65b87c0..0b117eb 100644
79+
index 9e5b02f..3883341 100644
8080
--- a/test/test-tablet-validity.c
8181
+++ b/test/test-tablet-validity.c
82-
@@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
83-
/* fall through */
82+
@@ -179,6 +179,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
83+
break;
8484
case WBUSTYPE_BLUETOOTH:
8585
case WBUSTYPE_I2C:
8686
+ case WBUSTYPE_VIRTUAL:
8787
g_assert_cmpint(vid, >, 0);
8888
g_assert_cmpint(pid, >, 0);
8989
break;
9090
--
91-
2.28.0
91+
2.29.2
9292

0002-Add-support-for-Intel-Management-Engine-bus.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b9a239e8e242d0f07b2023fe1b648e3abc389e06 Mon Sep 17 00:00:00 2001
1+
From 1b05921d0832770f31544ec252a8fedbd3b8db2c Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Sat, 1 Jun 2019 21:17:15 +0200
44
Subject: [PATCH 02/12] Add support for Intel Management Engine bus
@@ -36,7 +36,7 @@ index 7be5247..37ffd37 100644
3636
g_assert_not_reached ();
3737
}
3838
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
39-
index aa1d47f..c6551ad 100644
39+
index 7b97bb1..d84e8fa 100644
4040
--- a/libwacom/libwacom.c
4141
+++ b/libwacom/libwacom.c
4242
@@ -151,6 +151,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -59,7 +59,7 @@ index aa1d47f..c6551ad 100644
5959
default: g_assert_not_reached(); break;
6060
}
6161
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
62-
index 30636b4..e555be3 100644
62+
index 24e99cd..0eee2fd 100644
6363
--- a/libwacom/libwacom.h
6464
+++ b/libwacom/libwacom.h
6565
@@ -118,6 +118,7 @@ typedef enum {
@@ -71,10 +71,10 @@ index 30636b4..e555be3 100644
7171

7272
/**
7373
diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
74-
index 0b117eb..58b909f 100644
74+
index 3883341..352bc43 100644
7575
--- a/test/test-tablet-validity.c
7676
+++ b/test/test-tablet-validity.c
77-
@@ -178,6 +178,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
77+
@@ -180,6 +180,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
7878
case WBUSTYPE_BLUETOOTH:
7979
case WBUSTYPE_I2C:
8080
case WBUSTYPE_VIRTUAL:
@@ -83,5 +83,5 @@ index 0b117eb..58b909f 100644
8383
g_assert_cmpint(pid, >, 0);
8484
break;
8585
--
86-
2.28.0
86+
2.29.2
8787

0003-data-Add-Microsoft-Surface-pro-4.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 113e978f6ba2b6dcead82e475eda40b567357672 Mon Sep 17 00:00:00 2001
1+
From 75c107b81586f6bcc8c44eb815a7ff62203a6ba5 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:18:55 +0200
44
Subject: [PATCH 03/12] data: Add Microsoft Surface pro 4
@@ -29,5 +29,5 @@ index 0000000..bfbe809
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.28.0
32+
2.29.2
3333

0004-data-Add-Microsoft-Surface-pro-5.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ee23ff644a706f8e73d42bf2d0b3f06bd5829137 Mon Sep 17 00:00:00 2001
1+
From b046b8f1caadcd191e8ab7ac93e6a3190f09779d Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:19:02 +0200
44
Subject: [PATCH 04/12] data: Add Microsoft Surface pro 5
@@ -29,5 +29,5 @@ index 0000000..4fdbac6
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.28.0
32+
2.29.2
3333

0005-data-Add-Microsoft-Surface-pro-6.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 6d4d980f10ed4e02fff4c0f37ed3761c549b13f0 Mon Sep 17 00:00:00 2001
1+
From 204eed54bb339d927f2291bc6d8abb47b7ddccc3 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:19:07 +0200
44
Subject: [PATCH 05/12] data: Add Microsoft Surface pro 6
@@ -29,5 +29,5 @@ index 0000000..787fd7a
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.28.0
32+
2.29.2
3333

0006-data-Add-Microsoft-Surface-pro-7.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3a2548b9bbb9b61c9bc2f3fa7c0c1e3a094e011a Mon Sep 17 00:00:00 2001
1+
From 2130681ccb33f538e4000ce219b2f6c861dcd024 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:19:13 +0200
44
Subject: [PATCH 06/12] data: Add Microsoft Surface pro 7
@@ -29,5 +29,5 @@ index 0000000..4659131
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.28.0
32+
2.29.2
3333

0007-data-Add-Microsoft-Surface-Book.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From eb1fde4cbd67dd58e8a5bc262f3e3444516d9bfe Mon Sep 17 00:00:00 2001
1+
From ce150a5ca89aba8c5985b90a81f8bcbff046780c Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:19:38 +0200
44
Subject: [PATCH 07/12] data: Add Microsoft Surface Book
@@ -29,5 +29,5 @@ index 0000000..a551c9b
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.28.0
32+
2.29.2
3333

0008-data-Add-Microsoft-Surface-Book-2-13.5.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0b5ea7dc8e9c5546bfb17fe118dfefe2750cd47d Mon Sep 17 00:00:00 2001
1+
From f3117e7ff8e213672f532b609d98c0e5d8d30d41 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:20:04 +0200
44
Subject: [PATCH 08/12] data: Add Microsoft Surface Book 2 (13.5")
@@ -29,5 +29,5 @@ index 0000000..6e770e9
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.28.0
32+
2.29.2
3333

0009-data-Add-Microsoft-Surface-Book-2-15.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 08d1aa675432c1e5d0e35a635680d06fe90a9671 Mon Sep 17 00:00:00 2001
1+
From c5bc7f543e56e2110af2538a6a1385c4323ecc00 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:20:13 +0200
44
Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (15")
@@ -29,5 +29,5 @@ index 0000000..c07e60f
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.28.0
32+
2.29.2
3333

0010-data-Add-Microsoft-Surface-Book-3-13.5.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4823363ed2a44b64b90a81e8ed6f2ed990c21ae1 Mon Sep 17 00:00:00 2001
1+
From f8b1b9f4edde20df98af37d849661d64bcecf093 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:20:29 +0200
44
Subject: [PATCH 10/12] data: Add Microsoft Surface Book 3 (13.5")
@@ -29,5 +29,5 @@ index 0000000..212ef93
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.28.0
32+
2.29.2
3333

0 commit comments

Comments
 (0)