Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / julia
Commits: b0cd6594 by Antonio Rojas at 2023-09-12T09:03:14+02:00 upgpkg: 2:1.9.3-2: Properly fix libgit 1.7 support (FS#79665) - - - - - 2 changed files: - PKGBUILD - julia-libgit2-1.7.patch Changes: ===================================== PKGBUILD ===================================== @@ -9,7 +9,7 @@ pkgname=julia epoch=2 pkgver=1.9.3 -pkgrel=1 +pkgrel=2 arch=(x86_64) pkgdesc='High-level, high-performance, dynamic programming language' url='https://julialang.org/' @@ -32,7 +32,7 @@ sha256sums=('8fc0c9dc5443a28d359bd79dda3940fa94ba2b7966b89865beb20da81123c316' 'SKIP' '3c0c03eabb668e3242fcd3058c1011dfbb579cc1c5adc3ae1016531e711cc64e' '94e6d4fa9c68360c795807b49bcb126bbbbf4c927cf7e8358b3e0e3d2183d63e' - '63e26f66ab4ea31e493805d3bf906f1c90e5b7f7f43b0c052e19b19894e3a510' + '97efa327f1d389de59258f6047689ca7bed2b7be922088566865defd5d305ed0' '481ce9b093969c2433b86d4d2bc0815470225f680712fc6231df3629ca7fbe5e' '5e3f55e68e3f7172d545888479cd9a35e7589d0467684c6d98c721e3b1878acd' '628d41c0b7739ed6c4c34c7416efd81646fbd17ebab9e88ae46a3668650d3104' ===================================== julia-libgit2-1.7.patch ===================================== @@ -1,3 +1,50 @@ +From 764484f58b5daead9fd58de08ce35382758d3985 Mon Sep 17 00:00:00 2001 +From: Yichao Yu <[email protected]> +Date: Sun, 10 Sep 2023 14:07:57 -0400 +Subject: [PATCH] libgit2 1.7.0 support + +--- + stdlib/LibGit2/src/consts.jl | 5 +++++ + stdlib/LibGit2/src/types.jl | 5 ++++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/stdlib/LibGit2/src/consts.jl b/stdlib/LibGit2/src/consts.jl +index f3a460108db6b..8f0e6eeb2ec87 100644 +--- a/stdlib/LibGit2/src/consts.jl ++++ b/stdlib/LibGit2/src/consts.jl +@@ -468,4 +468,9 @@ Option flags for `GitProxy`. + TRACE_TRACE + end + ++# The type of object id ++@enum(GIT_OID_TYPE, ++ _OID_DEFAULT = 0, ++ OID_SHA1 = 1) ++ + end +diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl +index 0b653f9b6ad21..c796ff0f98b20 100644 +--- a/stdlib/LibGit2/src/types.jl ++++ b/stdlib/LibGit2/src/types.jl +@@ -2,7 +2,7 @@ + + using Base: something + import Base.@kwdef +-import .Consts: GIT_SUBMODULE_IGNORE, GIT_MERGE_FILE_FAVOR, GIT_MERGE_FILE, GIT_CONFIG ++import .Consts: GIT_SUBMODULE_IGNORE, GIT_MERGE_FILE_FAVOR, GIT_MERGE_FILE, GIT_CONFIG, GIT_OID_TYPE + + const OID_RAWSZ = 20 + const OID_HEXSZ = OID_RAWSZ * 2 +@@ -439,6 +439,9 @@ The fields represent: + # options controlling how the diff text is generated + context_lines::UInt32 = UInt32(3) + interhunk_lines::UInt32 = UInt32(0) ++ @static if LibGit2.VERSION >= v"1.7.0" ++ oid_type::GIT_OID_TYPE = Consts._OID_DEFAULT ++ end + id_abbrev::UInt16 = UInt16(7) + max_size::Int64 = Int64(512*1024*1024) #512Mb + old_prefix::Cstring = Cstring(C_NULL) diff --git a/stdlib/LibGit2/test/libgit2-tests.jl b/stdlib/LibGit2/test/libgit2-tests.jl index 4ace98a0b1..f230ff4e14 100644 --- a/stdlib/LibGit2/test/libgit2-tests.jl View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/julia/-/commit/b0cd6594bdbc0909f1ab12ee52b3591fb9a2420f -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/julia/-/commit/b0cd6594bdbc0909f1ab12ee52b3591fb9a2420f You're receiving this email because of your account on gitlab.archlinux.org.
