Re: [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt.

[mhmdanas <mhmdanas@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1426 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages libwacom-2.5.0
https://github.com/void-linux/void-packages/pull/41569

libwacom: update to 2.5.0, adopt. 
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly** (tested with my Wacom Intuos Pro)

I checked locally and the `kcm-wacomtablet` test failures are present without this PR's changes, so it's an unrelated issue.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41569.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libwacom-2.5.0-41569.patch --]
[-- Type: text/x-diff, Size: 8430 bytes --]

From 90182bec4630aaeb96ccfb6db561d6b6f85b166c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:36:25 +0000
Subject: [PATCH 1/9] libwacom: update to 2.6.0, adopt.

---
 common/shlibs             | 2 +-
 srcpkgs/libwacom/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..c5af81bb633a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1043,7 +1043,7 @@ libgck-2.so.0.0.0 gcr4-4.0.0_1
 libgcr-4.so.0.0.0 gcr4-4.0.0_1
 libcld2.so cld2-0.0.1.20150821_1
 libcld2_full.so cld2-full-0.0.1.20150821_1
-libwacom.so.2 libwacom-0.3_1
+libwacom.so.9 libwacom-2.6.0_1
 libfarstream-0.2.so.5 farstream-0.2.7_1
 libass.so.9 libass-0.13.6_1
 libcryptui.so.0 libcryptui-3.4.0_1
diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index 248a33d407ac..8216a58a086d 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -1,6 +1,6 @@
 # Template file for 'libwacom'
 pkgname=libwacom
-version=1.12
+version=2.6.0
 revision=1
 build_style=meson
 build_helper="qemu"
@@ -9,12 +9,12 @@ hostmakedepends="pkg-config"
 makedepends="libgudev-devel libxml2-devel"
 checkdepends="python3-pytest python3-libevdev python3-pyudev"
 short_desc="Library to identify wacom tablets"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="MIT"
 homepage="https://github.com/linuxwacom/libwacom"
 changelog="https://raw.githubusercontent.com/linuxwacom/libwacom/master/NEWS"
-distfiles="https://github.com/linuxwacom/libwacom/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.bz2"
-checksum=290450d604f78bbd956eddb69f79f8d56f8ed1a5ccbb5e88e22fa84fa2fceb4f
+distfiles="https://github.com/linuxwacom/libwacom/releases/download/libwacom-${version}/libwacom-${version}.tar.xz"
+checksum=2376cca99475235b75053a2cfbc7ed40fd8763d5a516941a664870ff1f3aa98f
 
 if [ -z "${XBPS_CHECK_PKGS}" ]; then
 	configure_args+=" -Dtests=disabled"

From 81aa61e6704bca7b10dbee5a1e5512e49f53f00a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 2/9] budgie-control-center: revbump for libwacom-2.6.0.

---
 srcpkgs/budgie-control-center/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index 11c9080925f0..37736255e165 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-control-center'
 pkgname=budgie-control-center
 version=1.1.1
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
  polkit python3 libxml2"

From fbd57d2c45de04ae3b3dce23d3fdda708d766caa Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 3/9] cinnamon-control-center: revbump for libwacom-2.6.0.

---
 srcpkgs/cinnamon-control-center/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index e1428a97c61e..db1e4ea6d7ba 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
 version=5.4.7
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 hostmakedepends="gettext-devel glib-devel

From c7932b0989735dc5995d73a4292434893522655b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 4/9] gnome-control-center: revbump for libwacom-2.6.0.

---
 srcpkgs/gnome-control-center/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index af6728cd45a1..849763d23c1e 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
 version=43.2
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config

From e0d1629354787ca4be23909d43a55ee575d4ef3e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 5/9] gnome-settings-daemon: revbump for libwacom-2.6.0.

---
 srcpkgs/gnome-settings-daemon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index f22bdbdb61f4..3d3cf393f960 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
 version=43.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt

From fdb6c8ef3dd09b475271d664093e5a93719c6ce5 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 6/9] libinput: revbump for libwacom-2.6.0.

---
 srcpkgs/libinput/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index d429098fa2fc..d5b88caeee0b 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,7 +1,7 @@
 # Template file for 'libinput'
 pkgname=libinput
 version=1.22.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Db_ndebug=false -Ddebug-gui=false"
 hostmakedepends="pkg-config"

From 514849f7300b9b38b7e108eeb2fdeebcf564cd55 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 7/9] muffin: revbump for libwacom-2.6.0.

---
 srcpkgs/muffin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 9383775a47f4..6c30d4452451 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,7 +1,7 @@
 # Template file for 'muffin'
 pkgname=muffin
 version=5.4.5
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 # -Dtests requires -Dwayland, which is explicitly disabled

From 1906e3ace54f66933df643bbc472ebc0d4623c8d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:49 +0000
Subject: [PATCH 8/9] mutter: revbump for libwacom-2.6.0.

---
 srcpkgs/mutter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 4adf8a458957..c84c35f12b26 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
 # Template file for 'mutter'
 pkgname=mutter
 version=43.2
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true

From 539059550741321460af86b57cb1ef8045958c3b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 3 Feb 2023 20:46:43 +0000
Subject: [PATCH 9/9] kcm-wacomtablet: revbump for libwacom-2.6.0.

---
 srcpkgs/kcm-wacomtablet/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcm-wacomtablet/template b/srcpkgs/kcm-wacomtablet/template
index eedf2684333f..9cd2e3f85cb5 100644
--- a/srcpkgs/kcm-wacomtablet/template
+++ b/srcpkgs/kcm-wacomtablet/template
@@ -1,10 +1,11 @@
 # Template file for 'kcm-wacomtablet'
 pkgname=kcm-wacomtablet
 version=3.2.0
-revision=2
+revision=3
 build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config gettext extra-cmake-modules qt5-qmake qt5-host-tools
- kdoctools kcoreaddons"
+ kdoctools kcoreaddons kpackage"
 makedepends="qt5-devel qt5-x11extras-devel qt5-declarative-devel
  plasma-workspace-devel libwacom-devel xf86-input-wacom-devel"
 depends="xf86-input-wacom"
@@ -14,3 +15,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/system/wacomtablet"
 distfiles="${KDE_SITE}/wacomtablet/${version}/wacomtablet-${version}.tar.xz"
 checksum=c80ce63a41f6fcbb50ac4c2130ed2f8273c4b744e62e33d4b714bf83e8e5f7a4
+make_check=no # FIXME