rpms/libwacom
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import OL libwacom-2.14.0-4.el10_1

Browse Source
This commit is contained in:
eabdullin 2025-12-22 06:19:09 +00:00
parent ff101c9c9b
commit 5e02b756d1
3 changed files with 640 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

479
0005-layouts-update-the-Wacom-Intuos-Pro3-again-for-small.patch Normal file
View File

@ -0,0 +1,479 @@
From 0672b89012a05aaeb621daa40f41cc94d57c73ea Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
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/">
<defs
id="defs1" />
<sodipodi:namedview
@@ -26,11 +29,11 @@
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
- showgrid="false"
+ showgrid="true"
showguides="true"
- inkscape:zoom="3.0406085"
- inkscape:cx="799.18215"
- inkscape:cy="210.81307"
+ inkscape:zoom="4.3000698"
+ inkscape:cx="712.31402"
+ inkscape:cy="69.76631"
inkscape:window-width="3072"
inkscape:window-height="1659"
inkscape:window-x="0"
@@ -82,6 +85,20 @@
orientation="0,-1"
id="guide10"
inkscape:locked="false" />
+ <inkscape:grid
+ id="grid19"
+ units="mm"
+ originx="0"
+ originy="0"
+ spacingx="1"
+ spacingy="1"
+ empcolor="#0099e5"
+ empopacity="0.30196078"
+ color="#0099e5"
+ opacity="0.14901961"
+ empspacing="5"
+ enabled="true"
+ visible="true" />
</sodipodi:namedview>
<title
id="title">Wacom Intuos Pro L (PTK870)</title>
@@ -161,39 +178,41 @@
y="50.979851"
style="text-anchor:end">I</text>
<g
- id="g7">
+ id="g19">
<path
id="Dial"
class="Dial TouchDial"
- d="M 146.854 3.00752 C 141.607 3.00752 136.878 6.16756 134.87 11.0141 C 132.863 15.8607 133.972 21.4393 137.682 25.1487 C 141.391 28.8581 146.97 29.9677 151.817 27.9602 C 156.664 25.9527 159.824 21.2234 159.824 15.9775 C 159.824 8.81439 154.017 3.00752 146.854 3.00752 Z" />
+ 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" />
<path
id="DialCCW"
class="DialCCW Button"
- d="M 143.885 5.88344 L 146.132 4.78296 L 146.132 5.51662 C 147.475 5.43235 148.804 5.82284 149.877 6.61708 C 148.73 6.00801 147.38 5.87584 146.132 6.25026 L 146.132 6.9839 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" />
<path
id="LeaderDialCCW"
class="DialCCW Dial Leader"
- d="M 151.853 6.89279 L 166.099 6.89279" />
+ d="m 151.99999,6.9999998 h 14"
+ sodipodi:nodetypes="cc" />
<text
id="LabelDialCCW"
class="DialCCW Dial Label"
- x="171.099"
- y="7.2452002"
- style="text-anchor:start;">CCW</text>
+ x="170.71777"
+ y="7.578125"
+ style="text-anchor:start">CCW</text>
<path
id="DialCW"
class="DialCW Button"
- d="M 143.883 26.4255 L 146.13 25.3251 L 146.13 26.0587 C 147.428 26.2501 148.753 25.9905 149.875 25.3251 C 148.902 26.3215 147.537 26.8566 146.13 26.7923 L 146.13 27.526 Z" />
+ 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" />
<path
id="LeaderDialCW"
class="DialCW Dial Leader"
- d="M 151.853 25.0477 L 166.099 25.0477" />
+ d="m 151.99999,24.999999 h 10 V 16 h 4"
+ sodipodi:nodetypes="cccc" />
<text
id="LabelDialCW"
class="DialCW Dial Label"
- x="171.099"
- y="25.45682"
- style="text-anchor:start;">CW</text>
+ x="170.71777"
+ y="16.578125"
+ style="text-anchor:start">CW</text>
</g>
<path
id="ButtonE"
@@ -271,38 +290,51 @@
y="50.894886"
style="text-anchor:start">J</text>
<g
- id="g17">
+ id="g20">
<path
id="Dial2"
class="Dial2 TouchDial"
- d="M 230.279 3.05324 C 225.033 3.05324 220.304 6.21328 218.296 11.0598 C 216.289 15.9064 217.398 21.485 221.108 25.1944 C 224.817 28.9038 230.396 30.0134 235.242 28.0059 C 240.089 25.9984 243.249 21.2691 243.249 16.0232 C 243.249 8.86011 237.442 3.05324 230.279 3.05324 Z" />
+ 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" />
<path
id="Dial2CCW"
class="Dial2CCW Dial2 Button"
- d="M 227.31 5.92916 L 229.557 4.82868 L 229.557 5.56234 C 230.9 5.47807 232.229 5.86856 233.302 6.6628 C 232.155 6.05373 230.805 5.92156 229.557 6.29598 L 229.557 7.02962 Z" />
- <path
- id="LeaderDial2CCW"
- class="Dial2CCW Dial2 Leader"
- d="M 225.28 6.93851 L 211.034 6.93851" />
+ 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" />
<text
id="LabelDial2CCW"
class="Dial2CCW Dial2 Label"
- x="206.034"
- y="7.2452002"
- style="text-anchor:end;">CCW</text>
+ x="205.55469"
+ y="25.578125"
+ style="text-anchor:end">CCW</text>
<path
id="Dial2CW"
class="Dial2CW Button"
- d="M 227.308 26.4712 L 229.555 25.3708 L 229.555 26.1044 C 230.853 26.2958 232.178 26.0362 233.3 25.3708 C 232.327 26.3672 230.962 26.9023 229.555 26.838 L 229.555 27.5717 Z" />
- <path
- id="LeaderDial2CW"
- class="Dial2CW Dial2 Leader"
- d="M 225.28 25.0934 L 211.034 25.0934" />
+ 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" />
<text
id="LabelDial2CW"
class="Dial2CW Dial2 Label"
- x="206.034"
- y="25.457001"
- style="text-anchor:end;">CW</text>
+ x="201.94238"
+ y="34.578125"
+ style="text-anchor:end">CW</text>
+ <path
+ id="LeaderDial2CCW"
+ class="Dial2CCW Dial2 Leader"
+ d="m 224.99999,6.9999998 h -12 l 0,17.9999992 h -2"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25"
+ sodipodi:nodetypes="cccc" />
+ <path
+ id="LeaderDial2CW"
+ class="Dial2CW Dial2 Leader"
+ d="m 224.99999,25.093398 -8,-0.03262 v 8.939222 h -6"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25"
+ sodipodi:nodetypes="cccc" />
</g>
+ <metadata
+ id="metadata19">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:title>Wacom Intuos Pro L (PTK870)</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
</svg>
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/">
<defs
id="defs1" />
<sodipodi:namedview
@@ -27,21 +30,48 @@
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
inkscape:zoom="1.8688618"
- inkscape:cx="550.06743"
- inkscape:cy="216.17436"
+ inkscape:cx="660.83003"
+ inkscape:cy="-44.412059"
inkscape:window-width="3072"
inkscape:window-height="1659"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
- inkscape:current-layer="intuos-pro-m-ptk670" />
+ inkscape:current-layer="intuos-pro-m-ptk670"
+ showgrid="true"
+ showguides="true">
+ <sodipodi:guide
+ position="170.99112,187.66268"
+ orientation="1,0"
+ id="guide1"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="164.83641,188.83465"
+ orientation="0,-1"
+ id="guide3"
+ inkscape:locked="false" />
+ <inkscape:grid
+ id="grid1"
+ units="mm"
+ originx="0"
+ originy="0"
+ spacingx="0.99999999"
+ spacingy="0.99999998"
+ empcolor="#0099e5"
+ empopacity="0.30196078"
+ color="#0099e5"
+ opacity="0.14901961"
+ empspacing="5"
+ enabled="true"
+ visible="true" />
+ </sodipodi:namedview>
<title
id="title">Wacom Intuos Pro M (PTK670)</title>
<path
id="ButtonA"
class="Button A"
d="m 80.503889,6.4003248 c -5.01,-4.63096 -12.738,-4.63227 -17.75,-0.003 l 4.373,4.3725002 c 2.59,-2.2238802 6.416,-2.2226002 9.005,0.003 z"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" />
<path
id="LeaderA"
class="Leader A"
@@ -58,7 +88,7 @@
id="ButtonB"
class="Button B"
d="m 76.828889,20.472025 4.386,4.3866 c 4.647,-5.0144 4.648,-12.762 0.001,-17.7769902 l -4.388,4.3878902 c 2.224,2.5891 2.224,6.4135 0,9.0025 z"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" />
<path
id="LeaderB"
class="Leader B"
@@ -75,7 +105,7 @@
id="ButtonC"
class="Button C"
d="m 67.104889,21.193325 -4.365,4.3647 c 5.016,4.6468 12.764,4.6454 17.778,-0.003 l -4.364,-4.3647 c -2.596,2.2505 -6.452,2.2513 -9.049,0.002 z"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" />
<path
id="LeaderC"
class="Leader C"
@@ -92,7 +122,7 @@
id="ButtonD"
class="Button D"
d="m 66.429889,11.467025 -4.372,-4.3724902 c -4.631,5.0112902 -4.631,12.7404902 0,17.7512902 l 4.372,-4.3712 c -2.226,-2.5899 -2.226,-6.4177 0,-9.0076 z"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" />
<path
id="LeaderD"
class="Leader D"
@@ -109,7 +139,7 @@
id="ButtonI"
class="Button I ModeSwitch"
d="m 71.624889,10.610025 c -2.171,0 -4.128,1.3077 -4.959,3.3134 -0.83,2.0057 -0.371,4.3143 1.164,5.8494 1.535,1.5351 3.844,1.9943 5.849,1.1635 2.006,-0.8307 3.314,-2.7879 3.314,-4.9588 0,-1.4236 -0.566,-2.7888 -1.572,-3.7954 -1.007,-1.0066 -2.372,-1.5721 -3.796,-1.5721 z"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" />
<path
id="LeaderI"
class="Leader I ModeSwitch"
@@ -123,47 +153,55 @@
y="50.979774"
style="font-size:6px;font-family:monospace;text-anchor:end;fill:none;stroke:#7f7f7f;stroke-width:0.25">I</text>
<g
- id="g7"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25"
- transform="translate(-43.414111,-7.5157166e-5)">
+ id="g2">
<path
id="Dial"
class="Dial TouchDial"
- 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 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" />
<path
id="DialCCW"
class="DialCCW Button"
- 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 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" />
<path
id="LeaderDialCCW"
class="DialCCW Dial Leader"
- d="m 151.853,6.89279 h 14.246" />
+ 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" />
<text
id="LabelDialCCW"
class="DialCCW Dial Label"
- x="171.099"
- y="7.2452002"
- style="text-anchor:start">CCW</text>
+ 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</text>
<path
id="DialCW"
class="DialCW Button"
- 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 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" />
<path
id="LeaderDialCW"
class="DialCW Dial Leader"
- d="m 151.853,25.0477 h 14.246" />
+ 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" />
<text
id="LabelDialCW"
class="DialCW Dial Label"
- x="171.099"
- y="25.45682"
- style="text-anchor:start">CW</text>
+ 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</text>
</g>
<path
id="ButtonE"
class="Button E"
d="m 227.32989,6.4460448 c -5.01,-4.63096 -12.738,-4.63227 -17.75,-0.003 l 4.373,4.3724802 c 2.59,-2.2238602 6.416,-2.2225802 9.005,0.003 z"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" />
<g
id="g10"
style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25"
@@ -178,7 +216,7 @@
id="ButtonF"
class="Button F"
d="m 223.65389,20.517725 4.387,4.3866 c 4.647,-5.0144 4.648,-12.762 0.001,-17.7769702 l -4.388,4.3878702 c 2.223,2.5891 2.223,6.4135 0,9.0025 z"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" />
<path
id="LeaderF"
class="Leader F"
@@ -189,7 +227,7 @@
id="ButtonG"
class="Button G"
d="m 213.93089,21.239025 -4.365,4.3647 c 5.016,4.6468 12.764,4.6454 17.778,-0.003 l -4.364,-4.3647 c -2.597,2.2505 -6.452,2.2513 -9.049,0.002 z"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" />
<path
id="LeaderG"
class="Leader G"
@@ -200,7 +238,7 @@
id="ButtonH"
class="Button H"
d="m 213.25589,11.512725 -4.373,-4.3724702 c -4.63,5.0112702 -4.63,12.7404702 0.001,17.7512702 l 4.372,-4.3712 c -2.227,-2.5899 -2.227,-6.4177 0,-9.0076 z"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" />
<path
id="LeaderH"
class="Leader H"
@@ -211,7 +249,7 @@
id="ButtonJ"
class="Button J ModeSwitch"
d="m 218.45089,10.655725 c -2.171,0 -4.128,1.3077 -4.959,3.3134 -0.831,2.0057 -0.371,4.3143 1.164,5.8494 1.535,1.5351 3.844,1.9943 5.849,1.1635 2.006,-0.8307 3.314,-2.7879 3.314,-4.9588 0,-1.4236 -0.566,-2.7888 -1.572,-3.7954 -1.007,-1.0066 -2.372,-1.5721 -3.796,-1.5721 z"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ style="font-size:6px;font-family:monospace;stroke:#7f7f7f;stroke-width:0.25" />
<path
id="LeaderJ"
class="Leader J ModeSwitch"
@@ -249,40 +287,54 @@
y="50.89481"
style="font-size:6px;font-family:monospace;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">J</text>
<g
- id="g17"
- style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25"
- transform="translate(-43.414111,-7.5157166e-5)">
+ id="g1">
<path
id="Dial2"
class="Dial2 TouchDial"
- 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 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" />
<path
id="Dial2CCW"
class="Dial2CCW Dial2 Button"
- 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" />
+ 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" />
<path
id="LeaderDial2CCW"
class="Dial2CCW Dial2 Leader"
- d="M 225.28,6.93851 H 211.034" />
+ 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" />
<text
id="LabelDial2CCW"
class="Dial2CCW Dial2 Label"
- x="206.034"
- y="7.2452002"
- style="text-anchor:end">CCW</text>
+ 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</text>
<path
id="Dial2CW"
class="Dial2CW Button"
- 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" />
+ 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" />
<path
id="LeaderDial2CW"
class="Dial2CW Dial2 Leader"
- d="M 225.28,25.0934 H 211.034" />
+ 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" />
<text
id="LabelDial2CW"
class="Dial2CW Dial2 Label"
- x="206.034"
- y="25.457001"
- style="text-anchor:end">CW</text>
+ 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</text>
</g>
+ <metadata
+ id="metadata1">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:title>Wacom Intuos Pro M (PTK670)</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
</svg>
--
2.51.0

287
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
View File

@ -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 <peter.hutterer@who-t.net>
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 <peter.hutterer@who-t.net>
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 @@
<g
id="g7">
<path
- id="Dial"
- class="Dial TouchDial"
+ id="Ring"
+ class="Ring TouchRing"
d="M 146.854 3.00752 C 141.607 3.00752 136.878 6.16756 134.87 11.0141 C 132.863 15.8607 133.972 21.4393 137.682 25.1487 C 141.391 28.8581 146.97 29.9677 151.817 27.9602 C 156.664 25.9527 159.824 21.2234 159.824 15.9775 C 159.824 8.81439 154.017 3.00752 146.854 3.00752 Z" />
<path
- id="DialCCW"
- class="DialCCW Button"
+ id="RingCCW"
+ class="RingCCW Button"
d="M 143.885 5.88344 L 146.132 4.78296 L 146.132 5.51662 C 147.475 5.43235 148.804 5.82284 149.877 6.61708 C 148.73 6.00801 147.38 5.87584 146.132 6.25026 L 146.132 6.9839 Z" />
<path
- id="LeaderDialCCW"
- class="DialCCW Dial Leader"
+ id="LeaderRingCCW"
+ class="RingCCW Ring Leader"
d="M 151.853 6.89279 L 166.099 6.89279" />
<text
- id="LabelDialCCW"
- class="DialCCW Dial Label"
+ id="LabelRingCCW"
+ class="RingCCW Ring Label"
x="171.099"
y="7.2452002"
style="text-anchor:start;">CCW</text>
<path
- id="DialCW"
- class="DialCW Button"
+ id="RingCW"
+ class="RingCW Button"
d="M 143.883 26.4255 L 146.13 25.3251 L 146.13 26.0587 C 147.428 26.2501 148.753 25.9905 149.875 25.3251 C 148.902 26.3215 147.537 26.8566 146.13 26.7923 L 146.13 27.526 Z" />
<path
- id="LeaderDialCW"
- class="DialCW Dial Leader"
+ id="LeaderRingCW"
+ class="RingCW Ring Leader"
d="M 151.853 25.0477 L 166.099 25.0477" />
<text
- id="LabelDialCW"
- class="DialCW Dial Label"
+ id="LabelRingCW"
+ class="RingCW Ring Label"
x="171.099"
y="25.45682"
style="text-anchor:start;">CW</text>
@@ -273,34 +273,34 @@
<g
id="g17">
<path
- id="Dial2"
- class="Dial2 TouchDial"
+ id="Ring2"
+ class="Ring2 TouchRing"
d="M 230.279 3.05324 C 225.033 3.05324 220.304 6.21328 218.296 11.0598 C 216.289 15.9064 217.398 21.485 221.108 25.1944 C 224.817 28.9038 230.396 30.0134 235.242 28.0059 C 240.089 25.9984 243.249 21.2691 243.249 16.0232 C 243.249 8.86011 237.442 3.05324 230.279 3.05324 Z" />
<path
- id="Dial2CCW"
- class="Dial2CCW Dial2 Button"
+ id="Ring2CCW"
+ class="Ring2CCW Ring2 Button"
d="M 227.31 5.92916 L 229.557 4.82868 L 229.557 5.56234 C 230.9 5.47807 232.229 5.86856 233.302 6.6628 C 232.155 6.05373 230.805 5.92156 229.557 6.29598 L 229.557 7.02962 Z" />
<path
- id="LeaderDial2CCW"
- class="Dial2CCW Dial2 Leader"
+ id="LeaderRing2CCW"
+ class="Ring2CCW Ring2 Leader"
d="M 225.28 6.93851 L 211.034 6.93851" />
<text
- id="LabelDial2CCW"
- class="Dial2CCW Dial2 Label"
+ id="LabelRing2CCW"
+ class="Ring2CCW Ring2 Label"
x="206.034"
y="7.2452002"
style="text-anchor:end;">CCW</text>
<path
- id="Dial2CW"
- class="Dial2CW Button"
+ id="Ring2CW"
+ class="Ring2CW Button"
d="M 227.308 26.4712 L 229.555 25.3708 L 229.555 26.1044 C 230.853 26.2958 232.178 26.0362 233.3 25.3708 C 232.327 26.3672 230.962 26.9023 229.555 26.838 L 229.555 27.5717 Z" />
<path
- id="LeaderDial2CW"
- class="Dial2CW Dial2 Leader"
+ id="LeaderRing2CW"
+ class="Ring2CW Ring2 Leader"
d="M 225.28 25.0934 L 211.034 25.0934" />
<text
- id="LabelDial2CW"
- class="Dial2CW Dial2 Label"
+ id="LabelRing2CW"
+ class="Ring2CW Ring2 Label"
x="206.034"
y="25.457001"
style="text-anchor:end;">CW</text>
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">
<path
- id="Dial"
- class="Dial TouchDial"
@ -148,14 +46,15 @@ index ac1e4804d475..5fa321b71b16 100644
- class="DialCCW Dial Leader"
+ id="LeaderRingCCW"
+ class="RingCCW Ring Leader"
d="m 151.853,6.89279 h 14.246" />
d="m 151.99999,6.9999998 h 14"
sodipodi:nodetypes="cc" />
<text
- id="LabelDialCCW"
- class="DialCCW Dial Label"
+ id="LabelRingCCW"
+ class="RingCCW Ring Label"
x="171.099"
y="7.2452002"
x="170.71777"
y="7.578125"
style="text-anchor:start">CCW</text>
<path
- id="DialCW"
@ -168,18 +67,19 @@ index ac1e4804d475..5fa321b71b16 100644
- class="DialCW Dial Leader"
+ id="LeaderRingCW"
+ class="RingCW Ring Leader"
d="m 151.853,25.0477 h 14.246" />
d="m 151.99999,24.999999 h 10 V 16 h 4"
sodipodi:nodetypes="cccc" />
<text
- id="LabelDialCW"
- class="DialCW Dial Label"
+ id="LabelRingCW"
+ class="RingCW Ring Label"
x="171.099"
y="25.45682"
x="170.71777"
y="16.578125"
style="text-anchor:start">CW</text>
@@ -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 @@
<g
id="g20">
<path
- id="Dial2"
- class="Dial2 TouchDial"
@ -192,19 +92,13 @@ index ac1e4804d475..5fa321b71b16 100644
+ id="Ring2CCW"
+ class="Ring2CCW Ring2 Button"
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" />
<path
- id="LeaderDial2CCW"
- class="Dial2CCW Dial2 Leader"
+ id="LeaderRing2CCW"
+ class="Ring2CCW Ring2 Leader"
d="M 225.28,6.93851 H 211.034" />
<text
- id="LabelDial2CCW"
- class="Dial2CCW Dial2 Label"
+ id="LabelRing2CCW"
+ class="Ring2CCW Ring2 Label"
x="206.034"
y="7.2452002"
x="205.55469"
y="25.578125"
style="text-anchor:end">CCW</text>
<path
- id="Dial2CW"
@ -212,20 +106,149 @@ index ac1e4804d475..5fa321b71b16 100644
+ id="Ring2CW"
+ class="Ring2CW Button"
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" />
<path
- id="LeaderDial2CW"
- class="Dial2CW Dial2 Leader"
+ id="LeaderRing2CW"
+ class="Ring2CW Ring2 Leader"
d="M 225.28,25.0934 H 211.034" />
<text
- id="LabelDial2CW"
- class="Dial2CW Dial2 Label"
+ id="LabelRing2CW"
+ class="Ring2CW Ring2 Label"
x="206.034"
y="25.457001"
x="201.94238"
y="34.578125"
style="text-anchor:end">CW</text>
<path
- id="LeaderDial2CCW"
- class="Dial2CCW Dial2 Leader"
+ id="LeaderRing2CCW"
+ class="Ring2CCW Ring2 Leader"
d="m 224.99999,6.9999998 h -12 l 0,17.9999992 h -2"
style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25"
sodipodi:nodetypes="cccc" />
<path
- id="LeaderDial2CW"
- class="Dial2CW Dial2 Leader"
+ id="LeaderRing2CW"
+ class="Ring2CW Ring2 Leader"
d="m 224.99999,25.093398 -8,-0.03262 v 8.939222 h -6"
style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25"
sodipodi:nodetypes="cccc" />
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 @@
<g
id="g2">
<path
- id="Dial"
- class="Dial TouchDial"
+ id="Ring"
+ class="Ring TouchRing"
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" />
<path
- id="DialCCW"
- class="DialCCW Button"
+ id="RingCCW"
+ class="RingCCW Button"
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" />
<path
- id="LeaderDialCCW"
- class="DialCCW Dial Leader"
+ id="LeaderRingCCW"
+ class="RingCCW Ring Leader"
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" />
<text
- id="LabelDialCCW"
- class="DialCCW Dial Label"
+ id="LabelRingCCW"
+ class="RingCCW Ring Label"
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</text>
<path
- id="DialCW"
- class="DialCW Button"
+ id="RingCW"
+ class="RingCW Button"
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" />
<path
- id="LeaderDialCW"
- class="DialCW Dial Leader"
+ id="LeaderRingCW"
+ class="RingCW Ring Leader"
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" />
<text
- id="LabelDialCW"
- class="DialCW Dial Label"
+ id="LabelRingCW"
+ class="RingCW Ring Label"
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</text>
@@ -289,41 +289,41 @@
<g
id="g1">
<path
- id="Dial2"
- class="Dial2 TouchDial"
+ id="Ring2"
+ class="Ring2 TouchRing"
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" />
<path
- id="Dial2CCW"
- class="Dial2CCW Dial2 Button"
+ id="Ring2CCW"
+ class="Ring2CCW Ring2 Button"
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" />
<path
- id="LeaderDial2CCW"
- class="Dial2CCW Dial2 Leader"
+ id="LeaderRing2CCW"
+ class="Ring2CCW Ring2 Leader"
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" />
<text
- id="LabelDial2CCW"
- class="Dial2CCW Dial2 Label"
+ id="LabelRing2CCW"
+ class="Ring2CCW Ring2 Label"
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</text>
<path
- id="Dial2CW"
- class="Dial2CW Button"
+ id="Ring2CW"
+ class="Ring2CW Button"
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" />
<path
- id="LeaderDial2CW"
- class="Dial2CW Dial2 Leader"
+ id="LeaderRing2CW"
+ class="Ring2CW Ring2 Leader"
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" />
<text
- id="LabelDial2CW"
- class="Dial2CW Dial2 Label"
+ id="LabelRing2CW"
+ class="Ring2CW Ring2 Label"
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</text>
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

8
libwacom.spec
View File

@ -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 <peter.hutterer@redhat.com> - 2.14.0-4
- Rearrange the dial leaders for the Intuos Pro 3rd Gen (RHEL-122812)
* Wed Aug 20 2025 Peter Hutterer <peter.hutterer@redhat.com> - 2.14.0-3
- Rearrange the button leaders for the Intuos Pro 3rd Gen (RHEL-101873)