From: ardadem <ardadem@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] flatpak: update to 1.15.1.
Date: Tue, 20 Dec 2022 21:21:03 +0100 [thread overview]
Message-ID: <20221220202103.eN0ubDS_8a1MaH6AL-OM-Q-1Ljj4ab1WB3W27Z0CbmI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40833@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1284 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: update to 1.15.1.
* 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: 1875 bytes --]
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
}
next prev parent reply other threads:[~2022-12-20 20:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-29 13:48 [PR PATCH] " ardadem
2022-11-29 17:15 ` [PR PATCH] [Updated] " ardadem
2022-11-29 17:28 ` Duncaen
2022-11-29 17:31 ` ardadem
2022-12-20 20:21 ` ardadem [this message]
2022-12-20 20:30 ` ardadem
2023-01-19 4:52 ` flatpak: switch to meson build-style kruceter
2023-01-25 17:56 ` [PR REVIEW] " paper42
2023-01-27 15:17 ` [PR PATCH] [Updated] " ardadem
2023-01-27 16:31 ` ardadem
2023-01-27 16:39 ` ardadem
2023-01-27 16:39 ` [PR REVIEW] " ardadem
2023-01-30 10:10 ` [PR PATCH] [Updated] " ardadem
2023-01-30 10:17 ` [PR REVIEW] " ardadem
2023-02-26 14:32 ` Duncaen
2023-02-26 14:32 ` [PR PATCH] [Closed]: " Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221220202103.eN0ubDS_8a1MaH6AL-OM-Q-1Ljj4ab1WB3W27Z0CbmI@z \
--to=ardadem@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).