summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch11
-rw-r--r--meta-oe/recipes-extended/flatpak/flatpak_1.17.2.bb (renamed from meta-oe/recipes-extended/flatpak/flatpak_1.17.0.bb)8
2 files changed, 10 insertions, 9 deletions
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
index 08d5625fa7..6207ae617b 100644
--- 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
@@ -7,22 +7,25 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
7--- 7---
8Upstream-Status: Inappropriate [oe-specific] 8Upstream-Status: Inappropriate [oe-specific]
9 9
10Update for 1.17.2.
11Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
12---
10 meson.build | 2 +- 13 meson.build | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
12 15
13diff --git a/meson.build b/meson.build 16diff --git a/meson.build b/meson.build
14index 4a0b865e..5f69b1d9 100644 17index e97b8cef..5c8de55f 100644
15--- a/meson.build 18--- a/meson.build
16+++ b/meson.build 19+++ b/meson.build
17@@ -509,7 +509,7 @@ pkgconfig_variables += 'exec_prefix=${prefix}' 20@@ -515,7 +515,7 @@ pkgconfig_variables += 'exec_prefix=${prefix}'
18 pkgconfig_variables += 'datadir=' + ('${prefix}' / get_option('datadir')) 21 pkgconfig_variables += 'datadir=' + ('${prefix}' / get_option('datadir'))
19 22
20 pkgconfig_variables += 'datarootdir=' + ('${prefix}' / get_option('datadir')) 23 pkgconfig_variables += 'datarootdir=' + ('${prefix}' / get_option('datadir'))
21-pkgconfig_variables += 'interfaces_dir=${datadir}/dbus-1/interfaces/' 24-pkgconfig_variables += 'interfaces_dir=${datadir}/dbus-1/interfaces/'
22+pkgconfig_variables += 'interfaces_dir=${pc_sysrootdir}${datadir}/dbus-1/interfaces/' 25+pkgconfig_variables += 'interfaces_dir=${pc_sysrootdir}${datadir}/dbus-1/interfaces/'
23 pkgconfig_variables += 'httpbackend=' + get_option('http_backend')
24 26
25 pkgconfig.generate( 27 pkgconfig.generate(
28 libflatpak,
26-- 29--
272.34.1 302.43.0
28 31
diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.17.0.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.17.2.bb
index a51937ea72..4f8ad8add0 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak_1.17.0.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak_1.17.2.bb
@@ -4,11 +4,11 @@ LICENSE = "LGPL-2.1-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 4LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
5 5
6SRC_URI = " \ 6SRC_URI = " \
7 git://github.com/flatpak/flatpak;protocol=https;branch=main \ 7 git://github.com/flatpak/flatpak;protocol=https;branch=main;tag=${PV} \
8 file://0001-flatpak-pc-add-pc_sysrootdir.patch \ 8 file://0001-flatpak-pc-add-pc_sysrootdir.patch \
9" 9"
10 10
11SRCREV = "0835c0272f3a0389f97b02cad4b208f80fec99ed" 11SRCREV = "20599618d623630f7aa38d61a2bb81d86fb25f09"
12 12
13 13
14inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native mime features_check useradd 14inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native mime features_check useradd
@@ -32,6 +32,7 @@ DEPENDS = " \
32 python3-pyparsing-native \ 32 python3-pyparsing-native \
33 xdg-dbus-proxy-native \ 33 xdg-dbus-proxy-native \
34 zstd \ 34 zstd \
35 curl \
35" 36"
36 37
37RDEPENDS:${PN} = " \ 38RDEPENDS:${PN} = " \
@@ -49,11 +50,9 @@ GTKDOC_MESON_OPTION = 'gtkdoc'
49GTKDOC_MESON_ENABLE_FLAG = 'enabled' 50GTKDOC_MESON_ENABLE_FLAG = 'enabled'
50GTKDOC_MESON_DISABLE_FLAG = 'disabled' 51GTKDOC_MESON_DISABLE_FLAG = 'disabled'
51 52
52PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl"
53PACKAGECONFIG[dconf] = "-Ddconf=enabled,-Ddconf=disabled,dconf" 53PACKAGECONFIG[dconf] = "-Ddconf=enabled,-Ddconf=disabled,dconf"
54PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native" 54PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native"
55PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native" 55PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native"
56PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4"
57PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" 56PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native"
58PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" 57PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth"
59PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" 58PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp"
@@ -62,7 +61,6 @@ PACKAGECONFIG[selinux] = "-Dselinux_module=enabled,-Dselinux_module=disabled,lib
62PACKAGECONFIG[wayland-security-context] = "-Dwayland_security_context=enabled,-Dwayland_security_context=disabled,wayland wayland-native wayland-protocols" 61PACKAGECONFIG[wayland-security-context] = "-Dwayland_security_context=enabled,-Dwayland_security_context=disabled,wayland wayland-native wayland-protocols"
63 62
64PACKAGECONFIG ?= " \ 63PACKAGECONFIG ?= " \
65 curl \
66 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xauth', '', d)} \ 64 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xauth', '', d)} \
67 ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ 65 ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \
68 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \ 66 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \