From 7bf94012738d0fa2d871a3b17ee0b18fd50b8d16 Mon Sep 17 00:00:00 2001
From: Stacy Harper <contact@stacyharper.net>
Date: Fri, 12 Nov 2021 20:58:37 +0100
Subject: [PATCH] main/postmarketos-ui-sxmo: fix build issue with a fallback to
 one single package

---
 main/postmarketos-ui-sxmo/APKBUILD            | 132 +++++++-----------
 .../postmarketos-ui-sxmo-dwm.post-install     |   3 -
 .../postmarketos-ui-sxmo-sway.post-install    |   5 -
 .../postmarketos-ui-sxmo-sway.pre-deinstall   |   3 -
 .../postmarketos-ui-sxmo.post-install         |   3 +
 5 files changed, 52 insertions(+), 94 deletions(-)
 delete mode 100644 main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-dwm.post-install
 delete mode 100644 main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-sway.post-install
 delete mode 100644 main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-sway.pre-deinstall

diff --git a/main/postmarketos-ui-sxmo/APKBUILD b/main/postmarketos-ui-sxmo/APKBUILD
index 424d0dd07..b0292cfd5 100644
--- a/main/postmarketos-ui-sxmo/APKBUILD
+++ b/main/postmarketos-ui-sxmo/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Miles Alan <m@milesalan.com>
 pkgname=postmarketos-ui-sxmo
 pkgver=1.6.0
-pkgrel=2
-pkgdesc="Simple Mobile: Core package to build custom SXMO desktops environments"
+pkgrel=3
+pkgdesc="Simple Mobile: Mobile environment based on SXMO"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch !armhf"
 license="MIT"
@@ -42,7 +42,43 @@ depends="
 	vis
 	youtube-dl
 
-	postmarketos-ui-sxmo-de
+	autocutsel
+	conky
+	svkbd
+	sxiv
+	sxmo-dmenu
+	sxmo-dwm
+	sxmo-st
+	unclutter-xfixes
+	xcalib
+	xclip
+	xdotool
+	xdpyinfo
+	xinput
+	xprintidle
+	xprop
+	xrandr
+	xrdb
+	xsel
+	xset
+	xsetroot
+	xwininfo
+
+	foot
+	grim
+	mako
+	seatd
+	seatd-openrc
+	slurp
+	swaybg
+	swayidle
+	sxmo-bemenu
+	sxmo-sway
+	wayout
+	wl-clipboard
+	wtype
+	wvkbd
+	xwayland
 	"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 _pmb_groups="
@@ -51,8 +87,17 @@ _pmb_groups="
 _pmb_recommends="
 	w3m
 	sfeed
+
+	clickclack
+	firefox-esr
+	font-noto
+	font-noto-emoji
+	gnome-icon-theme
+	imv
+	megapixels
+	mobile-config-firefox
 	"
-subpackages="$pkgname-qt_tweaks $pkgname-bluetooth $pkgname-dwm $pkgname-sway"
+subpackages="$pkgname-qt_tweaks $pkgname-bluetooth"
 source="
 	sxmo-qt-mobile-controls.sh
 	postmarketos.conf
@@ -84,85 +129,6 @@ bluetooth() {
 	install="$subpkgname.post-install $subpkgname.pre-deinstall"
 }
 
-dwm() {
-	pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on dwm"
-	depends="
-		autocutsel
-		conky
-		svkbd
-		sxiv
-		sxmo-dmenu
-		sxmo-dwm
-		sxmo-st
-		unclutter-xfixes
-		xcalib
-		xclip
-		xdotool
-		xdpyinfo
-		xinput
-		xprintidle
-		xprop
-		xrandr
-		xrdb
-		xsel
-		xset
-		xsetroot
-		xwininfo
-	"
-	_pmb_recommends="
-		clickclack
-		feh
-		firefox-esr
-		font-noto
-		font-noto-emoji
-		gnome-icon-theme
-		megapixels-gtk3
-		mobile-config-firefox
-		xcalc
-	"
-	provides="$pkgname-de"
-	provider_priority="0"
-	install="$subpkgname.post-install"
-
-	mkdir -p "$subpkgdir"
-}
-
-sway() {
-	pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on sway"
-	depends="
-		foot
-		grim
-		mako
-		seatd
-		seatd-openrc
-		slurp
-		swaybg
-		swayidle
-		sxmo-bemenu
-		sxmo-sway
-		wayout
-		wl-clipboard
-		wtype
-		wvkbd
-		xwayland
-	"
-	_pmb_recommends="
-		clickclack
-		firefox-esr
-		font-noto
-		font-noto-emoji
-		gnome-icon-theme
-		imv
-		megapixels
-		mobile-config-firefox
-	"
-	provides="$pkgname-de"
-	provider_priority="1"
-	install="$subpkgname.post-install $subpkgname.pre-deinstall"
-
-	mkdir -p "$subpkgdir"
-}
-
 
 sha512sums="
 bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1  sxmo-qt-mobile-controls.sh
diff --git a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-dwm.post-install b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-dwm.post-install
deleted file mode 100644
index ad239685f..000000000
--- a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-dwm.post-install
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-tinydm-set-session -f -s /usr/share/xsessions/sxmo.desktop
diff --git a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-sway.post-install b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-sway.post-install
deleted file mode 100644
index f496b1651..000000000
--- a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-sway.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-tinydm-set-session -f -s /usr/share/wayland-sessions/swmo.desktop
-
-rc-update add seatd default
diff --git a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-sway.pre-deinstall b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-sway.pre-deinstall
deleted file mode 100644
index c9aae7ff5..000000000
--- a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-sway.pre-deinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update del seatd default
diff --git a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-install b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-install
index 873a214b5..30a48b84c 100644
--- a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-install
+++ b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-install
@@ -6,3 +6,6 @@ rc-update add modemmanager default
 rc-update add tinydm default
 rc-update add networkmanager default
 rc-update add polkit default
+rc-update add seatd default
+
+tinydm-set-session -f -s /usr/share/wayland-sessions/swmo.desktop