From 4f7bcf81a9b0de2c11fc896bd7cb23801f568bf9 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Mon, 18 Sep 2023 23:51:43 +0200 Subject: xdg-desktop-portal: upgrade 1.16.0 -> 1.18.0 Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- ...1-meson.build-add-a-hack-for-crosscompile.patch | 28 +++++++++++++ ...esktop-portal-pc-in-add-pc_sysrootdir-dir.patch | 27 ------------ .../xdg-desktop-portal_1.16.0.bb | 47 --------------------- .../xdg-desktop-portal_1.18.0.bb | 49 ++++++++++++++++++++++ 4 files changed, 77 insertions(+), 74 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 delete mode 100644 meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb create mode 100644 meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.0.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch new file mode 100644 index 0000000000..3410a88310 --- /dev/null +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch @@ -0,0 +1,28 @@ +From 7abb3840ac2870fcfc174fbbd81c4209c838e1a9 Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Mon, 18 Sep 2023 22:22:17 +0200 +Subject: [PATCH] meson.build: add a hack for cross-compiling + +Signed-off-by: Markus Volk + +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 + 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 1997d0ffe7..0000000000 --- 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 -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.16.0.bb deleted file mode 100644 index 0b3a93ab32..0000000000 --- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.16.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "A portal frontend service for Flatpak and possibly other desktop containment frameworks." -HOMEPAGE = "https://github.com/flatpak/xdg-desktop-portal" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -REQUIRED_DISTRO_FEATURES = "polkit" - -DEPENDS = " \ - json-glib \ - glib-2.0 \ - libportal \ - geoclue \ - pipewire \ - dbus-native \ - fuse3 \ - xmlto-native \ - flatpak \ - python3-dbus-native \ -" - -PORTAL_BACKENDS ?= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'gtk+3', 'xdg-desktop-portal-gtk', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'gtk4', 'xdg-desktop-portal-gtk', '', d)} \ -" - -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 \ -" - -S = "${WORKDIR}/git" -SRCREV = "88af6c8ca4106fcf70925355350a669848e9fd5a" - -FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1" - -EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross" - -do_write_config:append() { - cat >${WORKDIR}/meson-${PN}.cross <${WORKDIR}/meson-${PN}.cross <