From f5d4bef1b276fe3f61409f11db7211cb7891914e Mon Sep 17 00:00:00 2001
From: fossdd <fossdd@pwned.life>
Date: Wed, 13 Nov 2024 12:11:17 +0100
Subject: [PATCH] main/postmarketos-ui-phosh: remove blue accent color override

Phosh 0.43 supports accent colors with the xdg-desktop-portal-phosh.

This reverts commit d6344ca12490e08b722f1da543eb8faf2223213d.
---
 .../20_postmarketos-blue-accent.gschema.override     | 12 ------------
 main/postmarketos-ui-phosh/APKBUILD                  | 10 ++--------
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 main/postmarketos-ui-phosh/20_postmarketos-blue-accent.gschema.override

diff --git a/main/postmarketos-ui-phosh/20_postmarketos-blue-accent.gschema.override b/main/postmarketos-ui-phosh/20_postmarketos-blue-accent.gschema.override
deleted file mode 100644
index cf89a7fcc..000000000
--- a/main/postmarketos-ui-phosh/20_postmarketos-blue-accent.gschema.override
+++ /dev/null
@@ -1,12 +0,0 @@
-# With 87a596f7867a49fae78c05042a92bea3e5e24b0d all GNOME-based UIs have the
-# default accent color set to green.
-#
-# Phosh hasn't implemented accent colors and using green accent colors for apps
-# but not for the shell look inconsistent.
-#
-# Therefore set the blue accent color back until phosh has support for accent colors
-#
-# Ref: https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1533
-# Ref: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3218
-[org.gnome.desktop.interface]
-accent-color='blue'
diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD
index baa722c5f..426a53344 100644
--- a/main/postmarketos-ui-phosh/APKBUILD
+++ b/main/postmarketos-ui-phosh/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-phosh
-pkgver=22.4
-pkgrel=1
+pkgver=22.5
+pkgrel=0
 pkgdesc="(Wayland) Mobile UI initially developed for the Librem 5"
 url="https://phosh.mobi"
 arch="noarch !armhf"
@@ -29,7 +29,6 @@ _pmb_groups="feedbackd"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	01_postmarketos-ui-phosh.gschema.override
-	20_postmarketos-blue-accent.gschema.override
 	mimeapps.list
 	udiskie.desktop
 	"
@@ -43,10 +42,6 @@ package() {
 		"$pkgdir"/usr/share/applications/mimeapps.list
 	install -Dm644 "$srcdir"/udiskie.desktop \
 		"$pkgdir"/etc/xdg/autostart/udiskie.desktop
-
-	# TODO: Remove once Phosh supports accent colors
-	install -Dm644 "$srcdir"/20_postmarketos-blue-accent.gschema.override \
-		-t "$pkgdir"/usr/share/glib-2.0/schemas/
 }
 
 openrc() {
@@ -69,7 +64,6 @@ systemd() {
 
 sha512sums="
 e577b8073df680ccee75ef5b6bb1f2877d5727687d63d6fd9211298e791b6c9f593eb79278c77a4b4918e3c57333c2a012030baf5a3c8d6d16000cc63a030f84  01_postmarketos-ui-phosh.gschema.override
-f835435eea55184256229741f6ed2aa1a31d9c0dadaf0d2698a35fbeecae042b00f15ea991b0abc6b19db9e90b53879afcfa3be8721af29b28e4809973e485e8  20_postmarketos-blue-accent.gschema.override
 a741e8db9e4232334b924326c48be4e4c8f7a2382a7608926918a7491c518b2dda551e55a00d4d5fcf58c7950a78dc35d5cc5eaab53ad93a56de40887071f242  mimeapps.list
 53f5c565b4ca8a12f12b63ec84a0194ef530703565d123203d41582a35a54d66afaf3a676df158ae0effe327dcfc1c6496a082ce9dbe803b2547417c3c3fad6e  udiskie.desktop
 "