From d680f3eb0963f6e9e35e8a64c180e7cb3ba8ff69 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Wed, 24 Jan 2024 11:19:22 -0800
Subject: [PATCH] pmos-ui-{gnome,phosh}: Move shared pmb_rcmds to
 pmos-base-ui-gnome (MR 4756)

These apps are useful to have on the full GNOME desktop too, and this
removes the need to duplicate package lists across UI meta packages that
depend on the base gnome UI package.
---
 main/postmarketos-base-ui-gnome/APKBUILD   | 14 ++++++++++++++
 main/postmarketos-ui-gnome-mobile/APKBUILD | 14 +-------------
 main/postmarketos-ui-phosh/APKBUILD        | 14 +-------------
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/main/postmarketos-base-ui-gnome/APKBUILD b/main/postmarketos-base-ui-gnome/APKBUILD
index da2fb7f18..721a74e05 100644
--- a/main/postmarketos-base-ui-gnome/APKBUILD
+++ b/main/postmarketos-base-ui-gnome/APKBUILD
@@ -35,8 +35,22 @@ options="!check"
 subpackages="$pkgname-wallpaper-pmos:wallpaper_pmos"
 
 _pmb_recommends="
+	evince
+	firefox-esr
+	font-noto
+	font-noto-emoji
+	gnome-calculator
+	gnome-clocks
 	gnome-console
+	gnome-contacts
+	gnome-software
+	gnome-software-plugin-apk
+	gnome-text-editor
+	lollypop
+	loupe
 	postmarketos-artwork-wallpapers-gnome
+	xdg-user-dirs
+	xdg-user-dirs-gtk
 "
 
 package() {
diff --git a/main/postmarketos-ui-gnome-mobile/APKBUILD b/main/postmarketos-ui-gnome-mobile/APKBUILD
index 0ab8590eb..0f5ba2093 100644
--- a/main/postmarketos-ui-gnome-mobile/APKBUILD
+++ b/main/postmarketos-ui-gnome-mobile/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-gnome-mobile
 pkgver=2
-pkgrel=2
+pkgrel=3
 pkgdesc="(Wayland) Gnome Shell patched to adapt better to phones (Experimental)"
 url="https://gnome.org/"
 arch="noarch !armhf !riscv64" # gnome-shell / riscv64: mutter-mobile
@@ -34,18 +34,7 @@ depends="
 _pmb_recommends="
 	calls
 	chatty
-	firefox-esr
-	font-noto
-	font-noto-emoji
-	gnome-text-editor
-	gnome-calculator
-	gnome-clocks
-	gnome-contacts
-	gnome-software
-	gnome-software-plugin-apk
 	karlender
-	lollypop
-	loupe
 	mobile-config-firefox
 	portfolio
 	postmarketos-default-camera
@@ -53,7 +42,6 @@ _pmb_recommends="
 	postmarketos-welcome
 	postprocessd
 	ttyescape
-	xdg-user-dirs
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD
index 7c0527b97..995bbd50e 100644
--- a/main/postmarketos-ui-phosh/APKBUILD
+++ b/main/postmarketos-ui-phosh/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-phosh
 pkgver=22.3
-pkgrel=3
+pkgrel=4
 pkgdesc="(Wayland) Mobile UI initially developed for the Librem 5"
 url="https://phosh.mobi"
 arch="noarch !armhf"
@@ -29,19 +29,7 @@ depends="
 _pmb_recommends="
 	calls
 	chatty
-	evince
-	firefox-esr
-	font-noto
-	font-noto-emoji
-	gnome-calculator
-	gnome-clocks
-	gnome-contacts
-	gnome-software
-	gnome-software-plugin-apk
-	gnome-text-editor
 	karlender
-	lollypop
-	loupe
 	mobile-config-firefox
 	phosh-mobile-settings
 	portfolio