fix

Reviewed-on: #419

patches/appstream/02-d-systemd-opt.sh

@@ -6,7 +6,7 @@ if [ "$#" -eq 0 ]; then
 else
     for arg in "$@"
     do
-        line_number=$(grep -n "Dqt-versions" "${arg}/PKGBUILD" | cut -d : -f 1)
+        line_number=$(grep -n "Dqt" "${arg}/PKGBUILD" | cut -d : -f 1)
         line_number=$((line_number+1))
         sed -i "${line_number}"'i\    -Dsystemd=false \\' "${arg}/PKGBUILD"
     done

patches/lib32-pam/0001-remove-sysd.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+for i in $@; do
+  sed -e '/Dlogind/ s,enabled,disabled,' \
+      -e '/Delogind/ s,disabled,enabled,' \
+      -e 's,lib32-systemd,lib32-elogind,' \
+      -e 's|?signed||' \
+      -i $i/PKGBUILD
+done

patches/networkmanager/01-systemd.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+for i in $@; do
+  sed -e '/systemd-libs/d' \
+      -e 's,systemd,elogind,g' \
+      -i $i/PKGBUILD
+  sed -e '/selinux=false/a\    -D systemdsystemunitdir=no' \
+      -e '/selinux=false/a\    -D session_tracking=elogind' \
+      -e '/selinux=false/a\    -D systemd_journal=false' \
+      -e '/NetworkManager.service/d' \
+      -e '/mobile-broadband/a\    elogind' \
+      -e '/util-linux/a\    libelogind' \
+      -i $i/PKGBUILD
+done

patches/pulseaudio/0001-pulse.sh

@@ -7,6 +7,8 @@ for i in $@ ; do
 	    -e '/systemd/d' \
 	    -e '/install=pulseaudio.install/d' \
 	    -e '/iautospawn/s,no,yes,' -i $i/PKGBUILD
+  sed -e '/elogind=enabled/a\    -D systemd=disabled' \
+      -i "$i/PKGBUILD"
 done
 	    
 

patches/switcheroo-control/04-add-source.pl

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

patches/switcheroo-control/env.txt

@@ -1 +1,4 @@
 CONFIG_OPTIONS=-D systemdsystemunitdir=/usr/lib/systemd # dummy dir
+SOURCE_BLOCK=makedepends
+SOURCES=  linux-api-headers\n
+SOURCES_NO_NEWLINE=y

patches/usbguard/02-add-source.pl

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

patches/usbguard/env.txt

@@ -0,0 +1,3 @@
+SOURCE_BLOCK=depends
+SOURCES=  dbus-glib\n
+SOURCES_NO_NEWLINE=y

patches/valkey/05-rm-cd-to-systemd-dir.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# rm-cd-to-systemd-dir.sh
+# removes line that contain "cd /usr/lib/systemd/system" from PKGBUILD files
+
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 <package repo>"
+    exit 1
+else
+    for arg in "$@"
+    do
+        sed -i '/usr\/lib\/systemd\/system/d' "${arg}/PKGBUILD"
+    done
+fi

patches/wlroots/d-systemd.sh

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

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

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

patches/xdg-user-dirs-update/01-xdg-user-dirs-update.diff

@@ -1,28 +0,0 @@
---- a/PKGBUILD	2024-07-22 10:00:21.560007599 +0200
-+++ b/PKGBUILD	2024-07-22 10:10:31.346674268 +0200
-@@ -9,14 +9,13 @@
- url="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
- arch=(x86_64)
- license=(GPL)
--depends=(sh systemd)
-+depends=(sh)
- makedepends=(docbook-xsl git)
- backup=(etc/xdg/user-dirs.conf etc/xdg/user-dirs.defaults)
- install=xdg-user-dirs.install
- options=(!emptydirs)
- _commit=52e71ff04416f2ca3adaf6d73193de4b8b83de46  # tags/0.18^0
--source=("git+https://gitlab.freedesktop.org/xdg/xdg-user-dirs.git#commit=$_commit"
--        xdg-user-dirs-update.service)
-+source=("git+https://gitlab.freedesktop.org/xdg/xdg-user-dirs.git#commit=$_commit")
- sha256sums=('SKIP'
-             '53c75f52d782e9492601400236bc8e5bfa76a26f0afd9bce3fe8df1740d341f0')
- 
-@@ -39,8 +38,4 @@
- package() {
-   cd $pkgname
-   make DESTDIR="$pkgdir" install 
--
--  # We use a service
--  rm "$pkgdir/etc/xdg/autostart/xdg-user-dirs.desktop"
--  install -Dt "$pkgdir/usr/lib/systemd/user" -m644 ../xdg-user-dirs-update.service
- }

patches/xdg-user-dirs/01-rm-systemd-deps.sh

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

patches/xdg-user-dirs/01-xdg-user-dirs-update.diff

@@ -1,28 +0,0 @@
---- a/PKGBUILD	2024-07-22 10:00:21.560007599 +0200
-+++ b/PKGBUILD	2024-07-22 10:10:31.346674268 +0200
-@@ -9,14 +9,13 @@
- url="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
- arch=(x86_64)
- license=(GPL)
--depends=(sh systemd)
-+depends=(sh)
- makedepends=(docbook-xsl git)
- backup=(etc/xdg/user-dirs.conf etc/xdg/user-dirs.defaults)
- install=xdg-user-dirs.install
- options=(!emptydirs)
- _commit=52e71ff04416f2ca3adaf6d73193de4b8b83de46  # tags/0.18^0
--source=("git+https://gitlab.freedesktop.org/xdg/xdg-user-dirs.git#commit=$_commit"
--        xdg-user-dirs-update.service)
-+source=("git+https://gitlab.freedesktop.org/xdg/xdg-user-dirs.git#commit=$_commit")
- sha256sums=('SKIP'
-             '53c75f52d782e9492601400236bc8e5bfa76a26f0afd9bce3fe8df1740d341f0')
- 
-@@ -39,8 +38,4 @@
- package() {
-   cd $pkgname
-   make DESTDIR="$pkgdir" install 
--
--  # We use a service
--  rm "$pkgdir/etc/xdg/autostart/xdg-user-dirs.desktop"
--  install -Dt "$pkgdir/usr/lib/systemd/user" -m644 ../xdg-user-dirs-update.service
- }

patches/xdg-user-dirs/02-rm-install.sh

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

patches/xdg-user-dirs/03-rm-unused-files.sh

@@ -0,0 +1,11 @@
+diff --git a/xdg-user-dirs.install b/xdg-user-dirs.install
+deleted file mode 100644
+index 6908505..0000000
+--- a/xdg-user-dirs.install
++++ /dev/null
+@@ -1,5 +0,0 @@
+-pre_upgrade() {
+-  if (( $(vercmp $2 0.19-1) < 0)); then
+-    systemctl --global disable xdg-user-dirs-update.service
+-  fi
+-}