From de35a48aa0f68f19b824879f0d7fee61185a147e Mon Sep 17 00:00:00 2001
From: Willow Barraco <contact@willowbarraco.fr>
Date: Sun, 9 Jul 2023 18:52:20 +0200
Subject: [PATCH] main/postmarketos-ui-sxmo-de-dwm: move deps to aports (MR
 4242)

---
 main/postmarketos-ui-sxmo-de-dwm/APKBUILD     | 41 ++++++++-----------
 .../postmarketos-ui-sxmo-de-dwm.post-install  |  8 +++-
 .../postmarketos-ui-sxmo-de-dwm.post-upgrade  |  1 +
 .../postmarketos-ui-sxmo-de-dwm.pre-deinstall |  7 ++++
 4 files changed, 31 insertions(+), 26 deletions(-)
 create mode 120000 main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.post-upgrade
 create mode 100644 main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.pre-deinstall

diff --git a/main/postmarketos-ui-sxmo-de-dwm/APKBUILD b/main/postmarketos-ui-sxmo-de-dwm/APKBUILD
index 3db60c964..b05e4b9a5 100644
--- a/main/postmarketos-ui-sxmo-de-dwm/APKBUILD
+++ b/main/postmarketos-ui-sxmo-de-dwm/APKBUILD
@@ -2,38 +2,29 @@
 # Maintainer: Miles Alan <m@milesalan.com>
 pkgname=postmarketos-ui-sxmo-de-dwm
 pkgver=1.14.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on dwm"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch !armhf"
 license="MIT"
 depends="
-	sxmo-common
+	postmarketos-base-ui
+	postmarketos-base-ui-networkmanager
 
-	autocutsel
-	dunst
-	feh
-	svkbd
-	sxiv
-	sxmo-dmenu
-	sxmo-dwm
-	sxmo-st
-	unclutter-xfixes
-	xcalib
-	xclip
-	xdotool
-	xdpyinfo
-	xinput
-	xprintidle
-	xprop
-	xrandr
-	xrdb
-	xsel
-	xset
-	xsetroot
-	xwininfo
+	sxmo-utils-dwm
+	sxmo-utils-audio-bluetooth
+
+	sxmo-utils-openrc
+	tinydm-openrc
+	modemmanager-openrc
+	networkmanager-openrc
+	bluez-openrc
+	"
+install="
+	$pkgname.post-install
+	$pkgname.post-upgrade
+	$pkgname.pre-deinstall
 	"
-install="$pkgname.post-install"
 _pmb_recommends="
 	w3m
 	sfeed
diff --git a/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.post-install b/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.post-install
index ad239685f..e7a59f567 100644
--- a/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.post-install
+++ b/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.post-install
@@ -1,3 +1,9 @@
 #!/bin/sh
 
-tinydm-set-session -f -s /usr/share/xsessions/sxmo.desktop
+tinydm-set-session -s /usr/share/xsessions/sxmo.desktop
+
+rc-update add sxmo-setpermissions default
+rc-update add modemmanager default
+rc-update add tinydm default
+rc-update add networkmanager default
+rc-update add bluetooth default
diff --git a/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.post-upgrade b/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.post-upgrade
new file mode 120000
index 000000000..bc9676c55
--- /dev/null
+++ b/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.post-upgrade
@@ -0,0 +1 @@
+postmarketos-ui-sxmo-de-dwm.post-install
\ No newline at end of file
diff --git a/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.pre-deinstall b/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.pre-deinstall
new file mode 100644
index 000000000..b63b70a6c
--- /dev/null
+++ b/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.pre-deinstall
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+rc-update del sxmo-setpermissions
+rc-update del modemmanager
+rc-update del tinydm
+rc-update del networkmanager
+rc-update del bluetooth