phosh: update

recipes-gtk/phosh/phosh/0001-meson-build-without-subproject-wrap.patch

@@ -0,0 +1,72 @@
+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>
+---
+ meson.build | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 9dabba8c..32a568ec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -147,35 +147,35 @@ 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'],
+   default_options: ['introspection=disabled', 'daemon=false', 'gtk_doc=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.105')
+ libsoup_dep = dependency('libsoup-3.0', version: '>= 3.0')
+-- 
+2.45.2
+

recipes-gtk/phosh/phosh/0001-meson.build-dont-read-includedir-from-pkg-config.patch

@@ -1,4 +1,4 @@
-From bfd49ad17c115899bdec41f5819fef21f622e620 Mon Sep 17 00:00:00 2001
+From a2d3acc00525815dc84069c830606823d66935aa Mon Sep 17 00:00:00 2001
 From: Markus Volk <f_l_k@t-online.de>
 Date: Thu, 6 Jun 2024 21:21:19 +0200
 Subject: [PATCH] meson.build: dont read includedir from pkg-config
@@ -9,10 +9,10 @@ This sets includedir to /usr/include which is inappropriate for cross-compiling.
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/meson.build b/src/meson.build
-index f9107b26..8bddeace 100644
+index 5a772b89..7f94379a 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -343,12 +343,12 @@ libphosh_sources = files(
+@@ -366,12 +366,12 @@ libphosh_sources = files(
  ]
  
  # See https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/394
@@ -29,8 +29,5 @@ index f9107b26..8bddeace 100644
 +#  )
 +#endif
  
- phosh_deps = [
+ 
-   libsoup_dep,
+ # Headers are bundled as they're not shipped by gnome-bluetooth
--- 
-2.45.1
-

recipes-gtk/phosh/phosh_git.bb

@@ -6,18 +6,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 REQUIRED_DISTRO_FEATURES = "wayland polkit pam pulseaudio"
 
 DEPENDS = " \
-    callaudiod \
+    libcall-ui \
     evolution-data-server \
     evince \
     feedbackd \
     fribidi \
     glib-2.0 \
     gmobile \
+    gnome-bluetooth \
     gnome-desktop \
     gtk+3 \
     gcr3 \
     libgudev \
     libhandy \
+    libgnome-volume-control \
     libsecret \
     networkmanager \
     polkit \
@@ -51,11 +53,12 @@ inherit features_check gsettings meson pkgconfig gtk-icon-cache gobject-introspe
 SRC_URI = " \
     gitsm://gitlab.gnome.org/World/Phosh/phosh.git;protocol=https;nobranch=1 \
     file://0001-meson.build-dont-read-includedir-from-pkg-config.patch \
+    file://0001-meson-build-without-subproject-wrap.patch \
 "
 
 S = "${WORKDIR}/git"
-PV = "0.40.0"
+PV = "0.41.0"
-SRCREV = "afef417667369f4943c8acfa24b4477e4197359e"
+SRCREV = "5af045742f347f5f0622842dfe553f5666eb4f8f"
 
 EXTRA_OEMESON += "--buildtype=release"