[arch-commits] Commit in julia/trunk (PKGBUILD julia-libgit-1.4.patch)

[Antonio Rojas]

    Date: Saturday, February 19, 2022 @ 12:26:07
  Author: arojas
Revision: 1134861

Add patch for libgit2 1.4

Added:
  julia/trunk/julia-libgit-1.4.patch
Modified:
  julia/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    6 +++++-
 julia-libgit-1.4.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-19 12:22:32 UTC (rev 1134860)
+++ PKGBUILD	2022-02-19 12:26:07 UTC (rev 1134861)
@@ -9,7 +9,7 @@
 pkgname=julia
 epoch=2
 pkgver=1.7.2
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='https://julialang.org/'
@@ -27,6 +27,7 @@
         f8c918b0.patch
         63303980.patch
         julia-libgit-1.2.patch
+        julia-libgit-1.4.patch
         julia-system-cblas.patch
         julia-hardcoded-libs.patch
         make-install-no-build.patch
@@ -44,6 +45,7 @@
             'bc6c85cbbca489ef0b2876dbeb6ae493c11573e058507b8bcb9e01273bc3a38c'
             'ce9cd140c3bc39987d60340bf365d6238e79cf4d5385494272c49c64af22ef78'
             'c57ea92a11fa8dac72229e6a912d2372ec0d98d63486426fe3bdeeb795de48f7'
+            'cfe498a090d0026b92f9db4ed65ac3818c2efa5ec83bcefed728d27abff73081'
             '8f8c12853ce847f5d1b5a4a461ddec701decdb81dae7bb31d66560c1deaed97a'
             '03043f005c133ac9af1d4dc113ea8b525ad3b393690625be77975f0e29dd6457'
             '8be4605f92a009072ca7e843549c225fc4e959893498e7c4f8f79e861e63714d'
@@ -66,6 +68,8 @@
   patch -p1 -i ../99d4e655.patch
 # libgit2 1.2 compatibility
   patch -p1 -i ../julia-libgit-1.2.patch
+# libgit2 1.4 compatibility
+  patch -p1 -i ../julia-libgit-1.4.patch
 # libunwind 1.6 compatibility
   patch -p1 -i ../julia-libunwind-1.6.patch
 # Add and use option to build with system cblas

Added: julia-libgit-1.4.patch
===================================================================
--- julia-libgit-1.4.patch	                        (rev 0)
+++ julia-libgit-1.4.patch	2022-02-19 12:26:07 UTC (rev 1134861)
@@ -0,0 +1,40 @@
+diff --git a/stdlib/LibGit2/src/consts.jl b/stdlib/LibGit2/src/consts.jl
+index 2bc9edaf89..55887ebe2a 100644
+--- a/stdlib/LibGit2/src/consts.jl
++++ b/stdlib/LibGit2/src/consts.jl
+@@ -247,6 +247,11 @@ const RESET_HARD  = Cint(3) # MIXED plus changes in working tree discarded
+                             REBASE_OPERATION_FIXUP  = Cint(4),
+                             REBASE_OPERATION_EXEC   = Cint(5))
+ 
++# git_remote_redirect_t
++const GIT_REMOTE_REDIRECT_NONE    = Cint(0)
++const GIT_REMOTE_REDIRECT_INITIAL = Cint(1)
++const GIT_REMOTE_REDIRECT_ALL     = Cint(2)
++
+ # fetch_prune
+ const FETCH_PRUNE_UNSPECIFIED = Cint(0)
+ const FETCH_PRUNE             = Cint(1)
+diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl
+index 9ffcaa3646..98d938df65 100644
+--- a/stdlib/LibGit2/src/types.jl
++++ b/stdlib/LibGit2/src/types.jl
+@@ -343,6 +343,9 @@ The fields represent:
+     @static if LibGit2.VERSION >= v"0.25.0"
+         proxy_opts::ProxyOptions       = ProxyOptions()
+     end
++    @static if LibGit2.VERSION >= v"1.4.0"
++        follow_redirects::Cint         = Consts.GIT_REMOTE_REDIRECT_INITIAL
++    end
+     @static if LibGit2.VERSION >= v"0.24.0"
+         custom_headers::StrArrayStruct = StrArrayStruct()
+     end
+@@ -674,6 +677,9 @@ The fields represent:
+     @static if LibGit2.VERSION >= v"0.25.0"
+         proxy_opts::ProxyOptions       = ProxyOptions()
+     end
++    @static if LibGit2.VERSION >= v"1.4.0"
++        follow_redirects::Cint         = Consts.GIT_REMOTE_REDIRECT_INITIAL
++    end
+     @static if LibGit2.VERSION >= v"0.24.0"
+         custom_headers::StrArrayStruct = StrArrayStruct()
+     end