new file mode 100644
@@ -0,0 +1,28 @@
+From 7abb3840ac2870fcfc174fbbd81c4209c838e1a9 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Mon, 18 Sep 2023 22:22:17 +0200
+Subject: [PATCH] meson.build: add a hack for cross-compiling
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+
+Upstream-Status: Inappropriate [cross-compile specific]
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 760613a..d339d26 100644
+--- a/meson.build
++++ b/meson.build
+@@ -168,7 +168,7 @@ pkgconfig.generate(
+ 'prefix': get_option('prefix'),
+ 'datarootdir': dataroot_dir,
+ 'datadir': '${prefix}/@0@'.format(get_option('datadir')),
+- 'interfaces_dir': '${datadir}/dbus-1/interfaces/',
++ 'interfaces_dir': '${pc_sysrootdir}${datadir}/dbus-1/interfaces/',
+ },
+ )
+
+--
+2.41.0
+
deleted file mode 100644
@@ -1,27 +0,0 @@
-From 7727dbfef4dd7ced3958ae9ada59a8899976b12d Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Mon, 12 Dec 2022 18:40:31 +0100
-Subject: [PATCH] xdg-desktop-portal.pc.in: add pc_sysrootdir dir
-
----
-Upstream-Status: Pending
-
- xdg-desktop-portal.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xdg-desktop-portal.pc.in b/xdg-desktop-portal.pc.in
-index 585c0c8..15b5817 100644
---- a/xdg-desktop-portal.pc.in
-+++ b/xdg-desktop-portal.pc.in
-@@ -2,7 +2,7 @@ prefix=@prefix@
- datarootdir=@datarootdir@
- datadir=@datadir@
-
--interfaces_dir=${datadir}/dbus-1/interfaces/
-+interfaces_dir=${pc_sysrootdir}${datadir}/dbus-1/interfaces
-
- Name: xdg-desktop-portal
- Description: Desktop integration portal
-2.34.1
-
similarity index 77%
rename from meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb
rename to meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.0.bb
@@ -8,14 +8,12 @@ REQUIRED_DISTRO_FEATURES = "polkit"
DEPENDS = " \
json-glib \
glib-2.0 \
+ flatpak \
libportal \
geoclue \
pipewire \
- dbus-native \
fuse3 \
xmlto-native \
- flatpak \
- python3-dbus-native \
"
PORTAL_BACKENDS ?= " \
@@ -29,15 +27,19 @@ inherit meson pkgconfig python3native features_check
SRC_URI = " \
git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=main \
- file://0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch \
+ file://0001-meson.build-add-a-hack-for-crosscompile.patch \
"
S = "${WORKDIR}/git"
-SRCREV = "88af6c8ca4106fcf70925355350a669848e9fd5a"
+SRCREV = "a4b27063222b16652e73b422e5448d75335199ef"
FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1"
-EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross"
+EXTRA_OEMESON += " \
+ --cross-file=${WORKDIR}/meson-${PN}.cross \
+ -Dflatpak-interfaces-dir=${STAGING_DATADIR}/dbus-1/interfaces \
+ -Ddbus-service-dir=${datadir}/dbus-1/services \
+"
do_write_config:append() {
cat >${WORKDIR}/meson-${PN}.cross <<EOF
Signed-off-by: Markus Volk <f_l_k@t-online.de> --- ...on.build-add-a-hack-for-crosscompile.patch | 28 +++++++++++++++++++ ...p-portal-pc-in-add-pc_sysrootdir-dir.patch | 27 ------------------ ...1.16.0.bb => xdg-desktop-portal_1.18.0.bb} | 14 ++++++---- 3 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch delete mode 100644 meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch rename meta-oe/recipes-support/xdg-desktop-portal/{xdg-desktop-portal_1.16.0.bb => xdg-desktop-portal_1.18.0.bb} (77%)