Commit in toolbox/repos/community-x86_64 (PKGBUILD PKGBUILD)

[Morten Linderud]

    Date: Thursday, March 2, 2023 @ 19:52:39
  Author: foxboron
Revision: 1407420

archrelease: copy trunk to community-x86_64

Added:
  toolbox/repos/community-x86_64/PKGBUILD
    (from rev 1407419, toolbox/trunk/PKGBUILD)
Deleted:
  toolbox/repos/community-x86_64/PKGBUILD

----------+
 PKGBUILD |   77 ++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 43 insertions(+), 34 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2023-03-02 19:52:30 UTC (rev 1407419)
+++ PKGBUILD    2023-03-02 19:52:39 UTC (rev 1407420)
@@ -1,34 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
-# Maintainer: Morten Linderud <foxbo...@archlinux.org>
-
-pkgname=toolbox
-pkgver=0.0.99.3
-pkgrel=2
-pkgdesc='Unprivileged development environment'
-arch=(x86_64)
-url='https://github.com/containers/toolbox'
-license=(APACHE)
-depends=(podman bash flatpak)
-makedepends=(go shellcheck go-md2man bash-completion ninja git meson)
-_commit=52c85b60d95ecb2c01cbd3901a16e7c43cd85440       #refs/tags/0.0.99.3^{}
-source=("git+$url#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd toolbox
-  git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-build() {
-  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  arch-meson toolbox build -D profile_dir=/etc/profile.d
-  ninja -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja -C build install
-}

Copied: toolbox/repos/community-x86_64/PKGBUILD (from rev 1407419, 
toolbox/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2023-03-02 19:52:39 UTC (rev 1407420)
@@ -0,0 +1,43 @@
+# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Maintainer: Morten Linderud <foxbo...@archlinux.org>
+
+pkgname=toolbox
+pkgver=0.0.99.4
+pkgrel=1
+pkgdesc='Unprivileged development environment'
+arch=(x86_64)
+url='https://github.com/containers/toolbox'
+license=(APACHE)
+depends=(podman bash flatpak)
+makedepends=(go shellcheck go-md2man bash-completion ninja git meson podman)
+_commit=f7c4c7dedb34be33333065296275869e77464400       #refs/tags/0.0.99.4^{}
+source=("git+$url#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd toolbox
+  git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  cd toolbox
+  # Fixes https://github.com/containers/toolbox/issues/1246
+  git cherry-pick -n 816a7cab9e2f02f2eb828062be54ffef2e3666dc
+  git cherry-pick -n f555029304415a06bde410deb879cd2cc7dad444
+  git cherry-pick -n fc5f568c5d82f4a16982268fa67092e52be91fbe
+    
+}
+
+build() {
+  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  arch-meson toolbox build -D profile_dir=/etc/profile.d
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+}