Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / 
cargo-generate


Commits:
cc90af13 by Caleb Maclennan at 2025-01-22T15:10:42+03:00
upgpkg: 0.22.1-2: Rebuild for libgit2 1.9

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,11 +1,12 @@
 pkgbase = cargo-generate
        pkgdesc = Use pre-existing git repositories as templates
        pkgver = 0.22.1
-       pkgrel = 1
+       pkgrel = 2
        url = https://github.com/cargo-generate/cargo-generate
        arch = x86_64
        license = MIT
        license = Apache-2.0
+       makedepends = cargo-edit
        depends = cargo
        depends = curl
        depends = libgit2


=====================================
PKGBUILD
=====================================
@@ -3,29 +3,38 @@
 
 pkgname=cargo-generate
 pkgver=0.22.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Use pre-existing git repositories as templates"
 arch=('x86_64')
 url="https://github.com/cargo-generate/cargo-generate";
 license=('MIT' 'Apache-2.0')
 depends=('cargo' 'curl' 'libgit2' 'libssh2' 'openssl')
+makedepends=('cargo-edit')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
 sha256sums=('f912f1c172a5a51ac7a693f44acaef99f5b9278723aa4daaeb96278807e025bd')
 
 prepare() {
   cd "$pkgname-$pkgver"
+  # Backport crate bump so we can build against libgit2-1.9
+  # c.f. 
https://github.com/cargo-generate/cargo-generate/commit/be2237177ee7ae996e2991189b07a5d211cd0d01
+  cargo upgrade -p [email protected]
   cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
 }
 
 build() {
   cd "$pkgname-$pkgver"
+  depends+=(libgit2.so)
   CFLAGS+=" -ffat-lto-objects"
-  LIBSSH2_SYS_USE_PKG_CONFIG=1 cargo build --release --frozen 
--no-default-features
+  export LIBGIT2_NO_VENDOR=1
+  export LIBSSH2_SYS_USE_PKG_CONFIG=1
+  cargo build --release --frozen --no-default-features
 }
 
 check() {
   cd "$pkgname-$pkgver"
-  LIBSSH2_SYS_USE_PKG_CONFIG=1 cargo test --frozen --lib --no-default-features
+  export LIBGIT2_NO_VENDOR=1
+  export LIBSSH2_SYS_USE_PKG_CONFIG=1
+  cargo test --frozen --lib --no-default-features
 }
 
 package() {



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/cargo-generate/-/commit/cc90af13183a4fefa31585cb1579776d11bd8850

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/cargo-generate/-/commit/cc90af13183a4fefa31585cb1579776d11bd8850
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to