From 610acd9fb51f09d57cc3a2ef316b01428c2e4aa4 Mon Sep 17 00:00:00 2001
From: Willow Barraco <contact@willowbarraco.fr>
Date: Wed, 29 Mar 2023 21:26:57 +0200
Subject: [PATCH] main/sxmo-common: upgrade to 1.14.0 (MR 3982)

---
 main/sxmo-common/APKBUILD | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/main/sxmo-common/APKBUILD b/main/sxmo-common/APKBUILD
index 0c1540f24..5a3761b3b 100644
--- a/main/sxmo-common/APKBUILD
+++ b/main/sxmo-common/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Miles Alan <m@milesalan.com>
 pkgname=sxmo-common
-pkgver=1.13.0
-pkgrel=1
+pkgver=1.14.0
+pkgrel=0
 pkgdesc="Simple Mobile: Core package to build custom SXMO desktop environments"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch !armhf"
@@ -12,12 +12,12 @@ depends="
 	alsa-utils
 	callaudiod
 	codemadness-frontends
+	conky
 	dnsmasq
 	dunstify
-	ffmpeg
 	file
-	font-fira-mono-nerd
-	font-terminus-nerd
+	font-dejavu
+	font-dejavu-sans-mono-nerd
 	geoclue
 	inotify-tools
 	light
@@ -31,7 +31,6 @@ depends="
 	modemmanager-openrc
 	mpv
 	ncurses
-	pamixer
 	pnc
 	polkit
 	polkit-openrc
@@ -42,7 +41,6 @@ depends="
 	sxmo-common-audio
 	sxmo-utils
 	sxmo-utils-openrc
-	terminus-font
 	tinydm
 	tinydm-openrc
 	tzdata
@@ -60,6 +58,17 @@ source="
 	"
 options="!check" # has no tests
 
+# bonsai and sxmobar requires hare which doesnt work on all arches
+# refer to https://pkgs.alpinelinux.org/packages?name=hare&branch=edge&repo=&arch=&maintainer=
+# and add arches here as they become available. Bonsai should always be preferred
+# cause it fixes alot of issues. If bonsai is not installed, sxmo will fallback
+# to the old buggy shell script.
+case "$CARCH" in
+	x86_64|aarch64)
+		depends="$depends bonsai sxmobar"
+	;;
+esac
+
 package() {
 	mkdir -p "$pkgdir"
 }