diff mbox series

[RFC2[meta-oe,2/2] xdg-desktop-portal: upgrade 1.16.0 -> 1.17.0

Message ID 20230826004748.578231-2-f_l_k@t-online.de
State New
Headers show
Series [RFC2[meta-oe,1/2] flatpak: avoid to patch the pkgconfig file | expand

Commit Message

Markus Volk Aug. 26, 2023, 12:47 a.m. UTC 
This is a pre-release version. I'm not sure if it's a blocker, but it has
some nice features and if done like this we don't need to patch the .pc files
for flatpak and xdg-portal-desktop anymore.

I think being able to omit this is an improvement.

Remove the dbus-native and python3-dbus dependencies as  they are 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

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...l_1.16.0.bb => xdg-desktop-portal_1.17.0.bb} | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-support/xdg-desktop-portal/{xdg-desktop-portal_1.16.0.bb => xdg-desktop-portal_1.17.0.bb} (74%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.17.0.bb
similarity index 74%
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
index 0b3a93ab3..ad946d6b2 100644
--- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb
+++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.17.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 ?= " \
@@ -27,17 +25,18 @@  RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS}"
 
 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 \
-"
+SRC_URI = "git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=main"
 
 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=${STAGING_DATADIR}/dbus-1/interfaces \
+	-Ddbus-service-dir=${datadir}/dbus-1/services \
+"
 
 do_write_config:append() {
     cat >${WORKDIR}/meson-${PN}.cross <<EOF