libgit2 rebuilds

msys2 · Jan 9, 2025 · 9c4c94b · 9c4c94b
1 parent 2742494
commit 9c4c94b
Show file tree

Hide file tree

Showing 17 changed files with 114 additions and 78 deletions.
diff --git a/mingw-w64-bat/PKGBUILD b/mingw-w64-bat/PKGBUILD
@@ -4,7 +4,7 @@ _realname=bat
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.25.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Cat clone with syntax highlighting and git integration (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -32,7 +32,8 @@ sha256sums=('d3f4ee9ca8ea0f5927901dc3e41875a1cb68b44959d7b8be0a210010d4434bc5')
 prepare() {
   cd "${_realname}"
 
-  cargo update -p cc
+  # bump git2 crate (also updates cc)
+  git cherry-pick -n 01680e444ba4273b17d2d6d85a19f7a5e7046820
   cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
 }
 

diff --git a/mingw-w64-cargo-c/PKGBUILD b/mingw-w64-cargo-c/PKGBUILD
@@ -4,8 +4,8 @@ _realname=cargo-c
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.10.7
-pkgrel=1
-pkgdesc='A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries (mingw-w64)'
+pkgrel=2
+pkgdesc='A cargo subcommand to build and ins1tall C-ABI compatibile dynamic and static libraries (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/lu-zero/cargo-c/'
@@ -15,8 +15,8 @@ msys2_references=(
 )
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-sqlite3"
-         "${MINGW_PACKAGE_PREFIX}-libssh2"
-         "${MINGW_PACKAGE_PREFIX}-libgit2")
+         "${MINGW_PACKAGE_PREFIX}-libssh2")
+         #"${MINGW_PACKAGE_PREFIX}-libgit2")
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-openssl")
@@ -38,7 +38,8 @@ prepare() {
 }
 
 _env() {
-    export LIBGIT2_NO_VENDOR=1
+    # not compatible with libgit2 1.9+
+    # export LIBGIT2_NO_VENDOR=1
     export OPENSSL_NO_VENDOR=1
     export LIBSSH2_SYS_USE_PKG_CONFIG=1
     export LIBSQLITE3_SYS_USE_PKG_CONFIG=1

diff --git a/mingw-w64-cargo-generate/PKGBUILD b/mingw-w64-cargo-generate/PKGBUILD
@@ -4,7 +4,7 @@ _realname=cargo-generate
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.22.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Use pre-existing git repositories as templates (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -19,40 +19,40 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-mdbook"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-openssl")
-source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('f912f1c172a5a51ac7a693f44acaef99f5b9278723aa4daaeb96278807e025bd')
+source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
+        "https://github.com/cargo-generate/cargo-generate/commit/be2237177ee7ae996e2991189b07a5d211cd0d01.patch")
+sha256sums=('f912f1c172a5a51ac7a693f44acaef99f5b9278723aa4daaeb96278807e025bd'
+            '1e3d113bb77975abe3984247219ddc3499c634f21e34b861181077e476efd50c')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${_realname}-${pkgver}"
+
+  # bump git2 crate
+  patch -Np1 -i ../be2237177ee7ae996e2991189b07a5d211cd0d01.patch
 
   export LIBSSH2_SYS_USE_PKG_CONFIG=1
   export LIBGIT2_NO_VENDOR=1
-  export LIBZ_SYS_STATIC=0
   export OPENSSL_NO_VENDOR=1
   cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${_realname}-${pkgver}"
 
-  "${MINGW_PREFIX}/bin/cargo.exe" build \
-    --release \
-    --frozen
+  cargo build --release --frozen
 
   cd guide
-  "${MINGW_PREFIX}/bin/mdbook.exe" build
+  mdbook build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${_realname}-${pkgver}"
 
-  "${MINGW_PREFIX}/bin/cargo.exe" test \
-    --release \
-    --locked
+  cargo test --release --locked
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${_realname}-${pkgver}"
 
   install -Dm755 "target/release/${_realname}.exe" "${pkgdir}${MINGW_PREFIX}/bin/${_realname}.exe"
   install -d "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"

diff --git a/mingw-w64-cargo-local-registry/PKGBUILD b/mingw-w64-cargo-local-registry/PKGBUILD
@@ -4,7 +4,7 @@ _realname=cargo-local-registry
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A cargo subcommand to manage local registries (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -14,44 +14,42 @@ msys2_references=(
   'purl: pkg:cargo/cargo-local-registry'
 )
 license=('spdx:MIT OR Apache-2.0')
-depends=("${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-libssh2")
+depends=("${MINGW_PACKAGE_PREFIX}-zlib"
+         "${MINGW_PACKAGE_PREFIX}-libssh2")
+         #"${MINGW_PACKAGE_PREFIX}-libgit2")
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-openssl")
 source=("${url}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('b42e4904e4db100c27d81cf94a034438b20ae6dbb34d0fee39012f2d548680ca')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${_realname}-${pkgver}"
 
-  export LIBZ_SYS_STATIC=0
-  export LIBGIT2_NO_VENDOR=1
+  # not compatible with libgit2 1.9+
+  # export LIBGIT2_NO_VENDOR=1
   export OPENSSL_NO_VENDOR=1
   export LIBSSH2_SYS_USE_PKG_CONFIG=1
   # update windows-targets to fix windows-gnullvm dependency specification
-  "${MINGW_PREFIX}/bin/cargo.exe" update -p [email protected] --precise 0.48.1
+  cargo update -p [email protected] --precise 0.48.1
 
-  "${MINGW_PREFIX}/bin/cargo.exe" fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
+  cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${_realname}-${pkgver}"
 
-  "${MINGW_PREFIX}/bin/cargo.exe" build \
-    --release \
-    --frozen
+  cargo build --release --frozen
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${_realname}-${pkgver}"
 
-  "${MINGW_PREFIX}/bin/cargo.exe" test \
-    --release \
-    --frozen
+  cargo test --release --frozen
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${_realname}-${pkgver}"
 
   install -Dm755 "target/release/${_realname}.exe" "${pkgdir}${MINGW_PREFIX}/bin/${_realname}.exe"
   install -Dm644 "README.md" "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md"

diff --git a/mingw-w64-eza/PKGBUILD b/mingw-w64-eza/PKGBUILD
@@ -4,7 +4,7 @@ _realname=eza
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.20.16
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern, maintained replacement for ls (mingw-w64)"
 arch=('any')
 mingw_arch=('ucrt64' 'clang64' 'clangarm64' 'mingw64')
@@ -36,9 +36,6 @@ _env() {
 prepare() {
   cd "${_realname}"
 
-  # revert git2 update to support libgit2 1.8.x
-  patch -R -p1 -i ../7241ea4d128ca47b8f5e756a65fa3d4f1d5b5ce7.patch
-
   rm rust-toolchain.toml
   cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
 }

diff --git a/mingw-w64-fritzing/PKGBUILD b/mingw-w64-fritzing/PKGBUILD
@@ -4,7 +4,7 @@ _realname=fritzing
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.9.9
-pkgrel=6
+pkgrel=7
 pkgdesc="Electronic Design Automation software with a low entry barrier, suited for the needs of makers and hobbyists (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

diff --git a/mingw-w64-geany-plugins/PKGBUILD b/mingw-w64-geany-plugins/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor (MSYS2): David Macek <[email protected]>
 # Maintainer (Arch Linux): Alexander Rødseth <[email protected]>
-# Contributor (Arch Linux): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>  
+# Contributor (Arch Linux): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor (Arch Linux): djgera
 # Contributor (Arch Linux): Patrick Melo <[email protected]>
 
@@ -9,7 +9,7 @@ _realpkgver=2.0.0
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=${_realpkgver%.*}
-pkgrel=2
+pkgrel=3
 pkgdesc='Plugins for Geany (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

diff --git a/mingw-w64-gitui/PKGBUILD b/mingw-w64-gitui/PKGBUILD
@@ -4,7 +4,7 @@ _realname=gitui
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.26.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Blazing fast terminal-ui for git written in Rust (mingw-w64)'
 msys2_references=(
   'anitya: 187553'
@@ -27,7 +27,8 @@ sha256sums=('b149059b08ce83ad35df027d9a98582a4a2da8b4690caf10690a3999176af8b2')
 
 _env() {
   export OPENSSL_NO_VENDOR=1
-  export LIBGIT2_NO_VENDOR=1
+  # not compatible with libgit2 1.9+
+  # export LIBGIT2_NO_VENDOR=1
   export PKG_CONFIG_ALL_DYNAMIC=1
   export LIBSSH2_SYS_USE_PKG_CONFIG=1
 }
@@ -36,7 +37,7 @@ prepare() {
   cd "${_realname}"
 
   # bump git2 crate for libgit2 1.8+ support
-  git cherry-pick -n 423b5ff3d13c30dba7ac3045fe31cb2e60a87a60
+  # git cherry-pick -n 423b5ff3d13c30dba7ac3045fe31cb2e60a87a60
   cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
 }
 

diff --git a/mingw-w64-jj/PKGBUILD b/mingw-w64-jj/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-docs")
 pkgver=0.25.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Jujutsu (an experimental VCS) (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -21,7 +21,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-openssl"
              'git')
-depends=("${MINGW_PACKAGE_PREFIX}-libgit2"
+depends=(#"${MINGW_PACKAGE_PREFIX}-libgit2"
          "${MINGW_PACKAGE_PREFIX}-libssh2"
          "${MINGW_PACKAGE_PREFIX}-zstd")
 source=("git+${url}.git#tag=v${pkgver}"
@@ -33,7 +33,8 @@ sha256sums=('81a4fba33ef41385f489eb2ddec66deaa7e04df13a79f264c924666551c727c4'
 
 _env() {
   export OPENSSL_NO_VENDOR=1
-  export LIBGIT2_NO_VENDOR=1
+  # not compatible with libgit2 1.9+
+  # export LIBGIT2_NO_VENDOR=1
   export ZSTD_SYS_USE_PKG_CONFIG=1
   export LIBSSH2_SYS_USE_PKG_CONFIG=1
 }
@@ -88,7 +89,7 @@ package_jj() {
 
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 
-  local _complete="./target/release/jj util completion"
+  local _complete="target/release/jj util completion"
   $_complete bash | install -Dm644 /dev/stdin "${pkgdir}${MINGW_PREFIX}/share/bash-completion/completions/jj"
   $_complete fish | install -Dm644 /dev/stdin "${pkgdir}${MINGW_PREFIX}/share/fish/vendor_completions.d/jj.fish"
   $_complete zsh | install -Dm644 /dev/stdin "${pkgdir}${MINGW_PREFIX}/share/zsh/site-functions/_jj"

diff --git a/mingw-w64-keepawake/PKGBUILD b/mingw-w64-keepawake/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-lib${_realname}")
 pkgver=0.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Keep your computer awake (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -16,23 +16,19 @@ msys2_references=(
 )
 license=('spdx:MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
-             "${MINGW_PACKAGE_PREFIX}-cargo-c"
-             "${MINGW_PACKAGE_PREFIX}-pkgconf"
-             "${MINGW_PACKAGE_PREFIX}-libgit2")
+             "${MINGW_PACKAGE_PREFIX}-cargo-c")
 options=('!strip') # done while building
 source=("https://github.com/segevfiner/keepawake-rs/archive/v${pkgver}/${_realname}-rs-${pkgver}.tar.gz")
 sha256sums=('06bfc2ce38a6d06e54fc156bd20afa08ae687b6075d9a4ceb123ec935e8c235a')
 
 prepare() {
-  cd "${srcdir}/${_realname}-rs-${pkgver}"
+  cd "${_realname}-rs-${pkgver}"
 
-  export LIBZ_SYS_STATIC=0
-  export LIBGIT2_NO_VENDOR=1
   cargo fetch --locked
 }
 
 build() {
-  cd "${srcdir}/${_realname}-rs-${pkgver}"
+  cd "${_realname}-rs-${pkgver}"
 
   cargo build --release --frozen --features bin
 
@@ -41,13 +37,13 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${_realname}-rs-${pkgver}"
+  cd "${_realname}-rs-${pkgver}"
 
   cargo test --release --frozen --features bin
 }
 
 package_keepawake() {
-  cd "${srcdir}/${_realname}-rs-${pkgver}"
+  cd "${_realname}-rs-${pkgver}"
 
   cargo install \
     --frozen \
@@ -65,7 +61,7 @@ package_keepawake() {
 }
 
 package_libkeepawake() {
-  cd "${srcdir}/${_realname}-rs-${pkgver}"
+  cd "${_realname}-rs-${pkgver}"
 
   pkgdesc+=" (C API)"
 

diff --git a/mingw-w64-kicad/PKGBUILD b/mingw-w64-kicad/PKGBUILD
@@ -10,7 +10,7 @@ _realname=kicad
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=8.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Software for the creation of electronic schematic diagrams and printed circuit board artwork (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64')

diff --git a/mingw-w64-ktexteditor-qt5/PKGBUILD b/mingw-w64-ktexteditor-qt5/PKGBUILD
@@ -5,7 +5,7 @@ _variant=-${KF5_VARIANT:-shared}
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "ktexteditor"
 pkgver=5.116.0
-pkgrel=1
+pkgrel=2
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 msys2_references=(

diff --git a/mingw-w64-libgit2-glib/PKGBUILD b/mingw-w64-libgit2-glib/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-docs")
 pkgver=1.2.0
-pkgrel=3
+pkgrel=4
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
 pkgdesc="GLib wrapper for libgit2 (mingw-w64)"

diff --git a/mingw-w64-python-pygit2/PKGBUILD b/mingw-w64-python-pygit2/PKGBUILD
@@ -4,7 +4,7 @@ _realname=pygit2
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=1.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Python bindings for libgit2 (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')