[arch-commits] Commit in julia/trunk (3 files)

[Antonio Rojas]

    Date: Friday, September 10, 2021 @ 18:09:16
  Author: arojas
Revision: 1013678

libgit2 1.2 rebuild

Added:
  julia/trunk/julia-libgit-1.2.patch
Modified:
  julia/trunk/PKGBUILD
  julia/trunk/julia-hardcoded-libs.patch

----------------------------+
 PKGBUILD                   |    9 +++++++--
 julia-hardcoded-libs.patch |   13 +++++++++++++
 julia-libgit-1.2.patch     |   14 ++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-10 17:50:03 UTC (rev 1013677)
+++ PKGBUILD	2021-09-10 18:09:16 UTC (rev 1013678)
@@ -8,7 +8,7 @@
 pkgname=julia
 epoch=2
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='https://julialang.org/'
@@ -19,6 +19,7 @@
 optdepends=('gnuplot: If using the Gaston Package from julia')
 replaces=(julia-docs)
 source=(https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgname-$pkgver-full.tar.gz{,.asc}
+        julia-libgit-1.2.patch
         julia-system-cblas.patch
         julia-hardcoded-libs.patch
         make-install-no-build.patch)
@@ -25,8 +26,9 @@
 backup=(etc/julia/startup.jl)
 sha256sums=('01241120515cb9435b96179cf301fbd2c24d4405f252588108d13ceac0f41c0a'
             'SKIP'
+            'c57ea92a11fa8dac72229e6a912d2372ec0d98d63486426fe3bdeeb795de48f7'
             'e44c260e4111908337caa82e1c3fef563b9d40e0a30da68d6e91405bf6db24dc'
-            '7497bff3cc6faac0a0664e620fd5525d7bb19d1bc3d2ff7f4d900dc36d476ceb'
+            '430935f332578b10ffd727db5aa85e288b944b07348892af339ac67212388672'
             '8be4605f92a009072ca7e843549c225fc4e959893498e7c4f8f79e861e63714d')
 validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <buildbot at julialang.org>
 
@@ -33,6 +35,8 @@
 prepare() {
   cd $pkgname-$pkgver
 
+# libgit2 1.2 compatibility
+  patch -p1 -i ../julia-libgit-1.2.patch
 # Add and use option to build with system cblas
   patch -p1 -i ../julia-system-cblas.patch # Add and use option to build with system cblas
 # Don't hardcode library names
@@ -92,6 +96,7 @@
     --skip LibCURL \
     --skip LibSSH2_jll \
     --skip MbedTLS_jll \
+    --skip MPFR_jll \
     --skip SuiteSparse_jll \
     --skip PCRE2_jll \
     --skip LibGit2_jll \

Modified: julia-hardcoded-libs.patch
===================================================================
--- julia-hardcoded-libs.patch	2021-09-10 17:50:03 UTC (rev 1013677)
+++ julia-hardcoded-libs.patch	2021-09-10 18:09:16 UTC (rev 1013678)
@@ -41,3 +41,16 @@
  end
  
  function __init__()
+diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
+index f0d4b5dda6..2ed3017b51 100644
+--- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl
++++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
+@@ -23,7 +23,7 @@ if Sys.iswindows()
+ elseif Sys.isapple()
+     const libgit2 = "@rpath/libgit2.1.1.dylib"
+ else
+-    const libgit2 = "libgit2.so.1.1"
++    const libgit2 = "libgit2.so"
+ end
+ 
+ function __init__()

Added: julia-libgit-1.2.patch
===================================================================
--- julia-libgit-1.2.patch	                        (rev 0)
+++ julia-libgit-1.2.patch	2021-09-10 18:09:16 UTC (rev 1013678)
@@ -0,0 +1,14 @@
+diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl
+index 9ffcaa3646..5f571e7b26 100644
+--- a/stdlib/LibGit2/src/types.jl
++++ b/stdlib/LibGit2/src/types.jl
+@@ -230,6 +230,9 @@ Matches the [`git_remote_callbacks`](https://libgit2.org/libgit2/#HEAD/type/git_
+     push_update_reference::Ptr{Cvoid}  = C_NULL
+     push_negotiation::Ptr{Cvoid}       = C_NULL
+     transport::Ptr{Cvoid}              = C_NULL
++    @static if LibGit2.VERSION >= v"1.2.0"
++        remote_ready::Ptr{Cvoid}       = C_NULL
++    end
+     payload::Any                       = nothing
+     @static if LibGit2.VERSION >= v"0.99.0"
+         resolve_url::Ptr{Cvoid}        = C_NULL