Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging 
/ Packages / flatpak-builder


Commits:
9168af98 by Jan Alexander Steffens (heftig) at 2024-07-08T02:01:19+02:00
1.4.3-1

- - - - -


3 changed files:

- .SRCINFO
- + .nvchecker.toml
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
 pkgbase = flatpak-builder
        pkgdesc = Tool to build flatpaks from source
-       pkgver = 1.4.2
+       pkgver = 1.4.3
        pkgrel = 1
        url = https://flatpak.org
        arch = x86_64
@@ -15,20 +15,29 @@ pkgbase = flatpak-builder
        depends = binutils
        depends = breezy
        depends = cpio
+       depends = curl
        depends = debugedit
        depends = elfutils
        depends = flatpak
        depends = fuse3
+       depends = gcc-libs
        depends = git
+       depends = glib2
+       depends = glibc
+       depends = json-glib
+       depends = libelf
+       depends = libxml2
+       depends = libyaml
+       depends = ostree
        depends = patch
        depends = rpmextract
        depends = tar
        depends = unzip
        replaces = flatpak<0.9.10
-       source = 
git+https://github.com/flatpak/flatpak-builder#commit=0b9070037a573a6061d7893312611957561ca841
+       source = git+https://github.com/flatpak/flatpak-builder#tag=1.4.3
        source = git+https://gitlab.gnome.org/GNOME/libglnx.git
        source = fusermount3.diff
-       b2sums = SKIP
+       b2sums = 
fabb2a890fe39a0b1bb130a6858cbd348a80b35e14d73c1165bb70c9e649c990f5b7ae56ef1802f1c7c9a6c42ce7db0706f5fa099544eb682bc104bca4a06e7f
        b2sums = SKIP
        b2sums = 
ef1a73c8e2876a8c0c1401300b4367cfc3e656d2144fb66fbf22a57c178588a42ac842f5d7ccec9fba15084dc8bb6a544b2b77c1877c4c924dbe4ab6cd1962c4
 


=====================================
.nvchecker.toml
=====================================
@@ -0,0 +1,5 @@
+[flatpak-builder]
+source = "github"
+github = "flatpak/flatpak-builder"
+use_max_tag = true
+include_regex = '\d+\.\d*[02468]\.\d+'


=====================================
PKGBUILD
=====================================
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
 
 pkgname=flatpak-builder
-pkgver=1.4.2
+pkgver=1.4.3
 pkgrel=1
 pkgdesc="Tool to build flatpaks from source"
 url="https://flatpak.org";
@@ -12,11 +12,20 @@ depends=(
   binutils
   breezy
   cpio
+  curl
   debugedit
   elfutils
   flatpak
   fuse3
+  gcc-libs
   git
+  glib2
+  glibc
+  json-glib
+  libelf
+  libxml2
+  libyaml
+  ostree
   patch
   rpmextract
   tar
@@ -31,32 +40,24 @@ makedepends=(
 )
 checkdepends=(valgrind)
 replaces=('flatpak<0.9.10')
-_commit=0b9070037a573a6061d7893312611957561ca841  # tags/1.4.2
 source=(
-  "git+https://github.com/flatpak/flatpak-builder#commit=$_commit";
+  "git+https://github.com/flatpak/flatpak-builder#tag=$pkgver";
   "git+https://gitlab.gnome.org/GNOME/libglnx.git";
   fusermount3.diff
 )
-b2sums=('SKIP'
+b2sums=('fabb2a890fe39a0b1bb130a6858cbd348a80b35e14d73c1165bb70c9e649c990f5b7ae56ef1802f1c7c9a6c42ce7db0706f5fa099544eb682bc104bca4a06e7f'
         'SKIP'
         
'ef1a73c8e2876a8c0c1401300b4367cfc3e656d2144fb66fbf22a57c178588a42ac842f5d7ccec9fba15084dc8bb6a544b2b77c1877c4c924dbe4ab6cd1962c4')
 
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
 prepare() {
   cd $pkgname
 
-  # Fix build (update libglnx)
-  git cherry-pick -n ae86bde81fbb0316f08121793c0824c18b1cfb9a
-
   # https://bugs.archlinux.org/task/75649
   git apply -3 ../fusermount3.diff
 
   git submodule set-url subprojects/libglnx "$srcdir/libglnx"
-  git -c protocol.file.allow=always submodule update --init -- 
subprojects/libglnx
+  git -c protocol.file.allow=always -c protocol.allow=never \
+    submodule update --init -- subprojects/libglnx
 }
 
 build() {



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/flatpak-builder/-/commit/9168af98a6b9dcd431930f07dbb350288ae6269c

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/flatpak-builder/-/commit/9168af98a6b9dcd431930f07dbb350288ae6269c
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to