libgit2: update to 1.8.1

msys2 · Oct 13, 2024 · cf06991 · cf06991
1 parent 517b094
commit cf06991
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 76 deletions.
diff --git a/mingw-w64-libgit2/0001-libgit2-1.4.2-rc-filename.patch b/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__

diff --git a/mingw-w64-libgit2/0002-cmake-fix-openssl-build-on-win32.patch b/mingw-w64-libgit2/0002-cmake-fix-openssl-build-on-win32.patch
diff --git a/mingw-w64-libgit2/PKGBUILD b/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.1
+pkgrel=1
 pkgdesc='A linkable library for Git (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' '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=('8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e'
+            '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"
 }