From 87e9476dbd607783bbfeeac28679a66bc4b72b30 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Wed, 24 Jan 2024 11:09:38 -0800 Subject: [PATCH] pmos-ui-{gnome,phosh}: move shared depends to pmos-base-ui-gnome (MR 4756) --- main/postmarketos-base-ui-gnome/APKBUILD | 5 +++++ main/postmarketos-ui-gnome-mobile/APKBUILD | 2 -- main/postmarketos-ui-gnome/APKBUILD | 1 - main/postmarketos-ui-phosh/APKBUILD | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/main/postmarketos-base-ui-gnome/APKBUILD b/main/postmarketos-base-ui-gnome/APKBUILD index 3d0f436db..be4371e55 100644 --- a/main/postmarketos-base-ui-gnome/APKBUILD +++ b/main/postmarketos-base-ui-gnome/APKBUILD @@ -24,6 +24,7 @@ depends=" xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-user-dirs + xwayland " install="$pkgname.post-install $pkgname.post-upgrade" source=" @@ -33,6 +34,10 @@ source=" options="!check" subpackages="$pkgname-wallpaper-pmos:wallpaper_pmos" +_pmb_recommends=" + postmarketos-artwork-wallpapers-gnome +" + package() { install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \ "$srcdir"/*.override diff --git a/main/postmarketos-ui-gnome-mobile/APKBUILD b/main/postmarketos-ui-gnome-mobile/APKBUILD index da7d16877..616bc7cbb 100644 --- a/main/postmarketos-ui-gnome-mobile/APKBUILD +++ b/main/postmarketos-ui-gnome-mobile/APKBUILD @@ -26,12 +26,10 @@ depends=" networkmanager-elogind pinentry-gnome polkit-gnome - postmarketos-artwork-wallpapers-gnome postmarketos-base-ui-gnome tracker tracker-miners udisks2 - xwayland " _pmb_recommends=" calls diff --git a/main/postmarketos-ui-gnome/APKBUILD b/main/postmarketos-ui-gnome/APKBUILD index be574cbf4..4686ec849 100644 --- a/main/postmarketos-ui-gnome/APKBUILD +++ b/main/postmarketos-ui-gnome/APKBUILD @@ -18,7 +18,6 @@ depends=" kgx postmarketos-base-ui-gnome postmarketos-base-ui-gnome-wallpaper-pmos - xwayland " install="$pkgname.post-install $pkgname.post-upgrade" source="firefox-wayland.sh" diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD index f9c811b0d..a6557a109 100644 --- a/main/postmarketos-ui-phosh/APKBUILD +++ b/main/postmarketos-ui-phosh/APKBUILD @@ -46,7 +46,6 @@ _pmb_recommends=" mobile-config-firefox phosh-mobile-settings portfolio - postmarketos-artwork-wallpapers postmarketos-default-camera postmarketos-tweaks postmarketos-welcome