From 2448473417665b2a7a5c1db5a79b687780b405ea Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Tue, 23 Jul 2024 21:23:27 +0200
Subject: [PATCH] main/postmarketos-ui-sway: add -openrc subpackage (MR 5374)

---
 main/postmarketos-ui-sway/APKBUILD            | 21 +++++++++++++++----
 ... postmarketos-ui-sway-openrc.post-install} |  0
 .../postmarketos-ui-sway-openrc.post-upgrade  |  1 +
 .../postmarketos-ui-sway.post-upgrade         |  1 -
 4 files changed, 18 insertions(+), 5 deletions(-)
 rename main/postmarketos-ui-sway/{postmarketos-ui-sway.post-install => postmarketos-ui-sway-openrc.post-install} (100%)
 create mode 120000 main/postmarketos-ui-sway/postmarketos-ui-sway-openrc.post-upgrade
 delete mode 120000 main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade

diff --git a/main/postmarketos-ui-sway/APKBUILD b/main/postmarketos-ui-sway/APKBUILD
index 6808ca0d2..f37d5b2ac 100644
--- a/main/postmarketos-ui-sway/APKBUILD
+++ b/main/postmarketos-ui-sway/APKBUILD
@@ -2,23 +2,22 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-ui-sway
 pkgver=3.1
-pkgrel=3
+pkgrel=4
 pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm (DOES NOT RUN WITHOUT HW ACCELERATION!)"
 url="https://postmarketos.org"
 arch="noarch"
 license="GPL-3.0-or-later"
 subpackages="$pkgname-logo-key-alt:logo_key_alt"
 depends="
+	bluez
 	dnsmasq
 	elogind
-	elogind-openrc
 	polkit-elogind
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
 	sway
 	swaybg
 	tinydm
-	tinydm-openrc
 	"
 _pmb_recommends="
 	dmenu
@@ -31,7 +30,7 @@ _pmb_recommends="
 _pmb_groups="
 	seat
 	"
-install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-openrc"
 source="
 	etc-sway-config
 	etc-sway-config.d-00-logo-key.conf
@@ -49,6 +48,20 @@ logo_key_alt() {
 		"$subpkgdir"/etc/sway/config.d/00-logo-key.conf
 }
 
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="
+		bluez-openrc
+		elogind-openrc
+		modemmanager-openrc
+		seatd-openrc
+		tinydm-openrc
+		"
+
+		mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 6caaaa313d509a54eaa43e6bc24739f5d8241689dbed268885f6645e79567e3cd9f41d0d8fa43d52fe99587a1d1b6f1669cfecc88220d9ea409feb4f4cd43d3c  etc-sway-config
 889f10fb247396a11375057f7e81eae0f0b21ec90cd47964e02ba24fc0f6db8bb7678545e3272149535cf0bb6a2019456cc59d06a9564ce4a1797bb434013b78  etc-sway-config.d-00-logo-key.conf
diff --git a/main/postmarketos-ui-sway/postmarketos-ui-sway.post-install b/main/postmarketos-ui-sway/postmarketos-ui-sway-openrc.post-install
similarity index 100%
rename from main/postmarketos-ui-sway/postmarketos-ui-sway.post-install
rename to main/postmarketos-ui-sway/postmarketos-ui-sway-openrc.post-install
diff --git a/main/postmarketos-ui-sway/postmarketos-ui-sway-openrc.post-upgrade b/main/postmarketos-ui-sway/postmarketos-ui-sway-openrc.post-upgrade
new file mode 120000
index 000000000..825432cbd
--- /dev/null
+++ b/main/postmarketos-ui-sway/postmarketos-ui-sway-openrc.post-upgrade
@@ -0,0 +1 @@
+postmarketos-ui-sway-openrc.post-install
\ No newline at end of file
diff --git a/main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade b/main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade
deleted file mode 120000
index 39bd0994a..000000000
--- a/main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-postmarketos-ui-sway.post-install
\ No newline at end of file