From 54447345b46270fbb048edbca5cc7673eb8fbde3 Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Sat, 26 Aug 2023 14:08:50 -0400
Subject: [PATCH] qubes-vm-gui: fix pam.d install

---
 qubes-vm-gui/APKBUILD | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/qubes-vm-gui/APKBUILD b/qubes-vm-gui/APKBUILD
index 316a2cb..b997402 100644
--- a/qubes-vm-gui/APKBUILD
+++ b/qubes-vm-gui/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=qubes-vm-gui
 subpackages="qubes-vm-pulseaudio $pkgname-openrc"
 pkgver=4.1.31
-pkgrel=0
+pkgrel=1
 _gittag="v$pkgver"
 pkgdesc="The Qubes GUI Agent for AppVMs"
 arch="x86_64"
@@ -62,10 +62,6 @@ build() {
 	sed 's:ExecStartPre=/bin/touch:#ExecStartPre=/bin/touch:' -i appvm-scripts/qubes-gui-agent.service
 	# Ensure that qubes-gui-agent starts after user autologin
 	sed 's/After=\(.*\)qubes-misc-post.service/After=\1qubes-misc-post.service getty.target/' -i appvm-scripts/qubes-gui-agent.service
-	# Starts qubes-session after X11 start
-	install -Dm 755 "$srcdir"/qubes-sessions.sh "$pkgdir"/etc/X11/xinit/xinitrc.d/90-qubes-sessions.sh
-	# Remove broken pam and replace with adequate
-	install -Dm 644 "$srcdir"/qubes-gui-agent.pam "$pkgdir"/etc/pam.d/qubes-gui-agent
 
 	make BACKEND_VMM="$_qubes_backend_vmm" appvm
 	make appvm
@@ -80,6 +76,12 @@ build() {
 package() {
 	make install-rh-agent DESTDIR="$pkgdir" LIBDIR=/usr/lib USRLIBDIR=/usr/lib SYSLIBDIR=/lib
 	install -Dm 755 "$srcdir"/qubes-gui-agent.openrc "$pkgdir"/etc/init.d/qubes-gui-agent
+
+	# Starts qubes-session after X11 start
+	install -Dm 755 "$srcdir"/qubes-sessions.sh "$pkgdir"/etc/X11/xinit/xinitrc.d/90-qubes-sessions.sh
+
+	# Remove broken pam and replace with adequate
+	install -Dm 644 "$srcdir"/qubes-gui-agent.pam "$pkgdir"/etc/pam.d/qubes-gui-agent
 }
 
 pulseaudio() {