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 82%
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.17.0.bb
@@ -11,7 +11,6 @@ DEPENDS = " \
libportal \
geoclue \
pipewire \
- dbus-native \
fuse3 \
xmlto-native \
flatpak \
@@ -29,15 +28,18 @@ 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 \
"
S = "${WORKDIR}/git"
-SRCREV = "88af6c8ca4106fcf70925355350a669848e9fd5a"
+SRCREV = "e31960ab3d3ecd3efeef1c97d1d40d94b866f4b7"
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=${datadir}/dbus-1/interfaces \
+ -Ddbus-service-dir=${datadir}/dbus-1/services \
+"
do_write_config:append() {
cat >${WORKDIR}/meson-${PN}.cross <<EOF
This is a pre-release version. I'm not sure if it's a blocker, but it has some nice features and as my tests have shown, it doesn't seem to require patching the .pc file anymore. I'm not sure if this was fixed externally and by now it would work with 1.16.0 without the patch. In any case, being able to omit this is an improvement. Remove the dbus-native dependency as it is needed only for tests and for that we also would need to provide python3-dbusmock-native Explicitly set the target directories for dbus-service-dir and flatpak-interfaces-dir to avoid this issue shown in log.do_configure: Flatpak interfaces dir : /home/flk/poky/build/tmp/work/corei7-64-poky-linux/xdg-desktop-portal/1.17.0/recipe-sysroot/usr/share/dbus-1/interfaces/ Changes in 1.17.0 ================= Released: 2023-08-04 - Drop the Autotools build. Meson is now the only supported build system. - Rework how portal implementations are loaded. This new, more robust system allows selecting specific backends for specific portals, and layering them when necessary. Platforms that provide portals implementation are encouraged to provide a suitable configuration file. - Introduce a new Clipboard portal. This portal extends the Remote Desktop portal by adding support for sharing clipboard between remote machines. - Introduce a new Input Capture portal. This portal adds mechanisms for taking control of input devices. The primary usage model is centered around the InputLeap and Synergy use cases, where local devices are used to control remote displays. - Stop using the deprecated GTimeVal struct - Bump GLib dependency to 2.66 - Add an "accept-label" option the the Print portal. This lets apps suggest a proper label to the print operation. - Various fixes to the Global Shortcuts portal - Support restoring remote desktop sessions - Improve robustness of the OpenURI portal by validating more URIs - The PipeWire dependency is now mandatory - Various improvements for the test suite - Translation updates Signed-off-by: Markus Volk <f_l_k@t-online.de> --- ...p-portal-pc-in-add-pc_sysrootdir-dir.patch | 27 ------------------- ...1.16.0.bb => xdg-desktop-portal_1.17.0.bb} | 10 ++++--- 2 files changed, 6 insertions(+), 31 deletions(-) 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.17.0.bb} (82%)