diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/flatpak')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch | 2 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch | 28 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb (renamed from meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb) | 18 |
3 files changed, 42 insertions, 6 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch index c1f2cca5c6..08d5625fa7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch +++ b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch @@ -5,7 +5,7 @@ Subject: [PATCH] flatpak.pc: add pc_sysrootdir Signed-off-by: Markus Volk <f_l_k@t-online.de> --- -Upstream-Status: Pending +Upstream-Status: Inappropriate [oe-specific] meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch new file mode 100644 index 0000000000..b076a3fffd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch @@ -0,0 +1,28 @@ +From ced2e933cf647874da4baff002e0987b9bfe5fac Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Sat, 18 Nov 2023 15:07:49 +0100 +Subject: [PATCH] meson.build: require for native wayland-scanner + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Submitted [https://github.com/flatpak/flatpak/pull/5596] +--- + meson.build | 4 ++-- + 1 file changed, 1 insertions(+), 1 deletions(-) + +diff --git a/meson.build b/meson.build +index f4e5b3a3..5d2f9eba 100644 +--- a/meson.build ++++ b/meson.build +@@ -207,7 +207,7 @@ gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc')) + build_gtk_doc = gtkdoc_dep.found() + + wayland_client = dependency('wayland-client', required : get_option('wayland_security_context')) +-wayland_scanner = dependency('wayland-scanner', version : '>= 1.15', required : get_option('wayland_security_context')) ++wayland_scanner = dependency('wayland-scanner', version : '>= 1.15', required : get_option('wayland_security_context'), native : true) + wayland_protocols = dependency('wayland-protocols', version : '>= 1.32', required : get_option('wayland_security_context')) + build_wayland_security_context = wayland_client.found() and wayland_scanner.found() and wayland_protocols.found() + +-- +2.42.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb index ca0f0e82c0..0ee53afb6d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb @@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = " \ gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \ file://0001-flatpak-pc-add-pc_sysrootdir.patch \ + file://0001-meson.build-require-for-native-wayland-scanner.patch \ " -SRCREV = "e936e3100d406c50ba49f3ad6a0ecae455345ec0" +SRCREV = "27b11b93c2a80a91c9461bc6c7f5e9a201406041" S = "${WORKDIR}/git" @@ -19,7 +20,6 @@ REQUIRED_DISTRO_FEATURES = "polkit" DEPENDS = " \ appstream \ bison-native \ - curl \ dconf \ fuse3 \ gdk-pixbuf \ @@ -29,11 +29,9 @@ DEPENDS = " \ libarchive \ libcap \ libxml2 \ - libxslt-native \ ostree \ polkit \ python3-pyparsing-native \ - xmlto-native \ zstd \ " @@ -47,18 +45,28 @@ RDEPENDS:${PN} = " \ EXTRA_OEMESON += "-Dsystem_dbus_proxy=${bindir}/xdg-dbus-proxy -Dsystem_bubblewrap=${bindir}/bwrap" -GIR_MESON_OPTION = "" +GIR_MESON_OPTION = "gir" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' GTKDOC_MESON_OPTION = 'gtkdoc' GTKDOC_MESON_ENABLE_FLAG = 'enabled' GTKDOC_MESON_DISABLE_FLAG = 'disabled' +PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl" +PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native" +PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native" +PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4" PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" +PACKAGECONFIG[selinux] = "-Dselinux_module=enabled,-Dselinux_module=disabled,libselinux" +PACKAGECONFIG[wayland-security-context] = "-Dwayland_security_context=enabled,-Dwayland_security_context=disabled,wayland wayland-native wayland-protocols" PACKAGECONFIG ?= " \ + curl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xauth', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \ " FILES:${PN} += "${libdir} ${datadir}" |