* [PR PATCH] flatpak: update to 1.15.1.
@ 2022-11-29 13:48 ardadem
2022-11-29 17:15 ` [PR PATCH] [Updated] " ardadem
` (14 more replies)
0 siblings, 15 replies; 16+ messages in thread
From: ardadem @ 2022-11-29 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]
There is a new 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: 1931 bytes --]
From fe74d71578d4f5a0c28f0b29e0746794273fae8b 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: update to 1.15.1.
* Switch to meson build-style.
---
srcpkgs/flatpak/template | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 54296575d375..19680362a42a 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,13 +24,17 @@ 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
}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] flatpak: update to 1.15.1.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
@ 2022-11-29 17:15 ` ardadem
2022-11-29 17:28 ` Duncaen
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2022-11-29 17:15 UTC (permalink / raw)
To: ml
[-- 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: 2056 bytes --]
From 6055a7b73616ff19cd8860237601118d319ce100 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: 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
}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: flatpak: update to 1.15.1.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
2022-11-29 17:15 ` [PR PATCH] [Updated] " ardadem
@ 2022-11-29 17:28 ` Duncaen
2022-11-29 17:31 ` ardadem
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Duncaen @ 2022-11-29 17:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/40833#issuecomment-1331018764
Comment:
This is a pre-release.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: flatpak: update to 1.15.1.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 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 ` [PR PATCH] [Updated] " ardadem
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2022-11-29 17:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/40833#issuecomment-1331023627
Comment:
Uh, okay then keeping it as draft until stable release.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] flatpak: update to 1.15.1.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (2 preceding siblings ...)
2022-11-29 17:31 ` ardadem
@ 2022-12-20 20:21 ` ardadem
2022-12-20 20:30 ` ardadem
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2022-12-20 20:21 UTC (permalink / raw)
To: ml
[-- 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
}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: flatpak: update to 1.15.1.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (3 preceding siblings ...)
2022-12-20 20:21 ` [PR PATCH] [Updated] " ardadem
@ 2022-12-20 20:30 ` ardadem
2023-01-19 4:52 ` flatpak: switch to meson build-style kruceter
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2022-12-20 20:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
New comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/40833#issuecomment-1360147240
Comment:
@Duncaen Flatpak is updated to 1.15.1 on the repository, should i keep the PR for the new build-style or close it? Autotools will be removed on the future releases.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: flatpak: switch to meson build-style.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (4 preceding siblings ...)
2022-12-20 20:30 ` ardadem
@ 2023-01-19 4:52 ` kruceter
2023-01-25 17:56 ` [PR REVIEW] " paper42
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: kruceter @ 2023-01-19 4:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40833#issuecomment-1396438125
Comment:
> should i keep the PR for the new build-style or close it?
I think you can keep it.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] flatpak: switch to meson build-style.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (5 preceding siblings ...)
2023-01-19 4:52 ` flatpak: switch to meson build-style kruceter
@ 2023-01-25 17:56 ` paper42
2023-01-27 15:17 ` [PR PATCH] [Updated] " ardadem
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2023-01-25 17:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40833#discussion_r1086980499
Comment:
could you use the default do_check from the build style?
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] flatpak: switch to meson build-style.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (6 preceding siblings ...)
2023-01-25 17:56 ` [PR REVIEW] " paper42
@ 2023-01-27 15:17 ` ardadem
2023-01-27 16:31 ` ardadem
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2023-01-27 15:17 UTC (permalink / raw)
To: ml
[-- 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: 1845 bytes --]
From a96e45b4d0ddd6254e89e1178be826980b207180 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 | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 8b460d3d05e7..e72a28a913f1 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -2,18 +2,18 @@
pkgname=flatpak
version=1.15.1
revision=2
-build_style=gnu-configure
+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,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
}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] flatpak: switch to meson build-style.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (7 preceding siblings ...)
2023-01-27 15:17 ` [PR PATCH] [Updated] " ardadem
@ 2023-01-27 16:31 ` ardadem
2023-01-27 16:39 ` ardadem
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2023-01-27 16:31 UTC (permalink / raw)
To: ml
[-- 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: 1998 bytes --]
From a189428c099998a98d84d7eb17ddebb34c239e69 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 | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 8b460d3d05e7..e47faece6324 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,10 +32,20 @@ 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
}
+pre_check() {
+ # Extend test timeout to cope better with slow build
+ find -iname "*.ninja" -exec sed -i "{}" \
+ -e "s;meson test;& --timeout-multiplier=3;" \;
+}
+
post_install() {
rm -rf $DESTDIR/usr/lib/systemd
}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] flatpak: switch to meson build-style.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (8 preceding siblings ...)
2023-01-27 16:31 ` ardadem
@ 2023-01-27 16:39 ` ardadem
2023-01-27 16:39 ` [PR REVIEW] " ardadem
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2023-01-27 16:39 UTC (permalink / raw)
To: ml
[-- 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() {
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] flatpak: switch to meson build-style.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (9 preceding siblings ...)
2023-01-27 16:39 ` ardadem
@ 2023-01-27 16:39 ` ardadem
2023-01-30 10:10 ` [PR PATCH] [Updated] " ardadem
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2023-01-27 16:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New review comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/40833#discussion_r1089183621
Comment:
@paper42 how is it now? or i can patch the meson.build to increase timeout.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] flatpak: switch to meson build-style.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (10 preceding siblings ...)
2023-01-27 16:39 ` [PR REVIEW] " ardadem
@ 2023-01-30 10:10 ` ardadem
2023-01-30 10:17 ` [PR REVIEW] " ardadem
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2023-01-30 10:10 UTC (permalink / raw)
To: ml
[-- 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: 1765 bytes --]
From 413083d3e4c878cf4bc43b356d2b8d25b33a249e 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 | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 8b460d3d05e7..51e8bb254aa4 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,6 +32,10 @@ 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
}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] flatpak: switch to meson build-style.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (11 preceding siblings ...)
2023-01-30 10:10 ` [PR PATCH] [Updated] " ardadem
@ 2023-01-30 10:17 ` ardadem
2023-02-26 14:32 ` Duncaen
2023-02-26 14:32 ` [PR PATCH] [Closed]: " Duncaen
14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2023-01-30 10:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New review comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/40833#discussion_r1089183621
Comment:
@paper42 ~~how is it now? or i can patch the meson.build to increase timeout.~~ nvm looks like tests pass the ci without timeouting.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: flatpak: switch to meson build-style.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (12 preceding siblings ...)
2023-01-30 10:17 ` [PR REVIEW] " ardadem
@ 2023-02-26 14:32 ` Duncaen
2023-02-26 14:32 ` [PR PATCH] [Closed]: " Duncaen
14 siblings, 0 replies; 16+ messages in thread
From: Duncaen @ 2023-02-26 14:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/40833#issuecomment-1445376178
Comment:
Merged in https://github.com/void-linux/void-packages/commit/e59b8350a4c8e1ebf37e21e49bbfdc4f671d5f09
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Closed]: flatpak: switch to meson build-style.
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 ardadem
` (13 preceding siblings ...)
2023-02-26 14:32 ` Duncaen
@ 2023-02-26 14:32 ` Duncaen
14 siblings, 0 replies; 16+ messages in thread
From: Duncaen @ 2023-02-26 14:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1136 bytes --]
There's a closed pull request on the void-packages repository
flatpak: switch to meson build-style.
https://github.com/void-linux/void-packages/pull/40833
Description:
* 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
-->
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-02-26 14:32 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-29 13:48 [PR PATCH] flatpak: update to 1.15.1 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 ` [PR PATCH] [Updated] " ardadem
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
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).