From 880192f06fa04c0b394e3b21d2aa235c5ec68df9 Mon Sep 17 00:00:00 2001 From: mhmdanas 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 " +maintainer="Mohammed Anas " 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 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 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 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 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 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 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 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 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