phosh: update

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

@@ -9,10 +9,10 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
  1 file changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 9dabba8c..32a568ec 100644
+index d3c2c10a..0964f9ba 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -147,35 +147,35 @@ gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas', version:
+@@ -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')
@@ -33,7 +33,9 @@ index 9dabba8c..32a568ec 100644
  libfeedback_dep = dependency('libfeedback-0.0',
    version: '>= 0.4.0',
    fallback: ['libfeedback', 'libfeedback_dep'],
-   default_options: ['introspection=disabled', 'daemon=false', 'gtk_doc=false']
+@@ -163,23 +163,23 @@ libfeedback_dep = dependency('libfeedback-0.0',
+      'gtk_doc=false',
+      'tests=false'],
    )
 -libgvc = subproject('gvc',
 -  default_options: [
@@ -65,8 +67,8 @@ index 9dabba8c..32a568ec 100644
 -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')
+ libpolkit_agent_dep = dependency('polkit-agent-1', version: '>= 0.122')
+ libsoup_dep = dependency('libsoup-3.0', version: '>= 3.6')
 -- 
-2.45.2
+2.47.1
 

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

@@ -1,33 +0,0 @@
-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
-
-This sets includedir to /usr/include which is inappropriate for cross-compiling.
----
- src/meson.build | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 5a772b89..7f94379a 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -366,12 +366,12 @@ libphosh_sources = files(
- ]
- 
- # See https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/394
--if libsoup_dep.version().version_compare('< 3.5.1')
--  libsoup_dep = declare_dependency (
--    include_directories: libsoup_dep.get_variable(pkgconfig: 'includedir') / 'libsoup-3.0',
--    dependencies: cc.find_library('soup-3.0', required: true),
--  )
--endif
-+#if libsoup_dep.version().version_compare('< 3.5.1')
-+#  libsoup_dep = declare_dependency (
-+#    include_directories: libsoup_dep.get_variable(pkgconfig: 'includedir') / 'libsoup-3.0',
-+#    dependencies: cc.find_library('soup-3.0', required: true),
-+#  )
-+#endif
- 
- 
- # Headers are bundled as they're not shipped by gnome-bluetooth

recipes-gtk/phosh/phosh_git.bb

@@ -24,7 +24,7 @@ DEPENDS = " \
     networkmanager \
     polkit \
     pulseaudio \
-    libsoup-3.0 \
+    libsoup \
     upower \
     wayland \
     wayland-native \
@@ -52,13 +52,12 @@ inherit features_check gsettings meson pkgconfig gtk-icon-cache gobject-introspe
 
 SRC_URI = " \
     git://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.41.1"
-SRCREV = "01a217b334e7839839c212e6ec82b263f43e35b3"
+PV = "0.44-rc1"
+SRCREV = "5f4f68ac55c85e26ea0490ef8928e58ec8f485e7"
 
 EXTRA_OEMESON += "--buildtype=release"