gmobile: fix license

recipes-extended/feedbackd/feedbackd_git.bb

@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 
 DEPENDS = " \
+    gmobile \
     gsound \
     libgudev \
     glib-2.0 \
@@ -19,8 +20,8 @@ inherit meson pkgconfig features_check gobject-introspection vala
 SRC_URI = "gitsm://source.puri.sm/Librem5/feedbackd.git;protocol=https;nobranch=1"
 
 S = "${WORKDIR}/git"
-PV = "0.2.1"
-SRCREV = "1104cef50acb0b18a0d545e6a09773e3feb42e5b"
+PV = "0.3.0"
+SRCREV = "bf6928e47d6fc940986c06428e87a2eb95249ae0"
 
 EXTRA_OEMESON += "-Dtests=false"
 

recipes-extended/gmobile/gmobile/0001-meson.build-create-a-pkgconfig-.pc-file.patch

@@ -1,53 +0,0 @@
-From a9c5d3add6550e27636de3ef86d6eb8bad41874d Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Tue, 15 Aug 2023 07:36:31 +0200
-Subject: [PATCH] meson.build: add a pkgconfig .pc file
-
- - fix version
- - build shared lib and install
- - install headers
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- meson.build | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index e9f6c62..7e94496 100644
---- a/meson.build
-+++ b/meson.build
-@@ -99,3 +99,7 @@ summary({
-   bool_yn: true,
-   section: 'Build',
- )
-+
-+install_headers('src/gmobile.h' , 'src/gm-cutout.h',  'src/gm-device-info.h',  'src/gm-device-tree.h',  'src/gm-display-panel.h',  'src/gm-error.h',  'src/gm-main.h',  'src/gm-timeout.h', 'src/gm-rect.h')
-+pkg = import('pkgconfig')
-+pkg.generate(gm_lib)
-diff --git a/src/meson.build b/src/meson.build
-index ee98a39..8d8fd7d 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -37,12 +37,15 @@ gm_c_args = [
-   '-DG_LOG_DOMAIN="gmobile"',
- ]
- 
--gm_lib = static_library(
-+gm_lib = shared_library(
-   'gmobile',
-   gm_sources,
-   include_directories: root_inc,
-   c_args: gm_c_args,
--  dependencies: gm_deps)
-+  dependencies: gm_deps,
-+  version: meson.project_version(),
-+  install: true,
-+)
- 
- gmobile_dep = declare_dependency(
-   include_directories: [root_inc, include_directories('.')],
--- 
-2.41.0
-

recipes-extended/gmobile/gmobile_git.bb

@@ -1,18 +1,15 @@
 SUMMARY = "gmobile carries some helpers for GNOME on mobile devices"
-LICENSE = "LGPL-2.1-or-later"
-LIC_FILES_CHKSUM = "file://src/gm-cutout.c;beginline=1;endline=5;md5=fdd1e77039fe571c0c9aa6280a7e7903"
+LICENSE = "GPL-3.0-only & LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit meson pkgconfig
+inherit meson pkgconfig gobject-introspection
 
 DEPENDS = "glib-2.0 json-glib"
 
-SRC_URI = " \
-	git://gitlab.gnome.org/World/Phosh/gmobile.git;protocol=https;branch=main \
-	file://0001-meson.build-create-a-pkgconfig-.pc-file.patch \
-"
+SRC_URI = "git://gitlab.gnome.org/World/Phosh/gmobile.git;protocol=https;branch=main"
 S = "${WORKDIR}/git"
-SRCREV = "d5ed9ed758bf0deeb050d861fb08518295a42767"
-PV = "0.0.4"
+SRCREV = "3f3a8c70f6106e00388075c77982876857b321d8"
+PV = "0.2.0"
 
 do_install:append() {
 	install -m 0644 ${B}/gm-config.h ${D}${includedir}

recipes-extended/sofia-sip/sofia-sip_git .bb

@@ -17,3 +17,5 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF += "--with-glib"
 
+CFLAGS += "-Wno-incompatible-pointer-types"
+

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

@@ -0,0 +1,36 @@
+From bfd49ad17c115899bdec41f5819fef21f622e620 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 f9107b26..8bddeace 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -343,12 +343,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
+ 
+ phosh_deps = [
+   libsoup_dep,
+-- 
+2.45.1
+

recipes-gtk/phosh/phosh_git.bb

@@ -11,18 +11,18 @@ DEPENDS = " \
     evince \
     feedbackd \
     fribidi \
-    gcr \
     glib-2.0 \
+    gmobile \
     gnome-desktop \
     gtk+3 \
-    gtk4 \
-    libadwaita \
+    gcr3 \
     libgudev \
     libhandy \
     libsecret \
     networkmanager \
     polkit \
     pulseaudio \
+    libsoup-3.0 \
     upower \
     wayland \
     wayland-native \
@@ -52,17 +52,14 @@ inherit features_check gsettings meson pkgconfig gtk-icon-cache
 
 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 \
 "
 
 S = "${WORKDIR}/git"
-PV = "0.36.0"
-SRCREV = "62a4ba9d8a38750a49ae6187f3497c54a030be45"
+PV = "0.39.0"
+SRCREV = "e1e263efc239870e81c2e4d013bf0615f260141f"
 
 EXTRA_OEMESON += "--buildtype=release"
 
-do_install:append() {
-    install -Dm 644 ${WORKDIR}/phosh.pam ${D}${sysconfdir}/pam.d/phosh
-}
-
 FILES:${PN} += "${datadir} ${libdir}"
 

recipes-gtk/waypaper/waypaper_git.bb

@@ -9,7 +9,7 @@ RDEPENDS:${PN} = "python3-pygobject python3-importlib-metadata python3-platformd
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "2.1.1"
-SRCREV = "fda591d59c6ed5a50444c32cd5403260afd2d94b"
+PV = "2.1.2"
+SRCREV = "e7e853e70f60686bd1656ecafd154026233a7560"
 
 FILES:${PN} += "${datadir}"

recipes-wlroots/phoc/phoc/0001-meson.build-dont-build-subprojects.patch

@@ -1,34 +0,0 @@
-From 92e876d5f678228971512045144b0e8b572b9953 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Tue, 15 Aug 2023 07:23:23 +0200
-Subject: [PATCH] meson.build: dont build subprojects
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- meson.build | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 77b8971..e5b0908 100644
---- a/meson.build
-+++ b/meson.build
-@@ -40,13 +40,7 @@ wayland_protos = dependency('wayland-protocols', version: '>=1.15')
- wayland_server = dependency('wayland-server')
- xkbcommon      = dependency('xkbcommon')
- math           = cc.find_library('m')
--gmobile        = subproject('gmobile',
--                   default_options: [
--                   'examples=false',
--                   'gtk_doc=false',
--                   'tests=false',
--                 ])
--gmobile_dep    = gmobile.get_variable('gmobile_dep')
-+gmobile_dep    = dependency('gmobile', version: '>= 0.0.3')
- 
- embed_wlroots = get_option('embed-wlroots')
- 
--- 
-2.41.0
-

recipes-wlroots/phoc/phoc_git.bb

@@ -24,13 +24,11 @@ DEPENDS += " \
 "
 
 SRC_URI = " \
-	git://gitlab.gnome.org/World/Phosh/phoc.git;protocol=https;nobranch=1 \
-	file://0001-meson.build-dont-build-subprojects.patch \
-"
+	git://gitlab.gnome.org/World/Phosh/phoc.git;protocol=https;nobranch=1"
 
 S = "${WORKDIR}/git"
-PV = "0.36.0"
-SRCREV = "70bbce162e4736a43a4e7bf5fad308e476a4b340"
+PV = "0.39.0"
+SRCREV = "3d01448739b7e5605238301e473a063c7955ab21"
 
 inherit features_check gsettings meson pkgconfig