Re: [PR PATCH] [Updated] flatpak: switch to meson build-style.

[ardadem <ardadem@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1295 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-flatpak
https://github.com/void-linux/void-packages/pull/40833

flatpak: switch to meson build-style.
* Switch to meson build-style.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40833.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-flatpak-40833.patch --]
[-- Type: text/x-diff, Size: 1940 bytes --]

From d720e2ffbce6952f718dbda935fb5ae54cbe1f08 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 29 Nov 2022 16:45:33 +0300
Subject: [PATCH] flatpak: switch to meson build-style.

---
 srcpkgs/flatpak/template | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 8b460d3d05e7..2ee30d0db206 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,19 +1,19 @@
 # Template file for 'flatpak'
 pkgname=flatpak
 version=1.15.1
-revision=2
-build_style=gnu-configure
+revision=3
+build_style=meson
 build_helper="gir"
 configure_args="
- --with-curl
- --with-system-bubblewrap
- --with-system-dbus-proxy
- --with-system-helper-user=_flatpak
- --enable-selinux-module=no
- --enable-gdm-env-file
- $(vopt_enable gir introspection)"
+ -Ddbus_config_dir=/usr/share/dbus-1/system.d
+ -Dsystem_bubblewrap=bwrap
+ -Dsystem_dbus_proxy=xdg-dbus-proxy
+ -Dsystem_helper_user=_flatpak
+ -Dselinux_module=disabled
+ -Dgdm_env_file=true
+ -Dgir=$(vopt_if gir enabled disabled)"
 hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison
- python3-parsing xmlto docbook-xml docbook-xsl xdg-dbus-proxy"
+ python3-parsing xmlto docbook-xml docbook-xsl xdg-dbus-proxy polkit-devel"
 makedepends="AppStream-devel libarchive-devel gpgme-devel json-glib-devel
  libcap-devel libostree-devel libseccomp-devel polkit-devel dconf-devel
  fuse3-devel libcurl-devel libxml2-devel gdk-pixbuf-devel"
@@ -32,8 +32,16 @@ build_options_default="gir"
 
 system_accounts="_flatpak"
 
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Dtests=false"
+fi
+
 post_patch() {
 	vsed -i -e '/cp.*usr.lib.locale.C/d' tests/make-test-runtime.sh
+
+	# Extend test timeout to cope better with slow build
+	find -iname "*.ninja" -exec sed -i "{}" \
+		-e "s;meson test;& --timeout-multiplier=3;" \;
 }
 
 post_install() {