DO NOT MERGE: main/postmarketos-base-ui-gnome: add flatpak names for pmb_recommends

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
main/uipkg-dev: new aport
2026-04-27 14:17:38 -07:00 · 2026-04-27 14:15:55 -07:00 · 2026-04-27 13:38:33 -07:00
3 changed files with 57 additions and 3 deletions
@@ -2,12 +2,13 @@
 # Co-Maintainer: Achill Gilgenast <achill@achill.org>
 maintainer="Newbyte <newbyte@postmarketos.org>"
 pkgname=postmarketos-base-ui-gnome
-pkgver=11
+pkgver=12
 pkgrel=0
 pkgdesc="Meta package for shared configuration for GNOME-based UIs"
 url="https://postmarketos.org"
 arch="noarch"
 license="GPL-3.0-or-later"
+makedepends="uipkg-dev"
 depends="
 	dnsmasq
 	gcr-ssh-agent
@@ -45,8 +46,8 @@ _pmb_recommends="
 	firefox-esr
 	flatpak
 	fprintd
-	g4music
-	gnome-calculator
+	g4music;flatpak:com.github.neithern.g4music
+	gnome-calculator;flatpak:org.gnome.Calculator
 	gnome-calendar
 	gnome-clocks
 	gnome-console
@@ -72,6 +73,8 @@ _pmb_recommends="
 "

 package() {
+	uipkg_package $startdir $pkgname "$_pmb_recommends"
+
 	install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \
 		"$srcdir"/*.override
 }
@@ -0,0 +1,20 @@
+maintainer="Clayton Craft <clayton@craftyguy.net>"
+pkgname=uipkg-dev
+pkgver=1
+pkgrel=0
+pkgdesc="Provides default UI meta package functions"
+url="https://postmarketos.org"
+arch="noarch"
+license="MIT"
+source="
+	uipkg_package.sh
+"
+
+package() {
+	install -Dm755 "$srcdir"/uipkg_package.sh \
+		"$pkgdir"/usr/bin/uipkg_package
+}
+
+sha512sums="
+99a2519597dc7207becada71f95c7384689cc834fb9ee5697acd459dcf7feb1c407cd6899256996be4e79cae43751cd639388f09ef10f3273ca4b9bb4319930f  uipkg_package.sh
+"
@@ -0,0 +1,31 @@
+#!/bin/sh
+startdir=$1
+pkgname=$2
+recommends="${3:-}"
+
+
+if [ -z "$startdir" ] || [ -z "$pkgname" ]; then
+	echo "ERROR: missing argument!"
+	echo "Please call $0 with \$startdir \$pkgname as arguments."
+	exit 1
+fi
+
+srcdir="$startdir/src"
+pkgdir="$startdir/pkg/$pkgname"
+
+set -x
+if [ -n "$recommends" ]; then
+	mkdir -p "$pkgdir"/usr/share/flatpak/preinstall.d
+	for r in $recommends; do
+		flatpak_app="$(echo "$r" | cut -d';' -f2)"
+		case "$flatpak_app" in
+		flatpak:*) flatpak_app="$(echo "$flatpak_app" | cut -d':' -f2)" ;;
+		*) continue ;;
+		esac
+		cat <<-EOF >> "$pkgdir/usr/share/flatpak/preinstall.d/$pkgname.preinstall"
+			[Flatpak Preinstall $flatpak_app]
+			Branch=stable
+			IsRuntime=false
+		EOF
+	done
+fi