From ef83ca71211e77b00024a4fd3800c52dcccc4bb9 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 | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index abca0551eb59..7cb4948cec7a 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,18 +1,19 @@
 # Template file for 'flatpak'
 pkgname=flatpak
 version=1.15.1
-revision=1
-build_style=gnu-configure
+revision=2
+build_style=meson
 build_helper="gir"
 configure_args="
- --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 libsoup-devel libcurl-devel gdk-pixbuf-devel"
@@ -31,10 +32,18 @@ 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
 }
 
+do_check() {
+	meson test -C build --timeout-multiplier 3
+}
+
 post_install() {
 	rm -rf $DESTDIR/usr/lib/systemd
 }