From 6055a7b73616ff19cd8860237601118d319ce100 Mon Sep 17 00:00:00 2001 From: Arda Demir Date: Tue, 29 Nov 2022 16:45:33 +0300 Subject: [PATCH] flatpak: update to 1.15.1. * 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 54296575d375..af8058dd2b3a 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,16 +1,16 @@ # Template file for 'flatpak' pkgname=flatpak -version=1.14.0 -revision=3 -build_style=gnu-configure +version=1.15.1 +revision=1 +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)" + -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" makedepends="AppStream-devel libarchive-devel gpgme-devel json-glib-devel @@ -24,17 +24,25 @@ license="LGPL-2.1-or-later" homepage="https://flatpak.org/" changelog="https://github.com/flatpak/flatpak/raw/main/NEWS" distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz" -checksum=8e276973770ea24ddf2597ad4aecd36b98393e6bde91e48e1743aaca67f27815 +checksum=13d34462ed130c0fe4928904cfcbcb7322c46c2c22ad70f657d35577c40d951e build_options="gir" 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 }