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: 10880 bytes --]

From 64cbabfcce90a3262dcf97bd7a483b3bf7e51f0d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:36:25 +0000
Subject: [PATCH 01/10] libwacom: update to 2.5.0, adopt.

---
 common/shlibs                          |  2 +-
 srcpkgs/libwacom/patches/fix-test.diff | 23 +++++++++++++++++++++++
 srcpkgs/libwacom/template              |  8 ++++----
 3 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libwacom/patches/fix-test.diff

diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..8b258a9232cb 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.5.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/patches/fix-test.diff b/srcpkgs/libwacom/patches/fix-test.diff
new file mode 100644
index 000000000000..554a6e3bad7f
--- /dev/null
+++ b/srcpkgs/libwacom/patches/fix-test.diff
@@ -0,0 +1,23 @@
+The fixture depends on systemd.
+
+See https://github.com/linuxwacom/libwacom/pull/543 for upstream PR.
+
+diff --git a/test/test_udev_rules.py b/test/test_udev_rules.py
+index 0e8e99c..e31e562 100644
+--- a/test/test_udev_rules.py
++++ b/test/test_udev_rules.py
+@@ -19,14 +19,6 @@ import logging
+ import sys
+ 
+ 
+-@pytest.fixture(scope='session', autouse=True)
+-def systemd_reload():
+-    '''Make sure our hwdb and udev rules are up-to-date'''
+-    import subprocess
+-    subprocess.run(['systemd-hwdb', 'update'])
+-    subprocess.run(['systemctl', 'daemon-reload'])
+-
+-
+ def pytest_generate_tests(metafunc):
+     # for any function that takes a "tablet" argument return a Tablet object
+     # filled with exactly one DeviceMatch from the list of all .tablet files
diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index 248a33d407ac..64a53e956576 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -1,6 +1,6 @@
 # Template file for 'libwacom'
 pkgname=libwacom
-version=1.12
+version=2.5.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=40b69a4c38bbcbc80b1231bc115551107ebbc0ba14d2ad1c3e54355dcd876816
 
 if [ -z "${XBPS_CHECK_PKGS}" ]; then
 	configure_args+=" -Dtests=disabled"

From d9739dde0d3f38a06234e23feb534cee0b3391f1 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 02/10] budgie-control-center: revbump for libwacom-2.5.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 050f2cfe00897c64f194de0736d04bb63d4b313d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 03/10] cinnamon-control-center: revbump for libwacom-2.5.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 7a193dbf4b015c46afa1734abc7a0f9cb69c2f4e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 04/10] gnome-control-center: revbump for libwacom-2.5.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 54eaff5bc5e4e8280de81092023644ea2057ab5e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 05/10] gnome-settings-daemon: revbump for libwacom-2.5.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 9bfec69472c3f18942219e31f9d2d32b4b5f38eb Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 06/10] libinput: revbump for libwacom-2.5.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 35258ea3c090399e4a48d8bc54147a6685f7f296 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 07/10] muffin: revbump for libwacom-2.5.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 5319adbe50d15037380c88ffa6de842682486f7d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:49 +0000
Subject: [PATCH 08/10] mutter: revbump for libwacom-2.5.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 cded10882297c58ac8dabff5b38d5e21e8a61c5d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 3 Feb 2023 20:43:49 +0000
Subject: [PATCH 09/10] kpackage: remove path substitution in CMake files.

This substitution cause a cross-compilation failure with
kcm-wacomtablet.
---
 srcpkgs/kpackage/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index bd915c4c3fd6..59d4f0283969 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,7 +1,7 @@
 # Template file for 'kpackage'
 pkgname=kpackage
 version=5.101.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3 kdoctools"
@@ -10,14 +10,9 @@ short_desc="KDE Installation and loading of additional content as packages"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
-distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${KDE_SITE}/frameworks/${version%.*}/kpackage-${version}.tar.xz"
 checksum=6cdb5e6aeb8f45dcd0cef4863edb698cee0fdd216171c00aa5acf5c75cdc1f1d
 
-post_install() {
-	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \
-		-i ${DESTDIR}/usr/lib/cmake/KF5Package/KF5PackageToolsTargets-*.cmake
-}
-
 kpackage-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

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

---
 srcpkgs/kcm-wacomtablet/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kcm-wacomtablet/template b/srcpkgs/kcm-wacomtablet/template
index eedf2684333f..ef3bde0a0785 100644
--- a/srcpkgs/kcm-wacomtablet/template
+++ b/srcpkgs/kcm-wacomtablet/template
@@ -1,7 +1,7 @@
 # Template file for 'kcm-wacomtablet'
 pkgname=kcm-wacomtablet
 version=3.2.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config gettext extra-cmake-modules qt5-qmake qt5-host-tools
  kdoctools kcoreaddons"
@@ -14,3 +14,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