Merge pull request 'Add wacomtablet xlibre patch' (#404) from wacomtablet into master

Reviewed-on: #404

.gitea/workflows/require-approvals.yml

@@ -0,0 +1,26 @@
+name: Required Approvals
+
+on:
+  pull_request:
+    branches: [ master ]
+  pull_request_review:
+    branches: [ master ]
+
+permissions:
+  checks: write
+  pull-requests: read
+
+jobs:
+  required-approvals:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check required approvals
+        uses: https://gitea.artixlinux.org/corysanin/configurable-required-approvals@v1
+        with:
+          requirements: |
+            - patterns:
+                - "patches/_common/*"
+                - ".gitea/**/*"
+              requiredApprovals: 1
+          github-token: ${{ secrets.ACCESS_TOKEN }}

patches/_common/rm-service.sh

@@ -9,6 +9,6 @@ if [ "$#" -eq 0 ]; then
 else
     for arg in "$@"
     do
-        sed -i '/\.service/d;\|/lib/systemd|d;/systemd-service/d' "${arg}/PKGBUILD"
+        sed -i '/\.service/d' "${arg}/PKGBUILD"
     done
 fi

patches/alsa-utils/systemd-to-udev.sh

@@ -0,0 +1 @@
+../_common/systemd-to-udev.sh

patches/alsa-utils/unitdir.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for i in $@; do
+    sed -e '/unitdir/ s|/usr/lib/systemd/system|no|' \
+        -e '/udevsystem/ s|udev|systemd|' \
+        -i ${i}/PKGBUILD
+done

patches/dbus-broker/04-rm-units.sh

@@ -8,5 +8,7 @@ else
     do
         sed -i "/dbus-broker-units/d" "${arg}/PKGBUILD"
         sed -i "/dbus-units/d" "${arg}/PKGBUILD"
+        sed -i "/dbus-broker.install/d" "${arg}/PKGBUILD"
+        rm "${arg}/dbus-broker.install"
     done
 fi

patches/dotnet-core-8.0

@@ -0,0 +1 @@
+dotnet-core/

patches/firewalld/01-add-make-configure-options.diff

@@ -1,11 +1,10 @@
-diff '--color=auto' -a -u -N a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2024-07-25 16:00:54.557698160 +0000
-+++ b/PKGBUILD	2024-07-25 16:01:41.452818494 +0000
-@@ -40,6 +40,7 @@
- 	  --sbindir=/usr/bin \
- 	  --sysconfdir=/etc \
- 	  --disable-schemas-compile \
-+	  --disable-systemd \
- 	  --disable-sysconfig
+--- a/PKGBUILD	2025-06-11 22:57:30.370234551 +0000
++++ b/PKGBUILD	2025-06-11 22:58:04.499371128 +0000
+@@ -37,6 +37,7 @@
+ 		--sbindir=/usr/bin \
+ 		--sysconfdir=/etc \
+ 		--disable-schemas-compile \
++		--disable-systemd \
+ 		--disable-sysconfig
  	make
  }

patches/glycin/let-tests-fail.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -i 's/--print-errorlogs --no-rebuild/--print-errorlogs --no-rebuild ||:/' "${arg}/PKGBUILD"
+    done
+fi

patches/hyprland/02-disable-uwsm.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -i "s|make release.*|cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DNO_SYSTEMD=True|" "${arg}/PKGBUILD"
+        sed -i '/uwsm/d' "${arg}/PKGBUILD"
+        sed -i '66s/$/)/' "${arg}/PKGBUILD"
+    done
+fi

patches/ipset/02-fix-sources.sh

@@ -6,6 +6,6 @@ if [ "$#" -eq 0 ]; then
 else
     for arg in "$@"
     do
-        sed -i 's/tag=v${pkgver}"/tag=v${pkgver}")/' "${arg}/PKGBUILD"
+	    sed -i '/source/s|signed"|signed")|' "${arg}/PKGBUILD"
     done
 fi

patches/kwin-x11

@@ -0,0 +1 @@
+./kwin

patches/lib32-colord/add-configure-options.pl

@@ -0,0 +1 @@
+../_common/add-configure-options.pl

patches/lib32-colord/systemd-to-elogind.sh

@@ -0,0 +1 @@
+../_common/systemd-to-elogind.sh

patches/lib32-fontconfig/01-signed.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for i in $@; do
+	sed -e 's|?signed||' \
+	    -i $i/PKGBUILD
+done

patches/lib32-libnm/0001-systemd.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+for i in $@; do
+sed -e '/session_tracking/a\
+    -D session_tracking=no\
+    -D systemd_journal=false\
+    -D systemdsystemunitdir=no' \
+    -e '/systemd/d'\
+    -i $i/PKGBUILD
+done
+	       

patches/lib32-p11-kit/01-rm-systemd-deps.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# rm-systemd-deps.sh
+# Remove any 'systemd' or 'systemd-libs' within a dependencies or similar array. Does
+# not remove newlines but tries to remove surrounding quotes and spaces.
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    deps=(systemd-libs systemd-tools python-systemd lib32-systemd libsystemd.so libsystemd systemd)
+
+    for arg in "$@"
+    do
+        for i in "${deps[@]}"
+        do
+            sed -i -E "s/ \"$i\"|\"$i\" //g" "${arg}/PKGBUILD"
+            sed -i -E "s/ '$i'|'$i' //g" "${arg}/PKGBUILD"
+            sed -i -E "s/ $i|$i //g" "${arg}/PKGBUILD"
+        done
+    done
+fi

patches/libfido2/01-systemd-libs-to-libudev.sh

@@ -0,0 +1 @@
+../_common/systemd-libs-to-libudev.sh

patches/libfido2/02-systemd-to-udev.sh

@@ -0,0 +1 @@
+../_common/systemd-to-udev.sh

patches/libinput/0001-libinput.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+for i in $@; do
+  sed -e 's|systemd-libs|udev|' \
+      -i $i/PKGBUILD
+done

patches/libqb/d-systemd.sh

@@ -0,0 +1 @@
+../_common/d-systemd.sh

patches/libvirt/d-systemd.sh

@@ -0,0 +1 @@
+../_common/d-systemd.sh

patches/lighttpd/rm-socket.sh

@@ -0,0 +1 @@
+../_common/rm-socket.sh

patches/llvm-julia/01-git-dir.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [ "$#" -eq 0 ]; then
-    echo "Usage: $0 <package repo>"
-    exit 1
-else
-    for arg in "$@"
-    do
-        sed -e 's|git+https://github.com/JuliaLang/llvm-project|llvm-project-j::git+https://github.com/JuliaLang/llvm-project|' \
-            -e 's|llvm-project/llvm|llvm-project-j/llvm|' -i "${arg}/PKGBUILD"
-    done
-fi

patches/lm_sensors/0001-sensors-detect.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+for i in $@; do
+  sed -e 's|prog/{detect/sensors-detect,init/{sensord,lm_sensors}.service}|prog/detect/sensors-detect|' \
+      -i $i/PKGBUILD
+done

patches/lm_sensors/0002-rm-service.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+for i in $@; do
+  sed -e 's|healthd.service||' \
+      -e '/service/d' \
+      -e '0,/${srcdir}\/sensord.conf/{//d;}' \
+      -i $i/PKGBUILD
+done

patches/ly/02-build-installexe.sh

@@ -6,6 +6,6 @@ if [ "$#" -eq 0 ]; then
 else
     for arg in "$@"
     do
-        sed -i 's/installsystemd/installnoconf/' "${arg}/PKGBUILD"
+        sed -i 's/installsystemd/installexe/' "${arg}/PKGBUILD"
     done
 fi

patches/mako/0001-dbus-provider.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+for i in $@; do
+  sed -e '/bus-provider/s|libsystemd|libelogind|' \
+    -e '/makedepends/s|systemd|elogind|' \
+    -i $i/PKGBUILD
+done

patches/mako/rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/mako/systemd-libs-to-libelogind.sh

@@ -0,0 +1 @@
+../_common/systemd-libs-to-libelogind.sh

patches/mariadb/01-systemd.sh

@@ -13,6 +13,7 @@ else
             -i "${arg}/PKGBUILD"
         sed -e "s|'systemd' ||" \
             -e "s|'systemd-libs' ||" \
+            -e "s|'libsystemd.so'||" \
             -i "${arg}/PKGBUILD"
         sed -i '/mariadb@bootstrap\.service\.d/d' "${arg}/PKGBUILD"
         sed -i '/rm -r usr\/share\/mysql\/systemd\//d' "${arg}/PKGBUILD"

patches/modemmanager/systemd-libs-to-libelogind.sh

@@ -0,0 +1 @@
+../_common/systemd-libs-to-libelogind.sh

patches/modemmanager/systemd-to-elogind.sh

@@ -0,0 +1 @@
+../_common/systemd-to-elogind.sh

patches/modemmanager/z-config-flags.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+for i in $@; do
+  sed -e '/gtk_doc/a\    -D systemd_journal=false' \
+    -e '/gtk_doc/a\    -D systemdsystemunitdir=no' \
+    -i ${i}/PKGBUILD
+done

patches/nftables/01-rm-nftables-service.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# rm-nftables-service.sh
+# replace nftables.service with empty string in PKGBUILD files
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -e "s/'nftables.service'//" \
+            -i "${arg}/PKGBUILD"
+    done
+fi

patches/nftables/02-rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/nftables/03-rm-systemd-comment.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# rm-systemd-comment.sh
+# removes any commented line that contains "systemd" in the PKGBUILD file
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -e "/^\s*#.*systemd/d" \
+            -i "${arg}/PKGBUILD"
+    done
+fi

patches/nlohmann-json/rm-blocks.pl

@@ -1 +0,0 @@
-../_common/rm-blocks.pl

patches/ntp/rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/ntp/updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/opensmptd/rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/opensmptd/rm-socket.sh

@@ -0,0 +1 @@
+../_common/rm-socket.sh

patches/opensmptd/updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/opensmptd/v1-sysuser.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for i in $@; do
+	sed -i '0,/sysusers/{s|sysusers|sysusers)|}' \
+		$i/PKGBUILD
+done

patches/plasma-meta/01-d-drkonqi.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -i '/drkonqi/Id' "${arg}/PKGBUILD"
+    done
+fi

patches/plasma-meta/02-kwin-x11.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -E 's|^(\s*)(.*)(kwin-x11)|\1# \2\3|' \
+            -i "${arg}/PKGBUILD"
+        sed -E 's|^(\s*)(kwin)|\1\2\n\1\2-x11|' \
+            -i "${arg}/PKGBUILD"
+    done
+fi

patches/plasma-workspace/03-x11.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -E "s|^(\s*)(['\"]*)(kwin-x11)|\1# \2\3|" \
+            -i "${arg}/PKGBUILD"
+        sed -e 's|depends+=(|\0plasma-x11-session |' \
+            -i "${arg}/PKGBUILD"
+    done
+fi

patches/plasma-workspace/env.txt

@@ -0,0 +1 @@
+PACKAGE_BLOCK=package_plasma-workspace

patches/powerdns-recursor/powerdns-recursor.sh

@@ -8,6 +8,7 @@ else
     do
         sed -e "s/systemd-libs/esysusers/" \
             -e "s/--enable-systemd/--disable-systemd/" \
+            -e "s/-Dsystemd-service=enabled/-Dsystemd-service=disabled/" \
             -e "s/'systemd'//" \
             -i "${arg}/PKGBUILD"
     done

patches/reflector/01-d-systemd.sh

@@ -0,0 +1 @@
+../_common/d-systemd.sh

patches/reflector/02-artix-mirrors.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -E 's|^(\s+)(python -m build)|\1sed -e "s\|https://archlinux.org\|https://packages.artixlinux.org\|g" \\\n\1    -e "s\|Arch Linux\|Artix Linux\|g" \\\n\1    -i Reflector.py\n\1\2|g' -i "${arg}/PKGBUILD"
+    done
+fi

patches/ruby-puma/01-ulimit-d.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -i '/ulimit/Id' "${arg}/PKGBUILD"
+    done
+fi

patches/rust/01-archlinux-to-artixlinux.sh

@@ -0,0 +1 @@
+../_common/archlinux-to-artixlinux.sh

patches/signal-desktop/01-systemd-libs-to-libudev.sh

@@ -0,0 +1 @@
+../_common/systemd-libs-to-libudev.sh

patches/smartmontools/05-smartd-conf.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -e "s|'etc/conf.d/smartd'||" \
+            -i "${arg}/PKGBUILD"
+        sed -i '/etc\/conf.d\/smartd/d' "${arg}/PKGBUILD"
+    done
+fi
+

patches/steam/rm-systemd-deps.sh

@@ -0,0 +1 @@
+../_common/rm-systemd-deps.sh

patches/switcheroo-control/01-d-systemd.sh

@@ -0,0 +1 @@
+../_common/d-systemd.sh

patches/switcheroo-control/02-configure-options.pl

@@ -0,0 +1 @@
+../_common/add-configure-options.pl

patches/switcheroo-control/03-rm-systemd.pl

@@ -0,0 +1 @@
+../_common/rm-systemd.pl

patches/switcheroo-control/env.txt

@@ -0,0 +1 @@
+CONFIG_OPTIONS=-D systemdsystemunitdir=/usr/lib/systemd # dummy dir

patches/tigervnc/04-systemd-libs-to-libudev.sh

@@ -0,0 +1 @@
+../_common/systemd-libs-to-libudev.sh

patches/umurmur/rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/umurmur/updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/uwsgi/06-updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/valkey/01-rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.sh

patches/valkey/02-rm-systemd-deps.sh

@@ -0,0 +1 @@
+../_common/rm-systemd-deps.sh

patches/valkey/03-rm-make-use-systemd.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# rm-systemd-make-option.sh
-# removes the systemd make option from the PKGBUILD file
+# rm-make-use-systemd.sh
+# removes line that contain "USE_SYSTEMD=yes"
 
 if [ "$#" -eq 0 ]; then
     echo "Usage: $0 <package repo>"

patches/valkey/04-updpkgsums.sh

@@ -0,0 +1 @@
+../_common/updpkgsums.sh

patches/vlc/04-sd-journal.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -i '/libsd_journal/d' "${arg}/PKGBUILD"
+        sed -i '/vlc-plugin-journal/d' "${arg}/PKGBUILD"
+        sed -i 's/journal,//' "${arg}/PKGBUILD"
+    done
+fi

patches/vlc/env.txt

@@ -0,0 +1 @@
+BLOCKS=package_vlc-plugin-journal

patches/vtk/usr-prefix.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-if [ "$#" -eq 0 ]; then
-    echo "Usage: $0 <package repo>"
-    exit 1
-else
-    for arg in "$@"
-    do
-        search_string='cmake -B build -S ${pkgname^^}-${pkgver} \\'
-        append_string='    -DCMAKE_PREFIX_PATH=/usr \\'
-
-        line_number=$(grep -n "$search_string" "${arg}/PKGBUILD" | cut -d':' -f1)
-
-        if [ -z "$line_number" ]; then
-            echo "Error: Search string not found in file '${arg}/PKGBUILD'"
-            exit 1
-        fi
-
-        sed -i "${line_number}s|${search_string}|&\n${append_string}|" "${arg}/PKGBUILD"
-    done
-fi

patches/wacomtablet/01-use-x11win.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "$#" -eq 0 ]
+then
+	echo "Usage: $0 <package repo>"
+	exit 1
+fi
+
+for arg in "$@"
+do
+	sed -i 's/xf86-input-wacom/x11win-input-wacom/g' "${arg}/PKGBUILD"
+done

patches/wine-staging/wine-staging.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 
 for i in "$@"; do
-	sed -e 's|mingw-w64-gcc||' \
-	    -e '/mingw32-strip/d' \
-	    -e '/depends/i CFLAGS+=" -Wno-error=incompatible-pointer-types -fPIC"' \
+	sed -e '/depends/i CFLAGS+=" -Wno-error=incompatible-pointer-types -fPIC"' \
 	    -i "$i"/PKGBUILD
 for arg in "$@"
 	    do

patches/wine/wine.sh

@@ -4,8 +4,7 @@ if [ "$#" -eq 0 ]; then
 else
     for arg in "$@"
     do
-	    sed -e 's|mingw-w64-gcc||' \
-		-e 's|-ffat-lto-objects|-ffat-lto-objects -fPIC|' \
+	    sed -e 's|-ffat-lto-objects|-ffat-lto-objects -fPIC|' \
 	    -i	$arg/PKGBUILD
     done
     

patches/wlroots0.18/rm-systemd-deps.sh

@@ -0,0 +1 @@
+../_common/rm-systemd-deps.sh

patches/xf86-video-vmware/systemd-libs-to-libudev.sh

@@ -0,0 +1 @@
+../_common/systemd-libs-to-libudev.sh