diff mbox series

[RFC[meta-oe,3/3] xdg-desktop-portal: upgrade 1.16.0 -> 1.17.0

Message ID 20230826000433.544757-3-f_l_k@t-online.de
State New
Headers show
Series [RFC[meta-oe,1/3] flatpak: allow to build native | expand

Commit Message

Markus Volk Aug. 26, 2023, 12:04 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 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

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} | 15 ++++++-----
 2 files changed, 8 insertions(+), 34 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} (73%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch
deleted file mode 100644
index 1997d0ffe..000000000
--- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-xdg-desktop-portal-pc-in-add-pc_sysrootdir-dir.patch
+++ /dev/null
@@ -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
-
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 73%
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..daf52f72e 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,10 +8,10 @@  REQUIRED_DISTRO_FEATURES = "polkit"
 DEPENDS = " \
     json-glib \
     glib-2.0 \
+    flatpak-native \
     libportal \
     geoclue \
     pipewire \
-    dbus-native \
     fuse3 \
     xmlto-native \
     flatpak \
@@ -27,17 +27,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_NATIVE}/dbus-1/interfaces \
+	-Ddbus-service-dir=${datadir}/dbus-1/services \
+"
 
 do_write_config:append() {
     cat >${WORKDIR}/meson-${PN}.cross <<EOF