phosh: update

This is	intended to be used as subproject. Build a package nevertheless,
because	phosh only supports inappropriate wrap file

recipes-extended/libcall-ui/libcall-ui/0001-build-as-package.patch

@@ -0,0 +1,32 @@
+From 02fee99a4be76b1db07f27cad68986061168e7e1 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 20 Aug 2024 11:57:39 +0200
+Subject: [PATCH] build as package
+
+---
+ meson.build | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index d33614b..d3e068d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -19,6 +19,8 @@ systemduserdir = join_paths(systemddir, 'user')
+ 
+ root_inc = include_directories('.')
+ 
++pkgconfig = import ('pkgconfig')
++
+ cc = meson.get_compiler('c')
+ 
+ global_c_args = []
+@@ -113,4 +115,6 @@ summary = [
+   '-----------',
+ ]
+ 
++pkgconfig.generate(call_ui_lib)
++
+ message('\n'.join(summary))
+-- 
+2.45.2
+

recipes-extended/libcall-ui/libcall-ui_git.bb

@@ -0,0 +1,30 @@
+SUMMARY = "Libcall-ui carries common user interface parts for call handling. It is meant to be used as a git submodule."
+HOMEPAGE = "https://gitlab.gnome.org/World/Phosh/libcall-ui"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = "glib-2.0 libhandy gtk+3 callaudiod"
+
+inherit meson pkgconfig gi-docgen gobject-introspection
+
+SRC_URI = " \
+	git://gitlab.gnome.org/World/Phosh/libcall-ui.git;protocol=https;branch=libcall-ui-0.1.x \
+	file://0001-build-as-package.patch \
+"
+
+S = "${WORKDIR}/git"
+PV = "0.1.3"
+SRCREV = "60870e871e480e111e6a2fa50de67d1dd358d65a"
+
+GIR_MESON_OPTION = ''
+
+do_install:append() {
+install -d ${D}${includedir}
+	install -m 0644 ${B}/src/libcall-ui.a ${D}${libdir}
+	cp -rf ${B}/src/libcall-ui.a.p ${D}${libdir}
+	install -m 0644 ${B}/cui-config.h ${D}${includedir}
+	install -m 0644 ${S}/src/*.h ${D}${includedir}
+	install -m 0644 ${B}/src/*.h ${D}${includedir}
+}
+
+FILES:${PN} += "${libdir}/libcall-ui.a.p"

recipes-gtk/libgnome-volume-control/libgnome-volume-control/0001-build-as-package.patch

@@ -0,0 +1,39 @@
+From db03d3455c9db082c373318c08f2377c03a62e99 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 20 Aug 2024 12:22:55 +0200
+Subject: [PATCH] meson.build: allow shared build
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ meson.build | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a1a2af5..97f43c1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -3,12 +3,14 @@ project('gvc', 'c',
+   default_options: ['static=true']
+ )
+ 
+-assert(meson.is_subproject(), 'This project is only intended to be used as a subproject!')
++#assert(meson.is_subproject(), 'This project is only intended to be used as a subproject!')
+ 
+ gnome = import('gnome')
+ 
+ pkglibdir = get_option('pkglibdir')
+ pkgdatadir = get_option('pkgdatadir')
++pkgconfig = import ('pkgconfig')
++
+ 
+ cdata = configuration_data()
+ cdata.set_quoted('GETTEXT_PACKAGE', get_option('package_name'))
+@@ -135,3 +137,5 @@ configure_file(
+   output: 'config.h',
+   configuration: cdata
+ )
++
++pkgconfig.generate(libgvc)
+-- 
+2.45.2
+

recipes-gtk/libgnome-volume-control/libgnome-volume-control_git.bb

@@ -0,0 +1,30 @@
+SUMMARY = "libgnome-volume-control is a copy library"
+HOMEPAGE = "http://www.gimp.org"
+SECTION = "graphics"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+
+DEPENDS = " \
+	    glib-2.0 \
+	    pulseaudio \
+"
+
+inherit meson pkgconfig
+
+SRC_URI = " \
+	git://gitlab.gnome.org/GNOME/libgnome-volume-control.git;protocol=https;branch=master \
+	file://0001-build-as-package.patch \
+"
+
+S = "${WORKDIR}/git"
+SRCREV = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6"
+
+do_install:append() {
+	install -d ${D}${includedir}
+	install -m 0644 ${B}/libgvc.a ${D}${libdir}
+	cp -rf ${B}/libgvc.a.p ${D}${libdir}
+	install -m 0644 ${S}/*.h ${D}${includedir}
+	install -m 0644 ${B}/*.h ${D}${includedir}
+}
+
+FILES:${PN} += "${libdir}/libgvc.a.p"

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,
--- 
-2.45.1
  
+ # Headers are bundled as they're not shipped by gnome-bluetooth

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"
-SRCREV = "afef417667369f4943c8acfa24b4477e4197359e"
+PV = "0.41.0"
+SRCREV = "5af045742f347f5f0622842dfe553f5666eb4f8f"
 
 EXTRA_OEMESON += "--buildtype=release"
 

recipes-support/hyprland/aquamarine_git.bb

@@ -22,7 +22,7 @@ DEPENDS = " \
 SRC_URI = "git://github.com/hyprwm/aquamarine.git;protocol=https;branch=main"
 
 S = "${WORKDIR}/git"
-SRCREV = "7f8df01d4297b9068a9592400f16044602844f86"
-PV = "0.3.2"
+SRCREV = "00d51a053c98d54987174d74771afa63b7bb27d3"
+PV = "0.3.3"
 
 inherit cmake pkgconfig

recipes-support/hyprland/hyprland_git.bb

@@ -47,7 +47,7 @@ RRECOMMENDS:${PN} ?= " \
 
 SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main"
 
-SRCREV = "83d88fa56467a2b749fb2320e1595281107bd326"
+SRCREV = "c86db7bbb0cf14d4955ee3a4d13c0ed9f8a0e0ae"
 PV = "0.43-dev"
 S = "${WORKDIR}/git"
 

recipes-wlroots/gamescope/gamescope_git.bb

@@ -57,8 +57,8 @@ SRC_URI = "   \
 	file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \
 	file://0001-meson.build-dont-leak-buildpath.patch \
 "
-SRCREV = "db245f3963e5ee27ed41acdf4a50c65d6ed38932"
-PV = "3.14.29"
+SRCREV = "250a14345faaa6e6b8331cf6979e3c54fe097023"
+PV = "3.15.0"
 
 S = "${WORKDIR}/git"
 

recipes-wlroots/phoc/phoc_git.bb

@@ -27,8 +27,8 @@ SRC_URI = " \
 	git://gitlab.gnome.org/World/Phosh/phoc.git;protocol=https;nobranch=1"
 
 S = "${WORKDIR}/git"
-PV = "0.40.0"
-SRCREV = "bbb7490ca7216f09db367acb4056e8e6e249bd3e"
+PV = "0.41.0"
+SRCREV = "ef1419c242f22e3e140cf3ff9598e28254508681"
 
 inherit features_check gsettings meson pkgconfig