Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libwacom 2.5.0
@ 2023-01-11  1:02 mhmdanas
  2023-01-11 13:40 ` [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt mhmdanas
                   ` (21 more replies)
  0 siblings, 22 replies; 23+ messages in thread
From: mhmdanas @ 2023-01-11  1:02 UTC (permalink / raw)
  To: ml

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

There is a new 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 2.5.0
<!-- 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)

<!--
#### 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: 8326 bytes --]

From e132068a1e2e152aa23e3e0ed534eb284cc60811 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:36:25 +0000
Subject: [PATCH 1/8] 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 d80771f9f719..63d6027b871e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1041,7 +1041,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 e95a6d57a8d34c05c733b42e117ef4e52d65875a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 2/8] 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 8c795deacd3670c31b2e1f4e4bfe1389632ce69f Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 3/8] 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 1b1cadebf0ce9df17e8811c8d52555217ef266e6 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 4/8] 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 3d67a432b5e682692a2205cfb3e78b69cda16205 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 5/8] 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 490766e18a462706ab554aaa0af3570c466821b2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 6/8] 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 78ca19d5fb27c5d9d53d578667e98cf759104770 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 7/8] 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 4cdee72e70da92e5c25f507085cb7bcd1f98d496 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:49 +0000
Subject: [PATCH 8/8] 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

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
@ 2023-01-11 13:40 ` mhmdanas
  2023-01-12 18:49 ` [PR REVIEW] " mhmdanas
                   ` (20 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-01-11 13:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1275 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)

<!--
#### 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: 9079 bytes --]

From b837f993ef2edbf3a12004cfbdc3b255a3f1c53f 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.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 7a0b6a98a6d2..afc704cf82cb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1042,7 +1042,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 6a0a6a2528955e3da949e5d1c40803968a974e18 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.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 aeb6256fbfba956d06fe3e9a2e267d485a47eb29 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.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 1c6dfb061473d7041b6df286e77217adb0fc8da0 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.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 ed4c5e03a816b1751f4178eea1941c48e40ecff6 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.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 fb1f769bb673e7c04bbf515a6d8755fe7226ba2c 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.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 e4cfc4251230d47b0f538869f2cb4f18acd99007 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.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 c1f7a5b23c63aac10c21dd4eb0f44fe1a0c0ff30 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.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 4a4cd9cadb1d5c0817e1d45416b94dc37ee47c4d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 13:39:30 +0000
Subject: [PATCH 9/9] kcm-wacomtablet: revbump for libwacom-2.5.0.

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

diff --git a/srcpkgs/kcm-wacomtablet/template b/srcpkgs/kcm-wacomtablet/template
index eedf2684333f..758d0bab7dc7 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"

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
  2023-01-11 13:40 ` [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt mhmdanas
@ 2023-01-12 18:49 ` mhmdanas
  2023-01-15 11:50 ` paper42
                   ` (19 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-01-12 18:49 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#discussion_r1068495790

Comment:
See https://github.com/linuxwacom/libwacom/pull/543 for upstream PR.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
  2023-01-11 13:40 ` [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt mhmdanas
  2023-01-12 18:49 ` [PR REVIEW] " mhmdanas
@ 2023-01-15 11:50 ` paper42
  2023-01-18 19:31 ` [PR PATCH] [Updated] " mhmdanas
                   ` (18 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: paper42 @ 2023-01-15 11:50 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#issuecomment-1383129284

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

set `make_check=no # FIXME` in that case

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (2 preceding siblings ...)
  2023-01-15 11:50 ` paper42
@ 2023-01-18 19:31 ` mhmdanas
  2023-02-03 20:47 ` mhmdanas
                   ` (17 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-01-18 19:31 UTC (permalink / raw)
  To: ml

[-- 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: 9356 bytes --]

From 880192f06fa04c0b394e3b21d2aa235c5ec68df9 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.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 32b6337a4f92..d716d9d6387b 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 69fbcf349d0866a639bf30b82eb60c0a7e180433 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.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 5527cd7cd1fb7ea25fd66b403779a263812d0a91 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.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 631df3b0b3ff405181c34efef34ad02df845c0b5 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.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 d54b79517dc6b9dc322b23303ce0a67ae533a958 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.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 2b7c43e7cd26f1f23623e7211cec83e39f37ed0a 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.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 93346be85c2f438724af125b1c8c5e3aec85edff 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.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 3082ba7d84c3e5f678acd939dfdedb5004b0926c 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.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 a0e47b2880f90960de9cde290857125ddb4414e1 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 13:39:30 +0000
Subject: [PATCH 9/9] 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

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (3 preceding siblings ...)
  2023-01-18 19:31 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-02-03 20:47 ` mhmdanas
  2023-02-03 20:50 ` [PR REVIEW] " mhmdanas
                   ` (16 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-03 20:47 UTC (permalink / raw)
  To: ml

[-- 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: 10377 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 5fcebb68b7e9ae688ce8ad60c4d526817f19d5e4 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 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index bd915c4c3fd6..c8e5dc953473 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"
@@ -13,11 +13,6 @@ homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${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 ca8a5c41af0eadddcf894ec7c8d40cfa5900559e 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kcm-wacomtablet/template b/srcpkgs/kcm-wacomtablet/template
index eedf2684333f..758d0bab7dc7 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"

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (4 preceding siblings ...)
  2023-02-03 20:47 ` mhmdanas
@ 2023-02-03 20:50 ` mhmdanas
  2023-02-03 20:53 ` [PR PATCH] [Updated] " mhmdanas
                   ` (15 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-03 20:50 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#discussion_r1096273126

Comment:
These lines cause a cross-compile configure failure in kcm-wacomtablet, but I'm not sure why they were added (it was done in 59860865e75, but the commit message does not provide an explanation for what these lines do).

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (5 preceding siblings ...)
  2023-02-03 20:50 ` [PR REVIEW] " mhmdanas
@ 2023-02-03 20:53 ` mhmdanas
  2023-02-03 22:08 ` mhmdanas
                   ` (14 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-03 20:53 UTC (permalink / raw)
  To: ml

[-- 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: 10603 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 20b64ae51783915da25df5cbc6b9eff1f5c19d09 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kcm-wacomtablet/template b/srcpkgs/kcm-wacomtablet/template
index eedf2684333f..758d0bab7dc7 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"

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (6 preceding siblings ...)
  2023-02-03 20:53 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-02-03 22:08 ` mhmdanas
  2023-02-04 12:34 ` [PR REVIEW] " mhmdanas
                   ` (13 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-03 22:08 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (7 preceding siblings ...)
  2023-02-03 22:08 ` mhmdanas
@ 2023-02-04 12:34 ` mhmdanas
  2023-02-04 13:03 ` [PR PATCH] [Updated] " mhmdanas
                   ` (12 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-04 12:34 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#discussion_r1096531368

Comment:
@sgn since you made that commit, could you provide some context please?

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (8 preceding siblings ...)
  2023-02-04 12:34 ` [PR REVIEW] " mhmdanas
@ 2023-02-04 13:03 ` mhmdanas
  2023-02-04 13:08 ` mhmdanas
                   ` (11 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-04 13:03 UTC (permalink / raw)
  To: ml

[-- 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: 9719 bytes --]

From 22d040ec4509e1549baf86f728b1540d5358a707 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.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..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/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 067260b68197d0d0b247081cd3ff32b94c2fbcd9 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.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 f7f9a1bc0f9b51ecbcc2a8e08d939dac198a86c3 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.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 9379568588cb4c7a4f841ea38af5fd485f6e6832 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.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 5d0b109abcef729ce3ff1d8b060f91303396e599 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.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 697058fb01f52edc0c0e5e58fefd8b001d53a4d1 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.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 d0b228e8d9b83675f94152898d5e9e838446398c 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.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 8e7c2aad5594eabfe53b8198a2938f263f03cf32 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.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 cf87cdddeeef585c3c9b6a43efd43141e758d78b 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 ee7d0781b193273e9f1327620421157a72f6f024 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.6.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

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (9 preceding siblings ...)
  2023-02-04 13:03 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-02-04 13:08 ` mhmdanas
  2023-02-04 16:42 ` [PR REVIEW] " sgn
                   ` (10 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-04 13:08 UTC (permalink / raw)
  To: ml

[-- 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: 9719 bytes --]

From 8ce6dfc23a7285ffd6803d0d4b092b99d4117ac9 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.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 4f3f9c8cac62b38103e1585e7650a491cc589445 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.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 edac4cd9d21a70e96dde2092b2fb55d646fca70f 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.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 c0c4232008f48580565801318561ea367bb71c96 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.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 0cdc76bc2e5c9668988cd3ed55d432b9d48d1353 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.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 9d1c372f22aa88259851c318675651b3855f5c8a 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.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 d4296559110d81fd0b063599d490c9a8486ed32b 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.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 69c88ca437a373b9cbddabe243d7e576263e94ac 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.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 ffcf7c4e5bd42b4309661f62f4b2ac499b553d8d 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 8866946802b184b9c8e193828e95dbbe82c6b28e 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.6.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

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (10 preceding siblings ...)
  2023-02-04 13:08 ` mhmdanas
@ 2023-02-04 16:42 ` sgn
  2023-02-04 17:32 ` sgn
                   ` (9 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2023-02-04 16:42 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#discussion_r1096558310

Comment:
See the commit message ;) Did you try adding `kpackage` to `hostmakedepends`?

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (13 preceding siblings ...)
  2023-02-04 17:32 ` sgn
@ 2023-02-04 17:32 ` sgn
  2023-02-04 17:52 ` [PR PATCH] [Updated] " mhmdanas
                   ` (6 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2023-02-04 17:32 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#discussion_r1096559671

Comment:
Please drop this commit

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (11 preceding siblings ...)
  2023-02-04 16:42 ` [PR REVIEW] " sgn
@ 2023-02-04 17:32 ` sgn
  2023-02-04 17:32 ` sgn
                   ` (8 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2023-02-04 17:32 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#discussion_r1096560216

Comment:
```suggestion
 kdoctools kcoreaddons kpackage"
```

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (12 preceding siblings ...)
  2023-02-04 17:32 ` sgn
@ 2023-02-04 17:32 ` sgn
  2023-02-04 17:32 ` sgn
                   ` (7 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2023-02-04 17:32 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#discussion_r1096559636

Comment:
```suggestion
make_check=no # FIXME
makedepends+=" libinput-devel"
```

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (14 preceding siblings ...)
  2023-02-04 17:32 ` sgn
@ 2023-02-04 17:52 ` mhmdanas
  2023-02-04 17:53 ` mhmdanas
                   ` (5 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-04 17:52 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (15 preceding siblings ...)
  2023-02-04 17:52 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-02-04 17:53 ` mhmdanas
  2023-02-04 17:53 ` [PR REVIEW] " mhmdanas
                   ` (4 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-04 17:53 UTC (permalink / raw)
  To: ml

[-- 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: 8596 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 6fe01a12fb8626d1c1f8d0e1168e123bf12759a6 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 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kcm-wacomtablet/template b/srcpkgs/kcm-wacomtablet/template
index eedf2684333f..dbb0cd51818c 100644
--- a/srcpkgs/kcm-wacomtablet/template
+++ b/srcpkgs/kcm-wacomtablet/template
@@ -1,12 +1,13 @@
 # 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"
+ plasma-workspace-devel libwacom-devel xf86-input-wacom-devel libinput-devel"
 depends="xf86-input-wacom"
 short_desc="GUI for the Wacom Linux Drivers"
 maintainer="Piraty <mail@piraty.dev>"
@@ -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

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (16 preceding siblings ...)
  2023-02-04 17:53 ` mhmdanas
@ 2023-02-04 17:53 ` mhmdanas
  2023-02-04 17:54 ` mhmdanas
                   ` (3 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-04 17:53 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#discussion_r1096566754

Comment:
Done, but what is it for?

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (17 preceding siblings ...)
  2023-02-04 17:53 ` [PR REVIEW] " mhmdanas
@ 2023-02-04 17:54 ` mhmdanas
  2023-02-04 17:55 ` mhmdanas
                   ` (2 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-04 17:54 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#discussion_r1096566754

Comment:
I added `libinput-devel` to `makedepends`, but what is it for, and why are you adding it here on a separate lien?

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (18 preceding siblings ...)
  2023-02-04 17:54 ` mhmdanas
@ 2023-02-04 17:55 ` mhmdanas
  2023-02-05  1:17 ` sgn
  2023-02-05  1:19 ` [PR PATCH] [Merged]: " sgn
  21 siblings, 0 replies; 23+ messages in thread
From: mhmdanas @ 2023-02-04 17:55 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#discussion_r1096566754

Comment:
I added `libinput-devel` to `makedepends`, but what is it for, and why are you adding it here on a separate line?

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (19 preceding siblings ...)
  2023-02-04 17:55 ` mhmdanas
@ 2023-02-05  1:17 ` sgn
  2023-02-05  1:19 ` [PR PATCH] [Merged]: " sgn
  21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2023-02-05  1:17 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/41569#discussion_r1096607429

Comment:
> added `libinput-devel` to `makedepends`, but what is it for,

Try clean everything in `hostdir/binpkgs`, cross-build `kcm-wacomtablet` ;)

> and why are you adding it here on a separate line?

Because I can't suggest in the `makedepends` line.


^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Merged]: libwacom: update to 2.5.0, adopt. 
  2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
                   ` (20 preceding siblings ...)
  2023-02-05  1:17 ` sgn
@ 2023-02-05  1:19 ` sgn
  21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2023-02-05  1:19 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

libwacom: update to 2.5.0, adopt. 
https://github.com/void-linux/void-packages/pull/41569

Description:
<!-- 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
-->


^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2023-02-05  1:19 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-11  1:02 [PR PATCH] libwacom 2.5.0 mhmdanas
2023-01-11 13:40 ` [PR PATCH] [Updated] libwacom: update to 2.5.0, adopt mhmdanas
2023-01-12 18:49 ` [PR REVIEW] " mhmdanas
2023-01-15 11:50 ` paper42
2023-01-18 19:31 ` [PR PATCH] [Updated] " mhmdanas
2023-02-03 20:47 ` mhmdanas
2023-02-03 20:50 ` [PR REVIEW] " mhmdanas
2023-02-03 20:53 ` [PR PATCH] [Updated] " mhmdanas
2023-02-03 22:08 ` mhmdanas
2023-02-04 12:34 ` [PR REVIEW] " mhmdanas
2023-02-04 13:03 ` [PR PATCH] [Updated] " mhmdanas
2023-02-04 13:08 ` mhmdanas
2023-02-04 16:42 ` [PR REVIEW] " sgn
2023-02-04 17:32 ` sgn
2023-02-04 17:32 ` sgn
2023-02-04 17:32 ` sgn
2023-02-04 17:52 ` [PR PATCH] [Updated] " mhmdanas
2023-02-04 17:53 ` mhmdanas
2023-02-04 17:53 ` [PR REVIEW] " mhmdanas
2023-02-04 17:54 ` mhmdanas
2023-02-04 17:55 ` mhmdanas
2023-02-05  1:17 ` sgn
2023-02-05  1:19 ` [PR PATCH] [Merged]: " sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).