diff options
Diffstat (limited to 'dev-lang/julia')
| -rw-r--r-- | dev-lang/julia/Manifest | 5 | ||||
| -rw-r--r-- | dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch | 43 | ||||
| -rw-r--r-- | dev-lang/julia/julia-1.6.5-r2.ebuild (renamed from dev-lang/julia/julia-1.6.5.ebuild) | 3 | ||||
| -rw-r--r-- | dev-lang/julia/julia-1.7.1-r4.ebuild (renamed from dev-lang/julia/julia-1.7.1-r2.ebuild) | 3 |
4 files changed, 50 insertions, 4 deletions
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index c1aae0e7fc3d..d49465a85571 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -6,6 +6,7 @@ AUX julia-1.6.5-do_not_set_rpath.patch 1052 BLAKE2B 4f25a12c9cd6e345ecb1551c52ce AUX julia-1.6.5-hardcoded-libs.patch 2704 BLAKE2B 253d67a5de0278abf17d05f8e9a7f000f89f91d44779e4e93aa8b1a6388283af31e902913892a48ac4d587a6e009b69a4e81358cdd66b9e5471fdd7594482b85 SHA512 a498df49722f53cd598504fea47d54ec25d31f625342d47fb5f810e26ae73781597f6d008ce0f2978dd36c6bfb986c5ab4ce92ef1b6d01f31be8fa4add90553d AUX julia-1.6.5-lazy_artifacts_fix.patch 992 BLAKE2B 427a6b69fd07aed3bffc360e0ebd9fe9a15628ea0d2b5d3ac9821ebf2b029446f48f3cafb68a040c1f0deaec874a8350b791598a45794ee83d4ea55d8d16a511 SHA512 e21d53fa24db24966e536d342a0ebb4d6872df0968e4868db704a9d8398b6a1064fc7b00e395048143a4f55740fd1cf1b1c0bae9e53492041820ed54b86f320a AUX julia-1.6.5-libgit-1.2.patch 800 BLAKE2B 669c30ae7c00c69feb7edb34d87c3c19ab7015d8634cd3c052a8f6ee2a28be7c7314e01298e95f9d4b00851feb6bab48c44d15eb425f912050f31b26db57c912 SHA512 a4facb24520d8bfe4486291e3537bb5d56ce5fd1aebd9c1ebe657306d0e4a9cfa8cc235c2d715c1b9f4ecb3359cf3ea1dc0b4ff68d4c9a29ff578b4c667d09a2 +AUX julia-1.6.5-libgit-1.4.patch 1754 BLAKE2B c47cfe0eca1527f04ae5e81bdd6d11978e92f8cccbc000c9c96ae77e39b79f52b17d260333227cd699a935c52139808097617e7b627c45aa43b1809e97a9bf99 SHA512 fd71b277f625dde4cdb2ba100bf01f275e28209bbd18cbc143e7f0b2e01549b92b824161bde5a5ca4e5efcfb6f2f52147e66441e36f8f2813aa8436baf9401a1 AUX julia-1.6.5-llvm_13_compat_part_1.patch 6957 BLAKE2B 581076ba652db52a3948c9bb42c5a2481b5fffa92fb1dcbcd007f2edb3a950ac49ec015f7571c29b50ae243d5e8e9e25952b7cbac9a3b5ec8bd94769104e2891 SHA512 5a7d8202ede9daed2149f3bc30dcf76d0d25f1734b91df3780b405fbd493f4a6f75c851f97a8d27e9ea5753f5003af3c5eb8193ee61cf5808acf56dca1ebb0ba AUX julia-1.6.5-llvm_13_compat_part_2.patch 2897 BLAKE2B 7896e392fb8c2364fa10921f7396206fb6785dc430256646a537dcfb0c05a7d8faaa33feab7dad61c6c6e57c33f89eb0ce1eea85c3148622e61b3f0ce83c2164 SHA512 f8a7060236afd28da260e8dff5d69b2562d9cd204f090e1868592aa9d59df015a3a6d0bb19e1dfbaaa3825a8b81152f0e154e06cd31c87e89916269bbef68203 AUX julia-1.6.5-llvm_13_compat_part_3.patch 13351 BLAKE2B 76a72595a104ce290bce7a37ca6f3f29754753ac20ed3c2beeb9fce92d5aeda2b1396e523f70c0fb2eb16d4dc9cc888ebb5e78bc22f2689335cfca11f6b77630 SHA512 128896ab9bf161d7b596a0330977a598f57c19e34066281e7aa2d512e66f1a9d2bbff537af5b5b99198bef7a02e17a32eaafcff6f1ac2bfeef525e0763bf96b7 @@ -24,6 +25,6 @@ DIST julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz 1643008 BLAKE2B DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3 DIST llvm-11.0.1.src.tar.xz 38914796 BLAKE2B ccdec0632c9cf5fae8e6947c266136e04dc8c609e2ca9c1efb1205767d9181301e0de14601d11e2f27ec0ebc0749858a5f1089d8a40a9ae3f22582cbf6abef6e SHA512 b42c67ef88e09dd94171f85cdf49a421a15cfc82ff715c7ce6de22f98cefbe6c7cdf6bf4af7ca017d56ecf6aa3e36df3d823a78cf2dd5312de4301b54b43dbe8 EBUILD julia-1.6.3.ebuild 4604 BLAKE2B 8e5a273feaf93fa44aaf5f4e37ba429125006566184f65af6309e118799d9087a523317322dea5282c39c919a492fa28b24c8fedec5290bee6265cd50e145718 SHA512 2f06acbc40b6d081e15433d374ce268d0a4a290f1f720a690ee0d5bb94b6f99688ba996989b340f0b4801a70574c942ba93ea0ccd381cfe4cf0e5df75e3e89c7 -EBUILD julia-1.6.5.ebuild 4693 BLAKE2B b1fad8bab8f2b9f4a70f85eff2c7f0896c05a3b833b7edbc40cf5c1afe64e9b8ea906394c3d3e74d30c46ad63f529ebcd383b87a239265977eddacc6d41c9827 SHA512 d65a2eae5a4b08aeccbb48a1771976fdb7c638e783ad3cb7845438dbecb4d3647e567a2a88f61fe8143055f86aaf045efe3b387d8668743b0c7aa0fde69b49f0 -EBUILD julia-1.7.1-r2.ebuild 4899 BLAKE2B fe19a2cae8bfaff1b000df2f6babf5d708c978d13601e02c7f9cb306fe83261e2523ae571f3e6e666d66c425f407b1cfae054471354447592bd4cfc8e1e97d59 SHA512 858702e1facb9b8312b0f34d77ac13427eb368e5c079dffdeffb8be42a063fdfe5f2efb624f75a0d4d2eabce15cf992f2f9bd77f8d2f4d66635f3a7e8ebd4f93 +EBUILD julia-1.6.5-r2.ebuild 4745 BLAKE2B faf5cfc0103a93c9bcfd44c13a40db066f6aa78cca3d4dc2a9e99e80a14681b817cd5173687e8c90039d879e1f04a29bfa498afb900d37a9ca0620e84468f0f8 SHA512 8396a9c29a4c585a5eff0e8dfc455a48e5fefbe33203c33d1b89b80e262f0b6a5a17c90ce938f7f078209530cf999861f15f948ca9f4a96a17af92e9bf774270 +EBUILD julia-1.7.1-r4.ebuild 4951 BLAKE2B 48c32c5f8eac79ce84183685627eefdfea484578efedd6b822ec34d3e64e6519b83b1a5931cc300d221bb9076677e53c2b676f7002a81a0d94345c6d93b777f6 SHA512 0e8e6a4524db3b54843a87be8999d524e4f10f00dbc8bc06cad53db5ecbddc70b58e3ed38b91ca7664ab96c563c198e52cc45e3ddad83875b54d45f02f5d8482 MISC metadata.xml 1530 BLAKE2B 776f8e2eaaebf6a0429b9019ec606c76f80828c5d27ec07f6503e855d44f681a476d9fe0631de0eb0f609b0256e063c172e8fbfacd3e37118e66c07ade2cb42d SHA512 d172e00e631a7a4e4b61c0f3ad90849b189c8b8aa8586fceb63c26ca407c4e477339f51b05d48681be37d06b873d6c2fce62b61efb4b9874323d92022d570288 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-r2.ebuild index 534e938e4e3d..a2d6758f86d7 100644 --- a/dev-lang/julia/julia-1.6.5.ebuild +++ b/dev-lang/julia/julia-1.6.5-r2.ebuild @@ -38,7 +38,7 @@ RDEPEND+=" dev-libs/libutf8proc:0=[-cjk] dev-util/patchelf >=net-libs/mbedtls-2.2 - net-misc/curl[http2,ssh] + <net-misc/curl-7.81.0[http2,ssh] sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= @@ -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-r4.ebuild index 58f9de7db701..64c2c07f71c4 100644 --- a/dev-lang/julia/julia-1.7.1-r2.ebuild +++ b/dev-lang/julia/julia-1.7.1-r4.ebuild @@ -39,7 +39,7 @@ RDEPEND+=" >=dev-libs/libutf8proc-2.6.1:0=[-cjk] >=dev-util/patchelf-0.13 >=net-libs/mbedtls-2.2 - net-misc/curl[http2,ssh] + <net-misc/curl-7.81.0[http2,ssh] sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= @@ -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 |