diff --git a/testing/cargo-generate/APKBUILD b/testing/cargo-generate/APKBUILD index cd8df0fdbb9..1dfaac2ab08 100644 --- a/testing/cargo-generate/APKBUILD +++ b/testing/cargo-generate/APKBUILD @@ -1,30 +1,23 @@ # Contributor: Michał Polański # Maintainer: Michał Polański pkgname=cargo-generate -pkgver=0.22.0 -pkgrel=1 +pkgver=0.22.1 +pkgrel=0 pkgdesc="Use pre-existing git repositories as templates" url="https://github.com/cargo-generate/cargo-generate" license="MIT OR Apache-2.0" -# loongarch64: blocked by libc crate -arch="all !s390x !loongarch64" # fails to build nix crate -makedepends="cargo libgit2-dev openssl-dev cargo-auditable" -source="https://github.com/cargo-generate/cargo-generate/archive/v$pkgver/cargo-generate-$pkgver.tar.gz" +arch="all !s390x" # fails to build nix crate +makedepends="cargo cargo-auditable libgit2-dev openssl-dev" +source="https://github.com/cargo-generate/cargo-generate/archive/v$pkgver/cargo-generate-$pkgver.tar.gz + libgit2-1.9-compat.patch + " options="net" # fetch dependencies +export LIBGIT2_NO_VENDOR=1 # use system libgit2 + prepare() { default_prepare - # Rust target triple. - local target=$(rustc -vV | sed -n 's/host: //p') - - # Build against system-provided libs - mkdir -p .cargo - cat >> .cargo/config.toml <<-EOF - [target.$target] - git2 = { rustc-link-lib = ["git2"] } - EOF - cargo fetch --target="$CTARGET" --locked } @@ -41,5 +34,6 @@ package() { } sha512sums=" -6f29ab6e465b19a0ab0cf0415180ca9fc1267bcb214f9c02457934be4548c2033b4e54b73e0b11127bd729b27b5d679cc87115b069b71ccf5a3dbfabec56d578 cargo-generate-0.22.0.tar.gz +e5acb6a874a32244d17cff63645e91e4710508e0c5c3e87350bc8bfadda00dfabb8fc4a283988d3c197ea1124554467e75bd60716ccace17533849b4fb152a1e cargo-generate-0.22.1.tar.gz +c84a0a53ba89562f0bf1430faa239986791093688f8d0ba06cfa1701bcd38773538330cb5ae1a6bb1723b03b764e7378ae3526c1d6b624eb2df2ef26505f7b3b libgit2-1.9-compat.patch " diff --git a/testing/cargo-generate/libgit2-1.9-compat.patch b/testing/cargo-generate/libgit2-1.9-compat.patch new file mode 100644 index 00000000000..06b7a52f85e --- /dev/null +++ b/testing/cargo-generate/libgit2-1.9-compat.patch @@ -0,0 +1,41 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 6952e9c..8e6e0b6 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -628,9 +628,9 @@ dependencies = [ + + [[package]] + name = "git2" +-version = "0.19.0" ++version = "0.20.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" ++checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff" + dependencies = [ + "bitflags", + "libc", +@@ -1188,9 +1188,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + + [[package]] + name = "libgit2-sys" +-version = "0.17.0+1.8.1" ++version = "0.18.0+1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" ++checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec" + dependencies = [ + "cc", + "libc", +diff --git a/Cargo.toml b/Cargo.toml +index 3e4400e..38bc2ae 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -11,7 +11,7 @@ include = ["src/**/*", "LICENSE-*", "*.md"] + [dependencies.git2] + default-features = false + features = ["ssh", "https"] +-version = "~0.19" ++version = "~0.20" + + [dependencies] + anstyle = "~1.0"