[gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/files/, dev-lang/julia/

["Maciej Barć" <xgqt@gentoo.org>]

commit:     0dbb267d2261560fd6eadad052b4c7020d28ccb5
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 08:35:57 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 09:06:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dbb267d

dev-lang/julia: fix build with libgit >=1.4.0

Another patch from Arch fixing libgit2 interface

Closes: https://bugs.gentoo.org/834152
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch  | 43 ++++++++++++++++++++++
 .../{julia-1.6.5.ebuild => julia-1.6.5-r1.ebuild}  |  1 +
 ...julia-1.7.1-r2.ebuild => julia-1.7.1-r3.ebuild} |  1 +
 3 files changed, 45 insertions(+)

diff --git a/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch b/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch
new file mode 100644
index 000000000000..fe753c0cd0e4
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch
@@ -0,0 +1,43 @@
+This patch comes from:
+  https://github.com/archlinux/svntogit-community/blob/packages/julia/trunk/julia-libgit-1.4.patch
+
+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

diff --git a/dev-lang/julia/julia-1.6.5.ebuild b/dev-lang/julia/julia-1.6.5-r1.ebuild
similarity index 99%
rename from dev-lang/julia/julia-1.6.5.ebuild
rename to dev-lang/julia/julia-1.6.5-r1.ebuild
index 534e938e4e3d..0a4e571a1ed9 100644
--- a/dev-lang/julia/julia-1.6.5.ebuild
+++ b/dev-lang/julia/julia-1.6.5-r1.ebuild
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_3.patch
 	"${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_4.patch
 	"${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch
+	"${FILESDIR}/${PN}"-1.6.5-libgit-1.4.patch
 	"${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch
 	"${FILESDIR}/${PN}"-1.6.5-hardcoded-libs.patch
 	"${FILESDIR}/${PN}"-1.6.5-do_not_set_rpath.patch

diff --git a/dev-lang/julia/julia-1.7.1-r2.ebuild b/dev-lang/julia/julia-1.7.1-r3.ebuild
similarity index 99%
rename from dev-lang/julia/julia-1.7.1-r2.ebuild
rename to dev-lang/julia/julia-1.7.1-r3.ebuild
index 58f9de7db701..3f40656536fb 100644
--- a/dev-lang/julia/julia-1.7.1-r2.ebuild
+++ b/dev-lang/julia/julia-1.7.1-r3.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
 	"${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_4.patch
 	"${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_5.patch
 	"${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch
+	"${FILESDIR}/${PN}"-1.6.5-libgit-1.4.patch
 	"${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch
 	"${FILESDIR}/${PN}"-1.7.1-hardcoded-libs.patch
 	"${FILESDIR}/${PN}"-1.7.1-do_not_set_rpath.patch