forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/postmarketos-artwork: fix broken wallpapers (MR 5015)

Browse source 
* Bring back /usr/share/wallpapers/postmarketos.jpg, which is used in at
  least as the default in sway, mate, lxqt, xfce4
* Move postmarketos-gnome.xml here (instead of taking the version from
  artwork.git), because the paths mentioned in the xml file are also set
  in this package in pmaports. This makes it easier to maintain.
* Fix the paths in postmarketos-gnome.xml (postmarketos vs
  postmarketOS).
* Keep the postmarketos-gnome.xml name, as we had it before recent
  wallpaper changes, and as it is the same name in v23.12 still. This
  should make it backwards compatible for people upgrading from v23.12.
* Move 10_pmOS-wallpaper.gschema.override here for the same reason.

Fixes: 72357ecf ("main/postmarketos-artwork: upgrade to Meadow wallpaper and make Plasma-compatible (MR 4805)")
[ci:skip-build]: already built successfully in CI
This commit is contained in:
Oliver Smith 2024-04-07 23:21:22 +02:00
parent 1712a2d03a
commit 126f432206
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 59 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main/postmarketos-artwork/10_pmOS-wallpaper.gschema.override Normal file
View file

@ -0,0 +1,3 @@
[org.gnome.desktop.background]
picture-uri='file:///usr/share/wallpapers/postmarketos/contents/images/2707x2707.png'
picture-uri-dark='file:///usr/share/wallpapers/postmarketos/contents/images_dark/2707x2707.png'

48
main/postmarketos-artwork/APKBUILD
View file

@ -1,20 +1,28 @@
# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=postmarketos-artwork
pkgver=5
pkgrel=0
pkgrel=1
pkgdesc="Meta package for the postmarketOS artwork"
url="https://postmarketos.org/"
arch="noarch"
license="CC-BY-SA-4.0"
_hash="f28dd5fef287c970f50ca49bc44814ee1e3b229d"
source="postmarketos-artwork-$_hash.tar.gz::https://gitlab.com/postmarketOS/artwork/-/archive/$_hash/artwork-$_hash.tar.gz"
source="postmarketos-artwork-$_hash.tar.gz::https://gitlab.com/postmarketOS/artwork/-/archive/$_hash/artwork-$_hash.tar.gz
10_pmOS-wallpaper.gschema.override
postmarketos-gnome.xml
"
subpackages="
$pkgname-wallpapers
$pkgname-wallpapers-extra:wallpapers_extra
$pkgname-wallpapers-gnome:wallpapers_gnome
$pkgname-icons
$pkgname-sounds
"
options="!check"
makedepends="
imagemagick
imagemagick-jpeg
"
options="!check pmb:cross-native"
builddir="$srcdir"/artwork-$_hash
package() {
@ -23,15 +31,31 @@ package() {
wallpapers() {
pkgdesc="Wallpapers for postmarketOS"
mkdir -p "$subpkgdir"/usr/share/wallpapers
# To avoid complexity, we only package the most recent wallpaper.
# Checklist for changing the wallpaper:
# - Add the new wallpaper here: https://postmarketos.org/wallpapers
# - Adjust the path in the "cp" line below
# - If paths inside the wallpaper dir (e.g. 2024/meadow) are different,
# then adjust them here:
# - postmarketos.jpg symlink/conversion below
# - postmarketos-gnome.xml
# - 10_pmOS-wallpaper.gschema.override
cp -r "$builddir"/wallpapers/2024/meadow \
"$subpkgdir"/usr/share/wallpapers/postmarketos
install -Dm644 "$builddir"/wallpapers/gnome/pmos.xml \
"$subpkgdir"/usr/share/gnome-background-properties/postmarketos.xml
# /usr/share/wallpapers/postmarketos.jpg should always point to the
# current wallpaper so we don't break configs
convert "$subpkgdir"/usr/share/wallpapers/postmarketos/contents/images/2707x2707.png \
-format jpeg \
"$subpkgdir"/usr/share/wallpapers/postmarketos.jpg
}
wallpapers_extra() {
pkgdesc="Additional Wallpapers for postmarketOS"
mkdir -p "$subpkgdir"/usr/share/wallpapers/
install -Dm644 "$builddir"/wallpapers/extra/* \
"$subpkgdir"/usr/share/wallpapers/
@ -47,8 +71,19 @@ wallpapers_extra() {
"$subpkgdir"/usr/share/wallpapers/pmos.jpg
}
wallpapers_gnome() {
pkgdesc="Wallpaper configuration for GNOME-based UIs"
install_if="postmarketos-artwork-wallpapers=$pkgver-r$pkgrel postmarketos-base-ui-gnome"
install -Dm644 "$srcdir"/postmarketos-gnome.xml \
-t "$subpkgdir"/usr/share/gnome-background-properties/
install -Dm644 "$srcdir"/10_pmOS-wallpaper.gschema.override \
-t "$subpkgdir"/usr/share/glib-2.0/schemas
}
icons() {
pkgdesc="Icons for postmarketOS"
install -Dm644 "$builddir"/logo/logo.svg \
"$subpkgdir"/usr/share/pixmaps/postmarketos-logo.svg
install -Dm644 "$builddir"/logo/logo-phone.svg \
@ -57,6 +92,7 @@ icons() {
sounds() {
pkgdesc="Sounds for postmarketOS"
mkdir -p "$subpkgdir"/usr/share/sounds/postmarketOS/
install -Dm644 "$builddir"/tones/battery_low.mid \
"$subpkgdir"/usr/share/sounds/postmarketOS/
@ -68,4 +104,6 @@ sounds() {
sha512sums="
cef2326a28dbd597f3d679329aaac17031bf1fdc60f634bc25cf20b23e62028961c5f228570df824615b21616a18ab2fd290a770cfd4f3ca1d929ac552a34ea8 postmarketos-artwork-f28dd5fef287c970f50ca49bc44814ee1e3b229d.tar.gz
6464a9246d1c9cac5cd2f55345f1659e872377f941160132c897c8c08955bb61083fec6daa8993a34bffdcc900a29f7ae6438fe86a476242447ddccf4e937d06 10_pmOS-wallpaper.gschema.override
0bcdfb41adb02b657ee0f9938d134d551fa8c3ef166e8a7895908d1dd355119143088641196505b3e2018896ae39a5392032de114aa602f4911b3aeadddd7b60 postmarketos-gnome.xml
"

13
main/postmarketos-artwork/postmarketos-gnome.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
<wallpapers>
<wallpaper deleted="false">
<name>postmarketOS Wallpapers</name>
<filename>/usr/share/wallpapers/postmarketos/contents/images/2707x2707.png</filename>
<filename-dark>/usr/share/wallpapers/postmarketos/contents/images_dark/2707x2707.png</filename-dark>
<options>zoom</options>
<shade_type>solid</shade_type>
<pcolor>#73A82F</pcolor>
<scolor>#000000</scolor>
</wallpaper>
</wallpapers>