From 5e02b756d11053eb5db88fced0781521b4c50a1c Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 22 Dec 2025 06:19:09 +0000 Subject: [PATCH] import OL libwacom-2.14.0-4.el10_1 --- ...he-Wacom-Intuos-Pro3-again-for-small.patch | 479 ++++++++++++++++++ ...-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch | 287 ++++++----- libwacom.spec | 8 +- 3 files changed, 640 insertions(+), 134 deletions(-) create mode 100644 0005-layouts-update-the-Wacom-Intuos-Pro3-again-for-small.patch rename 0005-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch => 0006-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch (71%) diff --git a/0005-layouts-update-the-Wacom-Intuos-Pro3-again-for-small.patch b/0005-layouts-update-the-Wacom-Intuos-Pro3-again-for-small.patch new file mode 100644 index 0000000..40324df --- /dev/null +++ b/0005-layouts-update-the-Wacom-Intuos-Pro3-again-for-small.patch @@ -0,0 +1,479 @@ +From 0672b89012a05aaeb621daa40f41cc94d57c73ea Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 21 Oct 2025 09:43:27 +1000 +Subject: [PATCH libwacom] layouts: update the Wacom Intuos Pro3 again for + smaller screens + +On smaller screen sizes the dial configuration can overlap each other +because there isn't enough space between the two. + +Work around this by offsetting the leaders and button configuration. + +This also changes the fill style of the buttons on the M to match the +ones on the L. +--- + data/layouts/wacom-intuos-pro-3-l.svg | 102 ++++++++++++------- + data/layouts/wacom-intuos-pro-3-m.svg | 136 ++++++++++++++++++-------- + 2 files changed, 161 insertions(+), 77 deletions(-) + +diff --git a/data/layouts/wacom-intuos-pro-3-l.svg b/data/layouts/wacom-intuos-pro-3-l.svg +index 2bd1a1abfab7..fa5bd6f8d847 100644 +--- a/data/layouts/wacom-intuos-pro-3-l.svg ++++ b/data/layouts/wacom-intuos-pro-3-l.svg +@@ -13,7 +13,10 @@ + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +- xmlns:svg="http://www.w3.org/2000/svg"> ++ xmlns:svg="http://www.w3.org/2000/svg" ++ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ++ xmlns:cc="http://creativecommons.org/ns#" ++ xmlns:dc="http://purl.org/dc/elements/1.1/"> + + ++ + + Wacom Intuos Pro L (PTK870) +@@ -161,39 +178,41 @@ + y="50.979851" + style="text-anchor:end">I + ++ id="g19"> + ++ d="m 146.854,3.00752 c -5.247,0 -9.976,3.16004 -11.984,8.00658 -2.007,4.8466 -0.898,10.4252 2.812,14.1346 3.709,3.7094 9.288,4.819 14.135,2.8115 4.847,-2.0075 8.007,-6.7368 8.007,-11.9827 0,-7.16311 -5.807,-12.96998 -12.97,-12.96998 z" /> + ++ d="m 143.885,5.88344 2.247,-1.10048 v 0.73366 c 1.343,-0.08427 2.672,0.30622 3.745,1.10046 C 148.73,6.00801 147.38,5.87584 146.132,6.25026 V 6.9839 Z" /> + ++ d="m 151.99999,6.9999998 h 14" ++ sodipodi:nodetypes="cc" /> + CCW ++ x="170.71777" ++ y="7.578125" ++ style="text-anchor:start">CCW + ++ d="m 143.883,26.4255 2.247,-1.1004 v 0.7336 c 1.298,0.1914 2.623,-0.0682 3.745,-0.7336 -0.973,0.9964 -2.338,1.5315 -3.745,1.4672 v 0.7337 z" /> + ++ d="m 151.99999,24.999999 h 10 V 16 h 4" ++ sodipodi:nodetypes="cccc" /> + CW ++ x="170.71777" ++ y="16.578125" ++ style="text-anchor:start">CW + + J + ++ id="g20"> + ++ d="m 230.279,3.05324 c -5.246,0 -9.975,3.16004 -11.983,8.00656 -2.007,4.8466 -0.898,10.4252 2.812,14.1346 3.709,3.7094 9.288,4.819 14.134,2.8115 4.847,-2.0075 8.007,-6.7368 8.007,-11.9827 0,-7.16309 -5.807,-12.96996 -12.97,-12.96996 z" /> + +- ++ d="m 227.31,5.92916 2.247,-1.10048 v 0.73366 c 1.343,-0.08427 2.672,0.30622 3.745,1.10046 -1.147,-0.60907 -2.497,-0.74124 -3.745,-0.36682 v 0.73364 z" /> + CCW ++ x="205.55469" ++ y="25.578125" ++ style="text-anchor:end">CCW + +- ++ d="m 227.308,26.4712 2.247,-1.1004 v 0.7336 c 1.298,0.1914 2.623,-0.0682 3.745,-0.7336 -0.973,0.9964 -2.338,1.5315 -3.745,1.4672 v 0.7337 z" /> + CW ++ x="201.94238" ++ y="34.578125" ++ style="text-anchor:end">CW ++ ++ + ++ ++ ++ ++ Wacom Intuos Pro L (PTK870) ++ ++ ++ + +diff --git a/data/layouts/wacom-intuos-pro-3-m.svg b/data/layouts/wacom-intuos-pro-3-m.svg +index ac1e4804d475..32e776bcfb5e 100644 +--- a/data/layouts/wacom-intuos-pro-3-m.svg ++++ b/data/layouts/wacom-intuos-pro-3-m.svg +@@ -13,7 +13,10 @@ + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +- xmlns:svg="http://www.w3.org/2000/svg"> ++ xmlns:svg="http://www.w3.org/2000/svg" ++ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ++ xmlns:cc="http://creativecommons.org/ns#" ++ xmlns:dc="http://purl.org/dc/elements/1.1/"> + + ++ inkscape:current-layer="intuos-pro-m-ptk670" ++ showgrid="true" ++ showguides="true"> ++ ++ ++ ++ + Wacom Intuos Pro M (PTK670) + ++ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" /> + ++ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" /> + ++ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" /> + ++ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" /> + ++ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" /> + I + ++ id="g2"> + ++ d="m 103.43989,3.0074448 c -5.247001,0 -9.976001,3.16004 -11.984001,8.0065802 -2.007,4.8466 -0.898,10.4252 2.812,14.1346 3.709,3.7094 9.288001,4.819 14.135001,2.8115 4.847,-2.0075 8.007,-6.7368 8.007,-11.9827 0,-7.1631102 -5.807,-12.9699802 -12.97,-12.9699802 z" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" ++ sodipodi:nodetypes="sccsss" /> + ++ d="m 100.47089,5.8833648 2.247,-1.10048 v 0.73366 c 1.343,-0.08427 2.672,0.30622 3.745,1.10046 -1.147,-0.60907 -2.497,-0.74124 -3.745,-0.36682 v 0.73364 z" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" ++ sodipodi:nodetypes="ccccccc" /> + ++ d="m 109,7.0000001 h 14" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" ++ sodipodi:nodetypes="cc" /> + CCW ++ x="127.71777" ++ y="7.578125" ++ style="font-size:6px;font-family:monospace;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">CCW + ++ d="m 100.46889,26.425425 2.247,-1.1004 v 0.7336 c 1.298,0.1914 2.623,-0.0682 3.745,-0.7336 -0.973,0.9964 -2.338,1.5315 -3.745,1.4672 v 0.7337 z" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" ++ sodipodi:nodetypes="ccccccc" /> + ++ d="m 108,26 10,0 0,-11 h 5" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" ++ sodipodi:nodetypes="cccc" /> + CW ++ x="127.71777" ++ y="15.578125" ++ style="font-size:6px;font-family:monospace;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">CW + + ++ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" /> + ++ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" /> + ++ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" /> + ++ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" /> + ++ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" /> + J + ++ id="g1"> + ++ d="m 186.86489,3.0531648 c -5.246,0 -9.975,3.16004 -11.983,8.0065602 -2.007,4.8466 -0.898,10.4252 2.812,14.1346 3.709,3.7094 9.288,4.819 14.134,2.8115 4.847,-2.0075 8.007,-6.7368 8.007,-11.9827 0,-7.1630902 -5.807,-12.9699602 -12.97,-12.9699602 z" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" /> + ++ d="m 183.89589,5.9290848 2.247,-1.10048 v 0.73366 c 1.343,-0.08427 2.672,0.30622 3.745,1.10046 -1.147,-0.60907 -2.497,-0.74124 -3.745,-0.36682 v 0.73364 z" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" /> + ++ d="M 182,6.0000001 H 171 V 24 h -3" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" ++ sodipodi:nodetypes="cccc" /> + CCW ++ x="162.55469" ++ y="24.578125" ++ style="font-size:6px;font-family:monospace;text-anchor:end;fill:none;stroke:#7f7f7f;stroke-width:0.25">CCW + ++ d="m 183.89389,26.471125 2.247,-1.1004 v 0.7336 c 1.298,0.1914 2.623,-0.0682 3.745,-0.7336 -0.973,0.9964 -2.338,1.5315 -3.745,1.4672 v 0.7337 z" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" /> + ++ d="m 182,26 h -9 v 8.000001 h -5" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" ++ sodipodi:nodetypes="cccc" /> + CW ++ x="158.94238" ++ y="34.578125" ++ style="font-size:6px;font-family:monospace;text-anchor:end;fill:none;stroke:#7f7f7f;stroke-width:0.25">CW + ++ ++ ++ ++ Wacom Intuos Pro M (PTK670) ++ ++ ++ + +-- +2.51.0 + diff --git a/0005-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch b/0006-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch similarity index 71% rename from 0005-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch rename to 0006-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch index 941c0e5..2579ca0 100644 --- a/0005-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch +++ b/0006-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch @@ -1,4 +1,4 @@ -From 2789337d782623967920fe495142f8de83b6b6fb Mon Sep 17 00:00:00 2001 +From 137e50485d34b65ce47e610a390a70ad1db10ddc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 22 Jul 2025 10:45:59 +1000 Subject: [PATCH libwacom] RHEL: pretend the Intuos Pro 3rd Gen has Rings, not @@ -23,114 +23,12 @@ Signed-off-by: Peter Hutterer 6 files changed, 117 insertions(+), 83 deletions(-) diff --git a/data/layouts/wacom-intuos-pro-3-l.svg b/data/layouts/wacom-intuos-pro-3-l.svg -index 2bd1a1abfab7..d000ef02acc8 100644 +index fa5bd6f8d847..8fb5e7792af4 100644 --- a/data/layouts/wacom-intuos-pro-3-l.svg +++ b/data/layouts/wacom-intuos-pro-3-l.svg -@@ -163,34 +163,34 @@ +@@ -180,36 +180,36 @@ - - - - CCW - - - CW -@@ -273,34 +273,34 @@ - - - - - CCW - - - CW -diff --git a/data/layouts/wacom-intuos-pro-3-m.svg b/data/layouts/wacom-intuos-pro-3-m.svg -index ac1e4804d475..5fa321b71b16 100644 ---- a/data/layouts/wacom-intuos-pro-3-m.svg -+++ b/data/layouts/wacom-intuos-pro-3-m.svg -@@ -127,34 +127,34 @@ - style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" - transform="translate(-43.414111,-7.5157166e-5)"> + id="g19"> + d="m 151.99999,6.9999998 h 14" + sodipodi:nodetypes="cc" /> CCW + d="m 151.99999,24.999999 h 10 V 16 h 4" + sodipodi:nodetypes="cccc" /> CW -@@ -253,34 +253,34 @@ - style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" - transform="translate(-43.414111,-7.5157166e-5)"> +@@ -292,38 +292,38 @@ + - CCW - CW + + +diff --git a/data/layouts/wacom-intuos-pro-3-m.svg b/data/layouts/wacom-intuos-pro-3-m.svg +index 32e776bcfb5e..2c8e1c08923f 100644 +--- a/data/layouts/wacom-intuos-pro-3-m.svg ++++ b/data/layouts/wacom-intuos-pro-3-m.svg +@@ -155,44 +155,44 @@ + + + + + CCW + + + CW +@@ -289,41 +289,41 @@ + + + + + CCW + + + CW diff --git a/data/layouts/wacom-intuos-pro-3-s.svg b/data/layouts/wacom-intuos-pro-3-s.svg index 4de7c63bf199..bdd0273a271a 100644 --- a/data/layouts/wacom-intuos-pro-3-s.svg @@ -375,5 +398,5 @@ index cb1210aacf31..6b6f663be147 100644 +RingNumModes=3 +Ring2NumModes=3 -- -2.50.1 +2.51.0 diff --git a/libwacom.spec b/libwacom.spec index b57d6da..54b5428 100644 --- a/libwacom.spec +++ b/libwacom.spec @@ -1,6 +1,6 @@ Name: libwacom Version: 2.14.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tablet Information Client Library Requires: %{name}-data @@ -13,7 +13,8 @@ Patch01: 0001-data-Add-3rd-gen-Intuos-Pro-devices.patch Patch02: 0002-data-Add-six-new-tablet-definitions.patch Patch03: 0003-layouts-rearrange-the-Intuos-Pro-3rd-L-M-buttons.patch Patch04: 0004-layouts-move-the-rings-of-the-Intuos-Pro-3rd-down-in.patch -Patch05: 0005-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch +Patch05: 0005-layouts-update-the-Wacom-Intuos-Pro3-again-for-small.patch +Patch06: 0006-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch BuildRequires: meson gcc BuildRequires: glib2-devel libgudev1-devel libevdev-devel @@ -100,6 +101,9 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir} %{_mandir}/man1/libwacom-show-stylus.1* %changelog +* Wed Nov 05 2025 Peter Hutterer - 2.14.0-4 +- Rearrange the dial leaders for the Intuos Pro 3rd Gen (RHEL-122812) + * Wed Aug 20 2025 Peter Hutterer - 2.14.0-3 - Rearrange the button leaders for the Intuos Pro 3rd Gen (RHEL-101873)