flatpak: Upgrade 1.15.4 -> 1.15.6

- add a patch to fix build for the newly added wayland_security_context feature
- build wayland_security_context according to wayland distro_feature
- add GIR_MESON_OPTION
- add packageconfigs for selinux and http_backend

Dependencies:

    In distributions that compile Flatpak to use a separate bubblewrap (bwrap)
    executable, version 0.8.0 is now required.

    Enabling the optional Wayland security context feature requires
    libwayland-client, wayland-scanner >= 1.15 and wayland-protocols >= 1.32.

    Ubuntu 18.04 is no longer routinely tested. Support for dependency
    versions included in Ubuntu 18.04 should be considered "at risk".

Features:

    Add --device=input, for access to evdev devices in /dev/input (#5481)

    Update bundled copy of bubblewrap to version 0.8.0, and rely on its
    features:
        Improve error message if seccomp is disabled in kernel config
        Security hardening: set user namespace limit to 0, to prevent creation
        of nested user namespaces in a more robust way (#5084)

    For subsandboxes started by flatpak-portal, inherit environment
    variables from the flatpak run that started the original instance
    rather than from flatpak-portal, fixing behaviour of FLATPAK_GL_DRIVERS
    and similar features (#5278)

    Stop http transfers if a download in progress becomes very slow (#5519)

    Make it easier to configure extra languages, by picking them up from
    AccountsService if configured there (#5006)

    Add new flatpak_transaction_add_rebase_and_uninstall() API,
    allowing end-of-life apps to be replaced by their intended replacement
    more reliably (#3991)

    Create a private Wayland socket with the "security context" extension
    if available, allowing the compositor to identify connections from
    sandboxed apps as belonging to the sandbox (#4920, #5507, #5558)

    Update libglnx to 2023-08-29
        Use features of newer GLib versions if available
        Turn off system-level crash reporting infrastructure during
        some unit tests that involve intentional assertion failures

    Add anchors to link to sections of flatpak-metadata documentation (#5582)

    New translations: ka, nl.

Bug fixes:

    Avoid warnings processing symbolic links with GLib >= 2.77.0, and
    with GLib 2.76.0 (GLib 2.76.1 or later silences these warnings)

    Bypass page cache for backend requests in revokefs, fixing installation
    errors with libostree 2023.4 (#5452)

    Show AppStream metadata in flatpak remote-info as intended
    (#5523; regression in 1.9.1)

    Don't let Flatpak apps inherit VK_DRIVER_FILES or VK_ICD_FILENAMES
    from the host system, which would be wrong for the sandbox (#5553)

    Fix build failure with prereleases of libappstream 0.17.x (#5472)

    Forward-compatibility with libappstream 1.0 (#5563)

    Fix installation with Meson if configured with -Dauto_sideloading=true
    (#5495)

    Fix a memory leak (#5329)

    Fix compiler warnings (#5362, #5366)

    Make the tests fail more comprehensibly if a required tool is missing
    (#5020)

    Clean up /var/tmp/flatpak-cache-* directories on boot (#1119)

    Don't force GIO_USE_VFS=local for programs launched via flatpak-spawn
    (#5567)

    Clarify documentation for D-Bus name ownership (#5582)

    Translation updates: id, tr, zh_CN
    (#5332, #5565)

Internal changes:

    Split up large source files into smaller modules, reducing internal
    circular dependencies (#5410, #5411, #5415, #5419, #5416, #5414)

    Re-synchronize code backported from GLib with the version in GLib
    (#5410)

    Make the flags used to apply "extra data" clearer (#5466)

    Use glnx_opendirat() where possible (#5527)

    CI improvements (#5374, #5381)

(There was never a 1.15.5 release, I got our versioning convention mixed up and
thought we avoided releasing odd micro versions.)

Signed-off-by: Khem Raj <raj.khem@gmail.com>

3 files changed, 40 insertions, 4 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 c1f2cca5c..08d5625fa 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
@@ -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-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch
new file mode 100644
index 000000000..b076a3fff
--- /dev/null
+++ b/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-oe/recipes-extended/flatpak/flatpak_1.15.4.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb
index ca0f0e82c..9f2835a5d 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb
+++ b/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 \
@@ -47,18 +47,26 @@ 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[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}"