community/phosh: add patch to fix app some icons

Issue: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1010
Taken from: https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1333
This commit is contained in:
Newbyte 2023-12-10 00:14:12 +01:00 committed by omni
parent 7e6350a509
commit 55d863db48
2 changed files with 45 additions and 1 deletions

View File

@ -5,7 +5,7 @@
# Maintainer: jane400 <alpine@j4ne.de>
pkgname=phosh
pkgver=0.34.0
pkgrel=0
pkgrel=1
pkgdesc="Wayland shell for GNOME on mobile devices"
# armhf: blocked by gnome-shell-schemas
# Blocked on s390x by gnome-session, gnome-settings-daemon, squeekboard and libhandy
@ -61,6 +61,7 @@ subpackages="$pkgname-dbg $pkgname-lang $pkgname-dev $pkgname-doc $pkgname-porta
source="https://download.gnome.org/sources/phosh/${pkgver%.*}/phosh-$pkgver.tar.xz
phosh.desktop
fix-keyboard-button-hidden.patch
revert-graceful-app_id.patch
"
build() {
@ -93,4 +94,5 @@ sha512sums="
e9e9fbb84bb1d33ca196bba1d06e416a90408db54e07fff9b27aaf5315cc3982e43205d168d4e91471573c65f778092fbb0a607af8f53017a965327688ba351e phosh-0.34.0.tar.xz
8ca4893a751311de326e198314669f5a276092ade99c6353c4c9ce070713fb1a5b1615e7fecb93b428dc79fd4001a9af43d24eafaf2545d7db464963fda25330 phosh.desktop
c9064ea152eea903de0a376b2130dada77ba9ffc8c03542992f404a4bf53c7969aa0dddc02e1f45d040fe3e0a3bf0a5561ed35ee6ce3f643613b7c29e99708af fix-keyboard-button-hidden.patch
2d584cbef8d14fbaeddbefb3ec1c10666829af5b0d18f9235e3843fc2bf63543e49975c56997a613b669c381294ea84d0086516d765127b91fdfdb492dce99ae revert-graceful-app_id.patch
"

View File

@ -0,0 +1,42 @@
From dbabad39123220898290166469d441a05fc9a481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sat, 9 Dec 2023 20:13:05 +0100
Subject: [PATCH] util: Revert "Be more gracefull on the app_id"
This breaks telegram desktop with app-id org.telegram.desktop and a
desktop file of org.telegram.desktop.desktop.
We *only* made that change to not change the behaviour of the
end-session-dialog. All inhibitors there do have a proper app-id though
so let's just live without not appending '.desktop' there either.
This reverts commit 2a3763303b4305058ee0ff5f2b76b31016e80114.
Reported-by: Newbyte <newbie13xd@gmail.com>
Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1010
---
src/util.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/util.c b/src/util.c
index 87564b393..95879b7f5 100644
--- a/src/util.c
+++ b/src/util.c
@@ -77,12 +77,8 @@ phosh_get_desktop_app_info_for_app_id (const char *app_id)
}
}
- if (!g_str_has_suffix (app_id, ".desktop"))
- desktop_id = g_strdup_printf ("%s.desktop", app_id);
- else
- desktop_id = g_strdup (app_id);
-
- g_assert (desktop_id);
+ desktop_id = g_strdup_printf ("%s.desktop", app_id);
+ g_return_val_if_fail (desktop_id, NULL);
app_info = g_desktop_app_info_new (desktop_id);
if (app_info)
--
GitLab