diff mbox series

[RFC[meta-oe,1/3] flatpak: allow to build native

Message ID 20230826000433.544757-1-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 
flatpaks dbus-1/interfaces and dbus-1/services files are required
to build xdg-desktop-portal. To avoid having to patch the .pc files
or having to have flatpak installed on the host machine, make
flatpak-native available to other recipes

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../0001-flatpak-pc-add-pc_sysrootdir.patch   | 28 -------------------
 .../flatpak/flatpak_1.15.4.bb                 | 17 +++++------
 2 files changed, 9 insertions(+), 36 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch
diff mbox series

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 <f_l_k@t-online.de>
-Date: Wed, 14 Dec 2022 06:50:40 +0100
-Subject: [PATCH] flatpak.pc: add pc_sysrootdir
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
-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..aac972fd3 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb
@@ -3,10 +3,7 @@  HOMEPAGE = "http://flatpak.org"
 LICENSE = "LGPL-2.1-only"
 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 \
-"
+SRC_URI = "gitsm://github.com/flatpak/flatpak;protocol=https;nobranch=1"
 
 SRCREV = "e936e3100d406c50ba49f3ad6a0ecae455345ec0"
 
@@ -14,7 +11,7 @@  S = "${WORKDIR}/git"
 
 inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native useradd mime features_check
 
-REQUIRED_DISTRO_FEATURES = "polkit"
+REQUIRED_DISTRO_FEATURES:class-target = "polkit"
 
 DEPENDS = " \
     appstream \
@@ -36,8 +33,9 @@  DEPENDS = " \
     xmlto-native \
     zstd \
 "
+DEPENDS:remove:class-native = "polkit"
 
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN}:class-target = " \
     bubblewrap \
     ca-certificates \
     dconf \
@@ -56,7 +54,7 @@  PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native"
 PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth"
 PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp"
 
-PACKAGECONFIG ?= " \
+PACKAGECONFIG:class-target ?= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xauth', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \
 "
@@ -66,8 +64,11 @@  FILES:${PN} += "${libdir} ${datadir}"
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd"
 
-do_install:append() {
+do_install:append:class-target() {
     chmod 0700 ${D}/${datadir}/polkit-1/rules.d
     chown polkitd ${D}/${datadir}/polkit-1/rules.d
     chgrp root ${D}/${datadir}/polkit-1/rules.d
 }
+
+EXTRA_OEMESON:class-native += "-Dsystem_helper=disabled"
+BBCLASSEXTEND = "native"