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

@@ -11,4 +11,4 @@ else
     do
         sed -i '/\.service/d' "${arg}/PKGBUILD"
     done
-fi
+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/certbot/03-rm-timer.sh

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

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/dnscrypt-proxy/01-rm-service.sh

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

patches/dnscrypt-proxy/02-rm-socket.sh

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

patches/dnscrypt-proxy/03-add-source.pl

@@ -0,0 +1 @@
+../_common/add-source.pl

patches/dnscrypt-proxy/04-add-install.pl

@@ -0,0 +1,44 @@
+#!/usr/bin/perl
+
+# add-package.pl
+# Appends the contents of PACKAGE_APPEND env variable to the end of the package function.
+# Can be configured to target a different function with PACKAGE_BLOCK.
+# \n in PACKAGE_APPEND are interpreted as newlines.
+# Setting PACKAGE_NO_NEWLINE will disable appending any additional newlines before
+# the append_var.
+
+use strict;
+use warnings;
+
+if (@ARGV == 0 || ! $ENV{'PACKAGE_APPEND'}) {
+    die("Usage: $0 <package repo>\n");
+}
+
+# Process entire file instead of line by line.
+undef $/;
+
+for (@ARGV) {
+    my $file_name = $_ . "/PKGBUILD";
+
+    open(my $input, '<', $file_name) or die("Could not open file '$file_name' $!\n");
+    my $content = <$input>;
+    close($input);
+
+    my $package_block = $ENV{'PACKAGE_BLOCK'} // 'package';
+    my $append_var = $ENV{'PACKAGE_APPEND'};
+    my $extra_newline = $ENV{'PACKAGE_NO_NEWLINE'} ? "" : "\n";
+    $append_var =~ s/\\n/\n/g; # change \n to actual newlines
+
+    if ($content =~ /(
+${package_block}\s*\(\)\s*\{)/) {
+        $content =~ s/(
+${package_block}\s*\(\)\s*\{[\s\S]*?
+)(\})/$1${extra_newline}${append_var}\n}/;
+    } else {
+        die("Function '${package_block}' not found in '$file_name'.\n");
+    }
+
+    open($input, ">", $file_name) or die("Could not write to file '$file_name' $!\n");
+    print $input $content;
+    close($input);
+}

patches/dnscrypt-proxy/env.txt

@@ -0,0 +1,4 @@
+SOURCES=  tmpfiles.d\n  sysusers.d
+SOURCES_NO_NEWLINE=yes
+PACKAGE_APPEND=  # sysusers.d\n  install -vDm 644 "$srcdir/sysusers.d" "$pkgdir/usr/lib/sysusers.d/${pkgname}.conf"\n  # tmpfiles.d\n  install -vDm 644 "$srcdir/tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/${pkgname}.conf"
+PACKAGE_NO_NEWLINE=yes

patches/dotnet-core-8.0

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

patches/dotnet-core/01-systemd-to-udev.sh

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

patches/dotnet-core/02-dotnet-things.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -e "s/arch-/artix-/g" \
+            -i "${arg}/PKGBUILD" && \
+        sed -E 's|(build\(\).*$)|\1\n  export DOTNET_CLI_TELEMETRY_OPTOUT=1|' \
+            -i "${arg}/PKGBUILD"
+    done
+fi
+

patches/dpkg/01-insert-config-options.pl

@@ -0,0 +1 @@
+../_common/insert-config-options.pl

patches/dpkg/02-updpkgsums.sh

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

patches/dpkg/03-install-origin-file.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/ archlinux / artixlinux /" \
+            -i "${arg}/PKGBUILD"
+        sed -E 's|(\s+install -vDm644 "\$srcdir/origin\.)(archlinux)(" "\$pkgdir/etc/dpkg/origins/)(archlinux)"|\1\2\3\4"\n\1artixlinux\3artixlinux"|' \
+            -i "${arg}/PKGBUILD"
+    done
+fi

patches/dpkg/env.txt

@@ -0,0 +1,2 @@
+OPTION_VAR=source
+CONFIG_OPTIONS=origin.artixlinux

patches/dropbear/rm-service.sh

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

patches/dropbear/updpkgsums.sh

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

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/fwupd/env.txt

@@ -1 +1 @@
-CONFIG_OPTIONS=-D systemd=disabled\n    -D elogind=enabled
+CONFIG_OPTIONS=-D systemd=disabled

patches/gkrellm/gkrellm-rm-systemd.sh

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

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/gnome-keyring/env.txt

@@ -0,0 +1 @@
+CONFIG_OPTIONS=-D systemd=disabled

patches/go-ethereum/01-rm-service.sh

@@ -8,9 +8,7 @@ if [ "$#" -eq 0 ]; then
 else
 	for arg in "$@"
 	do
-		sed -e "s/'geth-user.service'//g" \
-		    -e "s/'806ab43221f0c203e663a78afced694786a5adb033f06fab07d07904384d7645'//g" \
+		sed -e "s/'geth-user.service'//" \
 		    -i "${arg}/PKGBUILD"
-		# TODO: remove the newline and trailing whitespace after
 	done
 fi

patches/go-ethereum/03-updpkgsums.sh

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

patches/godot/01-arch-to-artix.sh

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

patches/grub/01-arch-to-artix.sh

@@ -7,6 +7,9 @@ else
     for arg in "$@"
     do
         sed -i 's/Arch/Artix/' "${arg}/grub.default"
+        sed -i 's/Arch/Artix/' "${arg}/sbat.csv"
+        sed -i 's/arch/artix/' "${arg}/sbat.csv"
+        sed -i 's|https://archlinux.org/packages/core/x86_64/grub/|https://gitea.artixlinux.org/packages/grub/|' "${arg}/sbat.csv"
         line_number=$(grep -n "_package_grub-common_and_bios" "${arg}/PKGBUILD" | tail -1 | cut -d : -f 1)
         line_number=$((line_number+1))
         UPDATE_GRUB='

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/iio-sensor-proxy/02-disable-services.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|-Dsystemdsystemunitdir=/usr/lib/systemd/system|-Dsystemdsystemunitdir=''|" "${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-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-libusb/systemd-to-elogind.sh

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

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/lib32-polkit/lib32-polkit.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 
 for i in $@; do
-	sed -e '/redhat/a\    -D session_tracking=elogind'
+	sed -e '/cross-file/a\    -D session_tracking=elogind' \
+	    -e '/systemd/d' \
+	    -e '/makedepends/a\  libelogind' \
 	    -i "$i"/PKGBUILD
 done

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/libutempter/libutempter.sh

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

patches/libvirt/d-systemd.sh

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

patches/lighttpd/rm-service.sh

@@ -0,0 +1 @@
+../_common/rm-service.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/lm_sensors/updpkgsums.sh

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

patches/ly/02-build-installexe.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/installsystemd/installexe/' "${arg}/PKGBUILD"
+    done
+fi

patches/mailman3/01-rm-service.sh

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

patches/mailman3/02-rm-timer.sh

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

patches/mailman3/03-updpkgsums.sh

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

patches/mailman3/04-rm-service-install.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 '/services and timer/d' \
+	    -e '/{service,timer}/d' \
+	    -i "${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/mpd/01-d-systemd.sh

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

patches/mpd/02-add-configure-options.pl

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

patches/mpd/env.txt

@@ -0,0 +1 @@
+CONFIG_OPTIONS=-D systemd=disabled

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

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

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/nftables/04-updpkgsums.sh

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

patches/niri/d-systemd.sh

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

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/open-iscsi/systemd-to-udev.sh

@@ -0,0 +1,14 @@
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+			  sed -e "s,systemd-libs,libudev," \
+					  -i ${arg}/PKGBUILD
+        sed -e "s/systemd/udev/" \
+					  -e "/rulesdir/a\    -Dno_systemd=true" \
+            -i "${arg}/PKGBUILD"
+    done
+fi
+

patches/openresolv/rm-systemd-deps.sh

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

patches/opensips/opensips.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+for i in $@ ; do
+	sed -e 's|tar.gz|tar.gz)|' \
+	    -i $i/PKGBUILD
+done

patches/opensips/rm-service.sh

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

patches/opensips/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/rm-systemd-deps.sh

@@ -0,0 +1 @@
+../_common/rm-systemd-deps.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/opensnitch/rm-service.sh

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

patches/opensnitch/skip-systemd-install.pl

@@ -0,0 +1 @@
+../_common/skip-systemd-install.pl

patches/opensnitch/updpkgsums.sh

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