Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / flatpak-builder
Commits:
5e3fcd5f by Jan Alexander Steffens (heftig) at 2024-02-29T21:09:59+01:00
1.4.2-1
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- fusermount3.diff
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = flatpak-builder
pkgdesc = Tool to build flatpaks from source
- pkgver = 1.4.0
+ pkgver = 1.4.2
pkgrel = 1
url = https://flatpak.org
arch = x86_64
@@ -25,11 +25,11 @@ pkgbase = flatpak-builder
depends = tar
depends = unzip
replaces = flatpak<0.9.10
- source =
git+https://github.com/flatpak/flatpak-builder#commit=7d621d6eec7fe523c68d46f3853cdc86561b5637
+ source =
git+https://github.com/flatpak/flatpak-builder#commit=0b9070037a573a6061d7893312611957561ca841
source = git+https://gitlab.gnome.org/GNOME/libglnx.git
source = fusermount3.diff
b2sums = SKIP
b2sums = SKIP
- b2sums =
7d54ba89b3481722026ef556aabfc8b157069701ec89e900a5616899b937eacc077e620fb2a5f9d4faf5f7189414bc25e9a0fc57a0d8d2952bb24fb22dc445f3
+ b2sums =
ef1a73c8e2876a8c0c1401300b4367cfc3e656d2144fb66fbf22a57c178588a42ac842f5d7ccec9fba15084dc8bb6a544b2b77c1877c4c924dbe4ab6cd1962c4
pkgname = flatpak-builder
=====================================
PKGBUILD
=====================================
@@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
pkgname=flatpak-builder
-pkgver=1.4.0
+pkgver=1.4.2
pkgrel=1
pkgdesc="Tool to build flatpaks from source"
url="https://flatpak.org";
@@ -31,7 +31,7 @@ makedepends=(
)
checkdepends=(valgrind)
replaces=('flatpak<0.9.10')
-_commit=7d621d6eec7fe523c68d46f3853cdc86561b5637 # tags/1.4.0^0
+_commit=0b9070037a573a6061d7893312611957561ca841 # tags/1.4.2
source=(
"git+https://github.com/flatpak/flatpak-builder#commit=$_commit";
"git+https://gitlab.gnome.org/GNOME/libglnx.git";
@@ -39,7 +39,7 @@ source=(
)
b2sums=('SKIP'
'SKIP'
-
'7d54ba89b3481722026ef556aabfc8b157069701ec89e900a5616899b937eacc077e620fb2a5f9d4faf5f7189414bc25e9a0fc57a0d8d2952bb24fb22dc445f3')
+
'ef1a73c8e2876a8c0c1401300b4367cfc3e656d2144fb66fbf22a57c178588a42ac842f5d7ccec9fba15084dc8bb6a544b2b77c1877c4c924dbe4ab6cd1962c4')
pkgver() {
cd $pkgname
@@ -49,6 +49,9 @@ pkgver() {
prepare() {
cd $pkgname
+ # Fix build (update libglnx)
+ git cherry-pick -n ae86bde81fbb0316f08121793c0824c18b1cfb9a
+
# https://bugs.archlinux.org/task/75649
git apply -3 ../fusermount3.diff
=====================================
fusermount3.diff
=====================================
@@ -1,8 +1,8 @@
diff --git i/src/builder-context.c w/src/builder-context.c
-index bf699fff..5412166f 100644
+index f813f3f4..c8acdbea 100644
--- i/src/builder-context.c
+++ w/src/builder-context.c
-@@ -834,7 +834,7 @@ static char *rofiles_unmount_path = NULL;
+@@ -839,7 +839,7 @@ static char *rofiles_unmount_path = NULL;
static void
rofiles_umount_handler (int signum)
{
@@ -11,7 +11,7 @@ index bf699fff..5412166f 100644
NULL };
argv[2] = rofiles_unmount_path;
-@@ -974,7 +974,7 @@ gboolean
+@@ -979,7 +979,7 @@ gboolean
builder_context_disable_rofiles (BuilderContext *self,
GError **error)
{
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/flatpak-builder/-/commit/5e3fcd5f0b70c939ad08146bdd5c0df698c9600a
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/flatpak-builder/-/commit/5e3fcd5f0b70c939ad08146bdd5c0df698c9600a
You're receiving this email because of your account on gitlab.archlinux.org.
