systemd/phosh: upgrade to 0.48.0
Part-of: https://gitlab.postmarketos.org/postmarketos/pmaports/-/merge_requests/6701 [ci:skip-build]: already built successfully in CI
This commit is contained in:
fossdd
parent
b1f2ccc683
commit
0a568971a1
3 changed files with 5 additions and 138 deletions
|
|
@ -1,9 +1,9 @@
|
|||
# Forked from Alpine for systemd split func
|
||||
maintainer="fossdd <fossdd@pwned.life>"
|
||||
pkgname=phosh
|
||||
_pkgver=0.47.0
|
||||
_pkgver=0.48.0
|
||||
pkgver=9999$_pkgver
|
||||
pkgrel=2
|
||||
pkgrel=0
|
||||
pkgdesc="Wayland shell for GNOME on mobile devices"
|
||||
# armhf: blocked by gnome-shell-schemas and pmb#2618
|
||||
arch="all !armhf"
|
||||
|
|
@ -54,7 +54,7 @@ makedepends="
|
|||
wayland-dev
|
||||
wayland-protocols
|
||||
"
|
||||
checkdepends="xvfb-run"
|
||||
checkdepends="xvfb-run xmlstarlet"
|
||||
# the ordering here is important - libphosh split functions need to run first to move the libphosh-0
|
||||
# headers/pkgconfig/lib into the libphosh packages, before the top level -dev package gobbles
|
||||
# up the rest.
|
||||
|
|
@ -68,10 +68,7 @@ subpackages="
|
|||
$pkgname-portalsconf
|
||||
$pkgname-systemd
|
||||
"
|
||||
source="https://sources.phosh.mobi/releases/phosh/phosh-${_pkgver/_/.}.tar.xz
|
||||
media-player.patch
|
||||
update-force-adaptive-list.patch
|
||||
"
|
||||
source="https://sources.phosh.mobi/releases/phosh/phosh-${_pkgver/_/.}.tar.xz"
|
||||
builddir="$srcdir/$pkgname-${_pkgver/_/.}"
|
||||
# TODO: crossdirect disabled due to armv7 crosscompile failure on x86_64, see
|
||||
# https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2820
|
||||
|
|
@ -113,7 +110,5 @@ libphosh_dev() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
19c150d28921b383269e4c95d353b7ea69e62cc4075a7a1e1523aa0977b347898d16df7d88861e5d029469a881623e15673ee270c3c514db123aec683ec8194d phosh-0.47.0.tar.xz
|
||||
20bf4d50611560e14182c7cb139aadcf59508f57caefe564e0cfe7d29e7c3e9985c787f832f353b7c7f017e6b373ef0a7b69368071ac0ba4b2a6160ad606f0a9 media-player.patch
|
||||
b4cf4c1dd5993cdb1d77daa066be46768e65231a3b9d89aba02e7326882b0dfca69ca4fa69cb2c25b41d974e81f1a9a858e7bda669d376097a6c3615bf665c8c update-force-adaptive-list.patch
|
||||
7d689b29d39aae0937fdcf22c8fe5267de6174487d75df67a3d71e7cb23b765ce138e8c7769256cb0ca006241692ec8376f5119f1c576c2ea2edc437abcda335 phosh-0.48.0.tar.xz
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
Patch-Source: https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1728
|
||||
---
|
||||
From 2f70c2272c3d77bbe8141fd468852f7f6caabe4e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
|
||||
Date: Mon, 2 Jun 2025 14:16:01 +0200
|
||||
Subject: [PATCH 1/2] media-player: Don't forget to init cancellable
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Otherwise cancelling will have no effect and we might end up accessing
|
||||
free'd memory.
|
||||
|
||||
Fixes 2ca148785 ("media-player: Use MPRIS manager")
|
||||
Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1234
|
||||
|
||||
Signed-off-by: Guido Günther <agx@sigxcpu.org>
|
||||
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1726>
|
||||
(cherry picked from commit f9d7d6851570845633ea91f3bdcb8dcdfb49259e)
|
||||
---
|
||||
src/media-player.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/media-player.c b/src/media-player.c
|
||||
index 6ecb88c38..a66b9d0cb 100644
|
||||
--- a/src/media-player.c
|
||||
+++ b/src/media-player.c
|
||||
@@ -796,6 +796,7 @@ phosh_media_player_init (PhoshMediaPlayer *self)
|
||||
|
||||
gtk_widget_init_template (GTK_WIDGET (self));
|
||||
|
||||
+ self->cancel = g_cancellable_new ();
|
||||
self->track_length = -1;
|
||||
self->track_position = -1;
|
||||
self->pos_poller_id = 0;
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 7b1dfcf1ecf015fb4dc7eeda7fc09a72e1d8472c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
|
||||
Date: Wed, 4 Jun 2025 22:39:03 +0200
|
||||
Subject: [PATCH 2/2] media-player: Init fetch icon cancellable
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes f287f5deb ("media-player: Fetch cover art via http")
|
||||
|
||||
Signed-off-by: Guido Günther <agx@sigxcpu.org>
|
||||
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1726>
|
||||
(cherry picked from commit 568ba3f84cd75d6054e2b8764f47e35adf2aaf23)
|
||||
---
|
||||
src/media-player.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/media-player.c b/src/media-player.c
|
||||
index a66b9d0cb..554d5586f 100644
|
||||
--- a/src/media-player.c
|
||||
+++ b/src/media-player.c
|
||||
@@ -446,6 +446,9 @@ fetch_icon_async (PhoshMediaPlayer *self, const char *url)
|
||||
|
||||
g_debug ("Fetching icon for %s", url);
|
||||
|
||||
+ if (!self->fetch_icon_cancel)
|
||||
+ self->fetch_icon_cancel = g_cancellable_new ();
|
||||
+
|
||||
icon = g_file_icon_new (file);
|
||||
g_loadable_icon_load_async (G_LOADABLE_ICON (icon),
|
||||
ART_PIXEL_SIZE,
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
Patch-Source:
|
||||
https://gitlab.gnome.org/World/Phosh/phosh/-/commit/26cea5baa6e4ad840c958f7ee3c48b0d0d5675d2,
|
||||
https://gitlab.gnome.org/World/Phosh/phosh/-/commit/f8d0b2da186e97c98147a511f6f9bb85de2d223a
|
||||
---
|
||||
From 26cea5baa6e4ad840c958f7ee3c48b0d0d5675d2 Mon Sep 17 00:00:00 2001
|
||||
From: fossdd <fossdd@pwned.life>
|
||||
Date: Sun, 25 May 2025 22:15:28 +0200
|
||||
Subject: [PATCH] data: Update list of adaptive apps
|
||||
|
||||
Loupe and Showtime already merged the patches to list their form
|
||||
factors, while the MR in gnome-calendar is still open.
|
||||
|
||||
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1723>
|
||||
---
|
||||
data/00_mobi.Phosh.gschema.override | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/00_mobi.Phosh.gschema.override b/data/00_mobi.Phosh.gschema.override
|
||||
index 8d54ba225..e33e4060f 100644
|
||||
--- a/data/00_mobi.Phosh.gschema.override
|
||||
+++ b/data/00_mobi.Phosh.gschema.override
|
||||
@@ -29,4 +29,6 @@ power-button-action='nothing'
|
||||
unlock-sim=true
|
||||
|
||||
[sm.puri.phosh:Phosh]
|
||||
-force-adaptive=['firefox-esr.desktop', 'org.gnome.Calendar.desktop']
|
||||
+# gnome-calendar: https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1697
|
||||
+# Loupe and Showtime will be fixed with GNOME 49
|
||||
+force-adaptive=['firefox-esr.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Loupe', 'org.gnome.Showtime']
|
||||
--
|
||||
GitLab
|
||||
|
||||
From f8d0b2da186e97c98147a511f6f9bb85de2d223a Mon Sep 17 00:00:00 2001
|
||||
From: fossdd <fossdd@pwned.life>
|
||||
Date: Mon, 26 May 2025 01:28:17 +0200
|
||||
Subject: [PATCH] data: Fix typo in override gschema
|
||||
|
||||
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1724>
|
||||
---
|
||||
data/00_mobi.Phosh.gschema.override | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/00_mobi.Phosh.gschema.override b/data/00_mobi.Phosh.gschema.override
|
||||
index e33e4060f..b34d026d3 100644
|
||||
--- a/data/00_mobi.Phosh.gschema.override
|
||||
+++ b/data/00_mobi.Phosh.gschema.override
|
||||
@@ -31,4 +31,4 @@ unlock-sim=true
|
||||
[sm.puri.phosh:Phosh]
|
||||
# gnome-calendar: https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1697
|
||||
# Loupe and Showtime will be fixed with GNOME 49
|
||||
-force-adaptive=['firefox-esr.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Loupe', 'org.gnome.Showtime']
|
||||
+force-adaptive=['firefox-esr.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Loupe.desktop', 'org.gnome.Showtime.desktop']
|
||||
--
|
||||
GitLab
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue