diff --git a/main/postmarketos-base-ui-gnome/10_pmOS-wallpaper.gschema.override b/main/postmarketos-base-ui-gnome/10_pmOS-wallpaper.gschema.override deleted file mode 100644 index a8bd9307b..000000000 --- a/main/postmarketos-base-ui-gnome/10_pmOS-wallpaper.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.gnome.desktop.background] -picture-uri='file:///usr/share/wallpapers/postmarketos.jpg' diff --git a/main/postmarketos-base-ui-gnome/APKBUILD b/main/postmarketos-base-ui-gnome/APKBUILD index b462bb937..0d917d4b7 100644 --- a/main/postmarketos-base-ui-gnome/APKBUILD +++ b/main/postmarketos-base-ui-gnome/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Oliver Smith pkgname=postmarketos-base-ui-gnome pkgver=3 -pkgrel=2 +pkgrel=3 pkgdesc="Meta package for shared configuration for GNOME-based UIs" url="https://postmarketos.org" arch="noarch" @@ -17,6 +17,7 @@ depends=" modemmanager modemmanager-openrc polkit-elogind + postmarketos-artwork-wallpapers postmarketos-base-ui postmarketos-base-ui-networkmanager power-profiles-daemon @@ -29,10 +30,8 @@ depends=" install="$pkgname.post-install $pkgname.post-upgrade" source=" 00_postmarketos-base-ui-gnome.gschema.override - 10_pmOS-wallpaper.gschema.override " options="!check" -subpackages="$pkgname-wallpaper-pmos:wallpaper_pmos" _pmb_recommends=" evince @@ -50,7 +49,6 @@ _pmb_recommends=" gnome-text-editor lollypop loupe - postmarketos-artwork-wallpapers xdg-user-dirs xdg-user-dirs-gtk " @@ -60,15 +58,6 @@ package() { "$srcdir"/*.override } -# GNOME and Phosh depend on this package to set the pmOS wallpaper. GNOME -# Mobile has a custom wallpaper because it directly draws icons and text on it -# and it would be hard to read with the default wallpaper. -wallpaper_pmos() { - depends="postmarketos-artwork-wallpapers" - amove usr/share/glib-2.0/schemas/10_pmOS-wallpaper.gschema.override -} - sha512sums=" 1f68138876f2270943c88fd6f914f156692397a840f4945564cce0ed6e5d56943661fee025e0e4e0881b5df18a4f5f290086eb67be945e59abd5fe4c71cf5e67 00_postmarketos-base-ui-gnome.gschema.override -f44d4e2544d44119ed1ab9fb454a20d1fc050925a029ce10df4d7c20da3d1f461b018cdd6129272e38e50179d1e5ff71b72d3cc4dbce28113fe1b3561a2e84b5 10_pmOS-wallpaper.gschema.override " diff --git a/main/postmarketos-ui-gnome-mobile/APKBUILD b/main/postmarketos-ui-gnome-mobile/APKBUILD index e42e1a027..ae373fde7 100644 --- a/main/postmarketos-ui-gnome-mobile/APKBUILD +++ b/main/postmarketos-ui-gnome-mobile/APKBUILD @@ -55,6 +55,5 @@ package() { -t "$pkgdir"/etc/profile.d/ } sha512sums=" -f96f0b57f197d911810e3f3786ffbcc0c6bfae71037e9fc97825f5bb2ea3b7fe149271f991454b240b8d1a596d998dcf410ab6ce9a46c5e2d17cee6d03b867a2 20_pmOS-wallpaper-gnome-mobile.gschema.override 0d9ec58be7dc354e181989c7f08e7d4dd93fefd06a99e784b87fe898479dd47a40dfa9689c6a63ebdc04bf87883a270686aec27f7cc34cb21ec0f370a4afe2d8 firefox-wayland.sh " diff --git a/main/postmarketos-ui-gnome/APKBUILD b/main/postmarketos-ui-gnome/APKBUILD index 034018de8..52db205fc 100644 --- a/main/postmarketos-ui-gnome/APKBUILD +++ b/main/postmarketos-ui-gnome/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Oliver Smith pkgname=postmarketos-ui-gnome pkgver=3 -pkgrel=7 +pkgrel=8 pkgdesc="(Wayland) Gnome Shell" url="https://gnome.org/" # armhf blocked by gnome-shell -> gjs -> mozjs102 @@ -16,7 +16,6 @@ depends=" gdm gnome postmarketos-base-ui-gnome - postmarketos-base-ui-gnome-wallpaper-pmos " _pmb_recommends=" gnome-calendar diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD index 995bbd50e..fff283097 100644 --- a/main/postmarketos-ui-phosh/APKBUILD +++ b/main/postmarketos-ui-phosh/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Newbyte pkgname=postmarketos-ui-phosh pkgver=22.3 -pkgrel=4 +pkgrel=5 pkgdesc="(Wayland) Mobile UI initially developed for the Librem 5" url="https://phosh.mobi" arch="noarch !armhf" @@ -18,7 +18,6 @@ depends=" gnome-keyring phosh postmarketos-base-ui-gnome - postmarketos-base-ui-gnome-wallpaper-pmos postmarketos-base-ui-qt-tweaks postmarketos-base-ui-qt-wayland tinydm