include block name in error message

patches/_common/rm-systemd.pl

@@ -51,7 +51,7 @@ for (@ARGV) {
         if ($end_index != 0) {
             splice(@lines, $end_index, 0, "\n" . $line_prefix . $remove_var . "\n");
         } else {
-            die("Error: Unable to find package section in PKGBUILD.\n");
+            die("Error: Unable to find " . $package_block . " section in PKGBUILD.\n");
         }
     }
 

patches/dotnet-core-8.0

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

patches/lib32-libnm/0001-systemd.sh

@@ -1,11 +0,0 @@
-#!/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-libnm/rm-systemd-deps.sh

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

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

@@ -1,22 +0,0 @@
-#!/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-p11-kit/rm-systemd-deps.sh

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

patches/mariadb/01-systemd.sh

@@ -13,7 +13,6 @@ 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/netavark/01-rm-blocks.pl

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

patches/powerdns-recursor/powerdns-recursor.sh

@@ -8,7 +8,6 @@ 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

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

patches/reflector/02-artix-mirrors.sh

@@ -1,11 +0,0 @@
-#!/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

@@ -1,11 +0,0 @@
-#!/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

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

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

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

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

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

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

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

patches/switcheroo-control/env.txt

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

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

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

patches/vtk/usr-prefix.sh

@@ -0,0 +1,21 @@
+#!/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

@@ -1,12 +0,0 @@
-#!/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/zerotier-one/01-d-systemd.sh

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