From a187026d46fd0cf587c3352c910eb48ca3299a04 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Sun, 5 Apr 2026 22:18:36 +0200
Subject: [PATCH] phosh: update

---
 ...-meson-build-without-subproject-wrap.patch | 76 -------------------
 .../{phosh_0.45.0.bb => phosh_0.54.0.bb}      | 16 ++--
 2 files changed, 9 insertions(+), 83 deletions(-)
 delete mode 100644 recipes-gtk/phosh/phosh/0001-meson-build-without-subproject-wrap.patch
 rename recipes-gtk/phosh/{phosh_0.45.0.bb => phosh_0.54.0.bb} (66%)

diff --git a/recipes-gtk/phosh/phosh/0001-meson-build-without-subproject-wrap.patch b/recipes-gtk/phosh/phosh/0001-meson-build-without-subproject-wrap.patch
deleted file mode 100644
index 9280afa..0000000
--- a/recipes-gtk/phosh/phosh/0001-meson-build-without-subproject-wrap.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From da96ea97125c7486eb3604844ef453d2b8b2442c Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Tue, 20 Aug 2024 12:41:01 +0200
-Subject: [PATCH] meson: build without subproject wrap
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-
-Upstream-Status: Pending
----
- meson.build | 38 +++++++++++++++++++-------------------
- 1 file changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index d3c2c10a..0964f9ba 100644
---- a/meson.build
-+++ b/meson.build
-@@ -147,13 +147,13 @@ gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas', version:
- gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
- gtk_wayland_dep = dependency('gtk+-wayland-3.0', version: '>=3.22')
- gudev_dep = dependency('gudev-1.0')
--libcall_ui = subproject('libcall-ui',
--  default_options: [
--    'examples=false',
--    'gtk_doc=false',
--    'tests=false',
--    'install-i18n=@0@'.format(get_option('callui-i18n')),
--  ])
-+#libcall_ui = subproject('libcall-ui',
-+#  default_options: [
-+#    'examples=false',
-+#    'gtk_doc=false',
-+#    'tests=false',
-+#    'install-i18n=@0@'.format(get_option('callui-i18n')),
-+#  ])
- libfeedback_dep = dependency('libfeedback-0.0',
-   version: '>= 0.4.0',
-   fallback: ['libfeedback', 'libfeedback_dep'],
-@@ -163,23 +163,23 @@ libfeedback_dep = dependency('libfeedback-0.0',
-      'gtk_doc=false',
-      'tests=false'],
-   )
--libgvc = subproject('gvc',
--  default_options: [
--    'package_name=' + meson.project_name(),
--    'package_version=' + meson.project_version(),
--    'pkgdatadir=' + pkgdatadir,
--    'pkglibdir=' + pkglibdir,
--    'static=true',
--    'introspection=false',
--    'alsa=false'
--  ])
--libgvc_dep = libgvc.get_variable('libgvc_dep')
-+#libgvc = subproject('gvc',
-+#  default_options: [
-+#    'package_name=' + meson.project_name(),
-+#    'package_version=' + meson.project_version(),
-+#    'pkgdatadir=' + pkgdatadir,
-+#    'pkglibdir=' + pkglibdir,
-+#    'static=true',
-+#    'introspection=false',
-+#    'alsa=false'
-+#  ])
-+libgvc_dep = dependency('gvc')
- libhandy_dep = dependency('libhandy-1',
-   version: '>=1.1.90',
-   fallback: ['libhandy', 'libhandy_dep'],
-   default_options: ['introspection=disabled']
-   )
--libcall_ui_dep = libcall_ui.get_variable('libcall_ui_dep')
-+libcall_ui_dep = dependency('call-ui')
- libnm_dep = dependency('libnm', version: '>= 1.14')
- libpolkit_agent_dep = dependency('polkit-agent-1', version: '>= 0.122')
- libsoup_dep = dependency('libsoup-3.0', version: '>= 3.6')
--- 
-2.47.1
-
diff --git a/recipes-gtk/phosh/phosh_0.45.0.bb b/recipes-gtk/phosh/phosh_0.54.0.bb
similarity index 66%
rename from recipes-gtk/phosh/phosh_0.45.0.bb
rename to recipes-gtk/phosh/phosh_0.54.0.bb
index c4f1e91..80c067d 100644
--- a/recipes-gtk/phosh/phosh_0.45.0.bb
+++ b/recipes-gtk/phosh/phosh_0.54.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 REQUIRED_DISTRO_FEATURES = "wayland polkit pam pulseaudio"
 
 DEPENDS = " \
-    libcall-ui \
+    callaudiod \
     evolution-data-server \
     evince \
     feedbackd \
@@ -19,11 +19,11 @@ DEPENDS = " \
     gcr3 \
     libgudev \
     libhandy \
-    libgnome-volume-control \
     libsecret \
     networkmanager \
     polkit \
     pulseaudio \
+    qrcodegen \
     libsoup \
     upower \
     wayland \
@@ -50,12 +50,14 @@ PACKAGECONFIG ?= ""
 
 inherit features_check gsettings meson pkgconfig gtk-icon-cache gobject-introspection gi-docgen
 
-SRC_URI = " \
-    git://gitlab.gnome.org/World/Phosh/phosh.git;protocol=https;nobranch=1 \
-    file://0001-meson-build-without-subproject-wrap.patch \
-"
+SRC_URI = "git://gitlab.gnome.org/World/Phosh/phosh.git;protocol=https;nobranch=1;name=phosh"
+SRC_URI += "git://gitlab.gnome.org/GNOME/libgnome-volume-control.git;protocol=https;subdir=${S}/subprojects/gvc;name=gvc;nobranch=1"
+SRC_URI += "git://gitlab.gnome.org/World/Phosh/libcall-ui;protocol=https;subdir=${S}/subprojects/libcall-ui;name=libcall-ui;nobranch=1"
+SRCREV_phosh = "484333d2b0536bb0eb1aae61884bcdd978bad49f"
+SRCREV_gvc = "d2442f455844e5292cb4a74ffc66ecc8d7595a9f"
+SRCREV_libcall-ui = "7389b4ae90e101620ef8e790e76a98e434bd920c"
+SRCREV_FORMAT = "phosh"
 
-SRCREV = "2ac03f70f8d42b729def38e282f5b600286655fb"
 
 EXTRA_OEMESON += "--buildtype=release"