libgit2: update to 1.8.4

mingw-w64-bat/PKGBUILD

@@ -4,7 +4,7 @@ _realname=bat
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.24.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Cat clone with syntax highlighting and git integration (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -16,7 +16,6 @@ msys2_references=(
 )
 license=('spdx:MIT OR Apache-2.0')
 depends=(
-  "${MINGW_PACKAGE_PREFIX}-libgit2"
   "${MINGW_PACKAGE_PREFIX}-oniguruma"
   "${MINGW_PACKAGE_PREFIX}-zlib"
 )
@@ -41,8 +40,10 @@ prepare() {
 build() {
   cd "${_realname}"
 
+  # Not compatible with libgit2 1.8+
+  # export LIBGIT2_NO_VENDOR=1
+
   RUSTONIG_DYNAMIC_LIBONIG=1 \
-  LIBGIT2_NO_VENDOR=1 \
     cargo build --release --frozen
 }
 

mingw-w64-cargo-generate/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=cargo-generate
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.21.1
+pkgver=0.22.0
 pkgrel=1
 pkgdesc="Use pre-existing git repositories as templates (mingw-w64)"
 arch=('any')
@@ -19,7 +19,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-openssl")
 source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('3159eb16de57e0b28af67fcda01bcd54eee81edfbfd882e557018e4bcf6f41b0')
+sha256sums=('cbea9b09fe0d9d577723007e1c7ef8329f7cb36268ad042bb870b63dbeaad323')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"

mingw-w64-delta/PKGBUILD

@@ -4,7 +4,7 @@ _realname=delta
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.18.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A syntax-highlighting pager for git and diff output (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -16,8 +16,7 @@ msys2_references=(
   'purl: pkg:cargo/git-delta'
 )
 license=('spdx:MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-libgit2"
-         "${MINGW_PACKAGE_PREFIX}-oniguruma"
+depends=("${MINGW_PACKAGE_PREFIX}-oniguruma"
          'git')
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust" "${MINGW_PACKAGE_PREFIX}-pkgconf")
 source=("https://github.com/dandavison/delta/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
@@ -28,7 +27,8 @@ sha256sums=('64717c3b3335b44a252b8e99713e080cbf7944308b96252bc175317b10004f02'
             '9994d5b61f020f85f67df54c56c793bd4faf41e39b62ddd4e67c482b9a11b73e')
 
 _env() {
-  export LIBGIT2_NO_VENDOR=1
+  # Not compatible with libgit2 1.8+
+  # export LIBGIT2_NO_VENDOR=1
   export RUSTONIG_DYNAMIC_LIBONIG=1
   export WINAPI_NO_BUNDLED_LIBRARIES=1
 }

mingw-w64-fritzing/PKGBUILD

@@ -4,7 +4,7 @@ _realname=fritzing
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.9.9
-pkgrel=5
+pkgrel=6
 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')

mingw-w64-geany-plugins/PKGBUILD

@@ -9,7 +9,7 @@ _realpkgver=2.0.0
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=${_realpkgver%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc='Plugins for Geany (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -35,8 +35,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              'intltool')
 #             "${MINGW_PACKAGE_PREFIX}-cppcheck")
 # optdepends=("${MINGW_PACKAGE_PREFIX}-hspell: hebrew spell checker")
-source=("https://github.com/geany/geany-plugins/releases/download/${_realpkgver}/${_realname}-${pkgver}.tar.bz2")
-sha256sums=('9fc2ec5c99a74678fb9e8cdfbd245d3e2061a448d70fd110a6aefb62dd514705')
+source=("https://github.com/geany/geany-plugins/releases/download/${_realpkgver}/${_realname}-${pkgver}.tar.bz2"
+        "https://github.com/geany/geany-plugins/commit/bb289f1562ec4368efa400c3d17cb17c206f101d.patch"
+        "https://github.com/geany/geany-plugins/commit/07f0fdc1ef2ccaf104b5f9591bfcf3a56f035c4f.patch")
+sha256sums=('9fc2ec5c99a74678fb9e8cdfbd245d3e2061a448d70fd110a6aefb62dd514705'
+            '11d2271d90a998f6591cbebc84c369f2de14d6108d2f4e78eff86ed2e9262964'
+            '65346c504b3a93988aa683933fa9dc16c5e245268a9bfbb5d47af5b6c0c36044')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -49,6 +53,9 @@ apply_patch_with_msg() {
 prepare() {
   cd ${_realname}-${pkgver}
 
+  apply_patch_with_msg \
+    "bb289f1562ec4368efa400c3d17cb17c206f101d.patch" \
+    "07f0fdc1ef2ccaf104b5f9591bfcf3a56f035c4f.patch"
 }
 
 build() {

mingw-w64-gitui/PKGBUILD

@@ -4,7 +4,7 @@ _realname=gitui
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.26.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Blazing fast terminal-ui for git written in Rust (mingw-w64)'
 msys2_references=(
   'anitya: 187553'
@@ -15,7 +15,7 @@ url='https://github.com/extrawurst/gitui'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 license=('spdx:MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-libgit2" "${MINGW_PACKAGE_PREFIX}-libssh2")
+depends=("${MINGW_PACKAGE_PREFIX}-libssh2")
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
@@ -26,7 +26,8 @@ sha256sums=('b149059b08ce83ad35df027d9a98582a4a2da8b4690caf10690a3999176af8b2')
 
 _env() {
   export OPENSSL_NO_VENDOR=1
-  export LIBGIT2_NO_VENDOR=1
+  # Not compatible with libgit2 1.8+
+  # export LIBGIT2_NO_VENDOR=1
   export PKG_CONFIG_ALL_DYNAMIC=1
   export LIBSSH2_SYS_USE_PKG_CONFIG=1
 }

mingw-w64-kicad/PKGBUILD

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

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=2
+pkgrel=3
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
 pkgdesc="GLib wrapper for libgit2 (mingw-w64)"
@@ -25,13 +25,17 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-cc")
 license=('spdx:LGPL-2.1-or-later')
 url="https://wiki.gnome.org/Projects/Libgit2-glib"
-source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz")
-sha256sums=('1331dada838f4e1f591b26459d44126a325de762dc3cd26153a31afbdfe18190')
+source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"
+        "https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40.patch")
+sha256sums=('1331dada838f4e1f591b26459d44126a325de762dc3cd26153a31afbdfe18190'
+            'fa59904152769bbfa5df5027d1be7590b8c894ab319d3514e4ac0c66b6031edd')
 msys2_repository_url="https://gitlab.gnome.org/GNOME/libgit2-glib"
 
 prepare() {
   cd "${_realname}-${pkgver}"
 
+  # https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40
+  patch -Np1 -i ../40.patch
 }
 
 build() {

mingw-w64-libgit2/0001-libgit2-1.4.2-rc-filename.patch

@@ -1,6 +1,7 @@
---- a/src/libgit2/CMakeLists.txt
-+++ b/src/libgit2/CMakeLists.txt
-@@ -101,7 +101,7 @@ if(SONAME)
+diff -Naur libgit2-1.8.0.orig/src/libgit2/CMakeLists.txt libgit2-1.8.0/src/libgit2/CMakeLists.txt
+--- libgit2-1.8.0.orig/src/libgit2/CMakeLists.txt	2024-03-21 00:50:41.444310600 +0300
++++ libgit2-1.8.0/src/libgit2/CMakeLists.txt	2024-03-21 00:53:19.841827200 +0300
+@@ -77,7 +77,7 @@
  	set_target_properties(libgit2package PROPERTIES VERSION ${libgit2_VERSION})
  	set_target_properties(libgit2package PROPERTIES SOVERSION "${libgit2_VERSION_MAJOR}.${libgit2_VERSION_MINOR}")
  	if(LIBGIT2_FILENAME)
@@ -9,8 +10,9 @@
  		set_target_properties(libgit2package PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME})
  	elseif(DEFINED LIBGIT2_PREFIX)
  		set_target_properties(libgit2package PROPERTIES PREFIX "${LIBGIT2_PREFIX}")
---- a/src/libgit2/git2.rc
-+++ b/src/libgit2/git2.rc
+diff -Naur libgit2-1.8.0.orig/src/libgit2/git2.rc libgit2-1.8.0/src/libgit2/git2.rc
+--- libgit2-1.8.0.orig/src/libgit2/git2.rc	2024-03-21 00:50:41.569313400 +0300
++++ libgit2-1.8.0/src/libgit2/git2.rc	2024-03-21 00:55:37.504984900 +0300
 @@ -2,23 +2,15 @@
  #include "../../include/git2/version.h"
 
@@ -24,7 +26,7 @@
  #endif
 
  #ifndef LIBGIT2_COMMENTS
- # define LIBGIT2_COMMENTS "For more information visit http://libgit2.github.com/"
+ # define LIBGIT2_COMMENTS "For more information visit https://libgit2.org/"
  #endif
 
 -#ifdef __GNUC__

mingw-w64-libgit2/PKGBUILD

@@ -4,12 +4,13 @@ _realname=libgit2
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-winhttp")
-pkgver=1.7.2
-pkgrel=3
+pkgver=1.8.4
+pkgrel=1
 pkgdesc='A linkable library for Git (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url='https://github.com/libgit2/libgit2'
+url='https://libgit2.org/'
+msys2_repository_url='https://github.com/libgit2/libgit2'
 msys2_references=(
   "cpe: cpe:/a:libgit2:libgit2"
   "cpe: cpe:/a:libgit2_project:libgit2"
@@ -27,24 +28,19 @@ makedepends=(
   "${MINGW_PACKAGE_PREFIX}-openssl"
   "${MINGW_PACKAGE_PREFIX}-python"
 )
-source=(${_realname}-${pkgver}.tar.gz::"https://github.com/libgit2/libgit2/archive/v${pkgver}.tar.gz"
+source=("${msys2_repository_url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         "0001-libgit2-1.4.2-rc-filename.patch"
-        "0002-cmake-fix-openssl-build-on-win32.patch"
         "0003-libgit2-cmake-fix-pkgconfig.patch")
 noextract=(${_realname}-${pkgver}.tar.gz)
-sha256sums=('de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f'
-            'bdffd718bbf178817d5cfd80f9d5a9706b9c6ff981b1631978ae02657cbf2a55'
-            '4329cef22a301adf67652ac00372e08077fe4dd005f7036751be413dda6ac156'
+sha256sums=('49d0fc50ab931816f6bfc1ac68f8d74b760450eebdb5374e803ee36550f26774'
+            '1a217eddf7daa549b12ccf88e275782ac7a7fa385d5afb59aac0351ee5b97a44'
             '0d7cff6db9a7d3f0ed63540a3a91365afeb43217787b0db8519c34fe73bc9757')
 
 prepare() {
   tar --exclude tests/resources/testrepo-worktree/link_to_new.txt -zxf ${_realname}-${pkgver}.tar.gz
   cd ${_realname}-${pkgver}
 
   patch -Np1 -i "${srcdir}/0001-libgit2-1.4.2-rc-filename.patch"
-
-  # https://github.com/libgit2/libgit2/pull/6626
-  patch -Np1 -i "${srcdir}/0002-cmake-fix-openssl-build-on-win32.patch"
   patch -Np1 -i "${srcdir}/0003-libgit2-cmake-fix-pkgconfig.patch"
 }
 

mingw-w64-lsd/PKGBUILD

@@ -6,7 +6,7 @@ _realname=lsd
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="The next gen ls command (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -17,14 +17,15 @@ msys2_references=(
 license=("spdx:Apache-2.0")
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust" "${MINGW_PACKAGE_PREFIX}-pkgconf")
 options=('!strip' '!lto')
-depends=("${MINGW_PACKAGE_PREFIX}-libgit2")
+depends=()
 optdepends=("${MINGW_PACKAGE_PREFIX}-ttf-font-nerd: popular collections such as Font Awesome & fonts such as Hack")
            #'powerline-fonts: powerline symbols for terminals')
 source=("https://github.com/lsd-rs/lsd/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('120935c7e98f9b64488fde39987154a6a5b2236cb65ae847917012adf5e122d1')
 
 _env() {
-  export LIBGIT2_NO_VENDOR=1
+  # Not compatible with libgit2 1.8+
+  # export LIBGIT2_NO_VENDOR=1
   export WINAPI_NO_BUNDLED_LIBRARIES=1
   export SHELL_COMPLETIONS_DIR="$PWD/completions"
 }

mingw-w64-python-pygit2/PKGBUILD

@@ -3,8 +3,8 @@
 _realname=pygit2
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=1.14.1
-pkgrel=2
+pkgver=1.16.0
+pkgrel=1
 pkgdesc='Python bindings for libgit2 (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -22,11 +22,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
              "${MINGW_PACKAGE_PREFIX}-python-installer"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-cc")
-source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('ec5958571b82a6351785ca645e5394c31ae45eec5384b2fa9c4e05dde3597ad6')
+source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz"
+        "https://github.com/libgit2/pygit2/commit/eba710e45bb40e18641c6531394bb46631e7f295.patch")
+sha256sums=('7b29a6796baa15fc89d443ac8d51775411d9b1e5b06dc40d458c56c8576b48a2'
+            'e6d6c2cde580c163159bba8263c0fba4bc18af79781a6834e297cc2da242cbe9')
 
 prepare() {
-  cd "${srcdir}"
+  cd "${srcdir}/${_realname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/eba710e45bb40e18641c6531394bb46631e7f295.patch"
+  cd ..
   rm -rf "python-build-${MSYSTEM}" | true
   cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }