From patchwork Sat Aug 26 00:47:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 29523 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A24EDC83F10 for ; Sat, 26 Aug 2023 00:48:02 +0000 (UTC) Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by mx.groups.io with SMTP id smtpd.web11.677.1693010880986348745 for ; Fri, 25 Aug 2023 17:48:01 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.84, mailfrom: f_l_k@t-online.de) Received: from fwd80.aul.t-online.de (fwd80.aul.t-online.de [10.223.144.106]) by mailout09.t-online.de (Postfix) with SMTP id 5D0112040B for ; Sat, 26 Aug 2023 02:47:59 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.154.172.109]) by fwd80.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1qZhT4-0ys8Fl0; Sat, 26 Aug 2023 02:47:58 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [RFC2[meta-oe][PATCH 1/2] flatpak: avoid to patch the pkgconfig file Date: Sat, 26 Aug 2023 02:47:47 +0200 Message-ID: <20230826004748.578231-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1693010878-9A8249C6-9EAD4C3B/0/0 CLEAN NORMAL X-TOI-MSGID: 815f464d-6975-4499-b1dd-1f46ff6ab67f List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 26 Aug 2023 00:48:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/104620 Signed-off-by: Markus Volk --- .../0001-flatpak-pc-add-pc_sysrootdir.patch | 28 ------------------- .../flatpak/flatpak_1.15.4.bb | 1 - 2 files changed, 29 deletions(-) delete mode 100644 meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch deleted file mode 100644 index c1f2cca5c..000000000 --- a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3a1ab02d821cd4b0af44c0dad87e290ebaabef83 Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Wed, 14 Dec 2022 06:50:40 +0100 -Subject: [PATCH] flatpak.pc: add pc_sysrootdir - -Signed-off-by: Markus Volk ---- -Upstream-Status: Pending - - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 4a0b865e..5f69b1d9 100644 ---- a/meson.build -+++ b/meson.build -@@ -509,7 +509,7 @@ pkgconfig_variables += 'exec_prefix=${prefix}' - pkgconfig_variables += 'datadir=' + ('${prefix}' / get_option('datadir')) - - pkgconfig_variables += 'datarootdir=' + ('${prefix}' / get_option('datadir')) --pkgconfig_variables += 'interfaces_dir=${datadir}/dbus-1/interfaces/' -+pkgconfig_variables += 'interfaces_dir=${pc_sysrootdir}${datadir}/dbus-1/interfaces/' - pkgconfig_variables += 'httpbackend=' + get_option('http_backend') - - pkgconfig.generate( --- -2.34.1 - diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb index f5a726a83..ed888ded0 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = " \ gitsm://github.com/flatpak/flatpak;protocol=https;nobranch=1 \ - file://0001-flatpak-pc-add-pc_sysrootdir.patch \ " SRCREV = "e936e3100d406c50ba49f3ad6a0ecae455345ec0" From patchwork Sat Aug 26 00:47:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 29524 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95609C83F11 for ; Sat, 26 Aug 2023 00:48:12 +0000 (UTC) Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by mx.groups.io with SMTP id smtpd.web10.681.1693010889772126877 for ; Fri, 25 Aug 2023 17:48:10 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.84, mailfrom: f_l_k@t-online.de) Received: from fwd80.aul.t-online.de (fwd80.aul.t-online.de [10.223.144.106]) by mailout09.t-online.de (Postfix) with SMTP id 679682040B for ; Sat, 26 Aug 2023 02:48:07 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.154.172.109]) by fwd80.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1qZhT9-0ys8Fm0; Sat, 26 Aug 2023 02:48:03 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [RFC2[meta-oe][PATCH 2/2] xdg-desktop-portal: upgrade 1.16.0 -> 1.17.0 Date: Sat, 26 Aug 2023 02:47:48 +0200 Message-ID: <20230826004748.578231-2-f_l_k@t-online.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230826004748.578231-1-f_l_k@t-online.de> References: <20230826004748.578231-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1693010883-9A8249C6-1768EE20/0/0 CLEAN NORMAL X-TOI-MSGID: e869f811-acc5-4f8a-82ed-81f37142cd2a List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 26 Aug 2023 00:48:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/104621 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 --- ...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 --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 <