Skip to content

Commit 1b83699

Browse files
yuyichaoyuyichao
committed
[julia-git] update patch
1 parent b4c87bd commit 1b83699

10 files changed

+180
-66
lines changed

‎alarmcn/julia-git/0001-Disable-upgrade-of-stdlib-package.diff‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 95af66bc200c193562976153d69c8a332c09e5f7 Mon Sep 17 00:00:00 2001
2+
From: Yichao Yu <[email protected]>
3+
Date: Wed, 29 Oct 2025 10:47:10 -0400
4+
Subject: [PATCH] Disable upgrade of stdlib package
5+
6+
We are packaging the latested already
7+
---
8+
src/Types.jl | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/src/Types.jl b/src/Types.jl
12+
index ecd1c29ed..44d46593d 100644
13+
--- a/src/Types.jl
14+
+++ b/src/Types.jl
15+
@@ -523,7 +523,7 @@ is_project_uuid(env::EnvCache, uuid::UUID) = project_uuid(env) == uuid
16+
# Context #
17+
###########
18+
19+
-const UPGRADABLE_STDLIBS = ["DelimitedFiles", "Statistics"]
20+
+const UPGRADABLE_STDLIBS = String[]
21+
const UPGRADABLE_STDLIBS_UUIDS = Set{UUID}()
22+
const STDLIB = Ref{Union{DictStdLibs, Nothing}}(nothing)
23+
function load_stdlib()
24+
--
25+
2.51.2
26+

‎alarmcn/julia-git/0002-Hard-code-7z-and-zstd-path.diff‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
From 295514a8f5f6f118a2192a85070a1726f537f254 Mon Sep 17 00:00:00 2001
2+
From: Yichao Yu <[email protected]>
3+
Date: Wed, 29 Oct 2025 10:48:58 -0400
4+
Subject: [PATCH] Hard code 7z and zstd path
5+
6+
---
7+
src/PlatformEngines.jl | 28 ++++------------------------
8+
1 file changed, 4 insertions(+), 24 deletions(-)
9+
10+
diff --git a/src/PlatformEngines.jl b/src/PlatformEngines.jl
11+
index 7ddaa27a6..f2e38f6b4 100644
12+
--- a/src/PlatformEngines.jl
13+
+++ b/src/PlatformEngines.jl
14+
@@ -12,36 +12,16 @@ using Base.BinaryPlatforms, p7zip_jll, Zstd_jll
15+
export verify, unpack, package, download_verify_unpack, get_extract_cmd, detect_archive_format
16+
17+
const EXE7Z_LOCK = ReentrantLock()
18+
-const EXE7Z = Ref{String}()
19+
+const EXE7Z = Ref{String}("/usr/bin/7z")
20+
const EXEZSTD_LOCK = ReentrantLock()
21+
-const EXEZSTD = Ref{String}()
22+
+const EXEZSTD = Ref{String}("/usr/bin/zstd")
23+
24+
function exe7z()
25+
- # If the JLL is available, use the wrapper function defined in there
26+
- if p7zip_jll.is_available()
27+
- return p7zip_jll.p7zip()
28+
- end
29+
-
30+
- return lock(EXE7Z_LOCK) do
31+
- if !isassigned(EXE7Z)
32+
- EXE7Z[] = find7z()
33+
- end
34+
- return Cmd([EXE7Z[]])
35+
- end
36+
+ return `/usr/bin/7z`
37+
end
38+
39+
function exezstd()
40+
- # If the JLL is available, use the wrapper function defined in there
41+
- if Zstd_jll.is_available()
42+
- return Zstd_jll.zstd()
43+
- end
44+
-
45+
- return lock(EXEZSTD_LOCK) do
46+
- if !isassigned(EXEZSTD)
47+
- EXEZSTD[] = findzstd()
48+
- end
49+
- return Cmd([EXEZSTD[]])
50+
- end
51+
+ return `/usr/bin/zstd`
52+
end
53+
54+
function find7z()
55+
--
56+
2.51.2
57+

‎alarmcn/julia-git/PKGBUILD‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ source=('git+https://github.com/JuliaLang/julia'
8787
julia-preinstall.hook
8888
julia-postinstall.hook
8989
arch-source-translate.cpp
90-
sysp7z.diff
91-
disable-upgrade.diff
90+
0001-Disable-upgrade-of-stdlib-package.diff
91+
0002-Hard-code-7z-and-zstd-path.diff
9292
download_curl.diff)
9393
sha512sums=('SKIP'
9494
'4a8a3f18b563291da01810f9b4024a30bd1b99bcde23f6c252309decb539564cf83436143484de79001e51ddb2a02b8ae3a7d73cba9ff1216eb0ab3f9f776326'
@@ -112,8 +112,8 @@ sha512sums=('SKIP'
112112
'997f22456f175c6cc03b2dd407b7584df514bc4c91602ef011b93d8b558f7c587b4e216535e573f6063f3a606f88c48dee3041a5122a7dbf0bee6d1bc8df15b4'
113113
'a668a9bd01cec8f53f457d9124107a230260c79fd57cbce4c4bf80e3451758d8e67263faa3f9d8b3da0c10bffbe29e4032106881ebe682c7f66414d8989638be'
114114
'c2da7461c53e56293d35581cb4aa2500ef9a98e52a354bfa9271f44bd768ed77c5b362e304e0ab467fb286d2198f3e28cf91089e8773ebcfc85e294223a12f0e'
115-
'79012833348654947f6b045e2ab5aa0a155aadbc1fd9e034c04456ce13acccdbbd2d3e6389daa2e4644c979b1f7ccea41afb0d54c1719b1b681f68fcb6006849'
116-
'cd5ce157624156d7fce015dc7955d3ba8c8efa4c10dbf2cb7ab532428d00e17d0a5be2c2963e2f8dd4c63471ac2ff895f207ecc0db17557fb0eb8b7d883891ec'
115+
'99b91e921e730016e758dba10fb80436c0bb595789c941536d4533fd053caeff1100c06d1813cd0326790c85a988f1c6e282bb185eba7991b0485d529d35ba2c'
116+
'6184ec0c916cf51a478760dba85d3a140077ec073a49aac1b95d9fd3f46b4ecefad44725729adfc4af576e6940f65ee8205bce153db1e9fe8fb432c6316f90c5'
117117
'5be40dcb72428885c06c8353019bd8fac0ea186a7536cf2bab2554d2724fb3d4a5b0b3f61727428e5cf7906f14a213f08dcb238b5bd10d408d86669e2c93ca78')
118118

119119
_versioned_llvm=
@@ -281,8 +281,9 @@ EOF
281281
make "${julia_opts[@]}" julia-stdlib
282282
(
283283
cd usr/share/julia/stdlib/v*/Pkg
284-
patch -Np0 --no-backup-if-mismatch < "$srcdir/sysp7z.diff"
285-
patch -Np1 --no-backup-if-mismatch < "$srcdir/disable-upgrade.diff"
284+
285+
patch -Np0 --no-backup-if-mismatch < "$srcdir/0001-Disable-upgrade-of-stdlib-package.diff"
286+
patch -Np1 --no-backup-if-mismatch < "$srcdir/0002-Hard-code-7z-and-zstd-path.diff"
286287
)
287288
(
288289
cd usr/share/julia/stdlib/v*/Downloads

‎alarmcn/julia-git/disable-upgrade.diff‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎alarmcn/julia-git/sysp7z.diff‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎archlinuxcn/julia-git/0001-Disable-upgrade-of-stdlib-package.diff‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 95af66bc200c193562976153d69c8a332c09e5f7 Mon Sep 17 00:00:00 2001
2+
From: Yichao Yu <[email protected]>
3+
Date: Wed, 29 Oct 2025 10:47:10 -0400
4+
Subject: [PATCH] Disable upgrade of stdlib package
5+
6+
We are packaging the latested already
7+
---
8+
src/Types.jl | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/src/Types.jl b/src/Types.jl
12+
index ecd1c29ed..44d46593d 100644
13+
--- a/src/Types.jl
14+
+++ b/src/Types.jl
15+
@@ -523,7 +523,7 @@ is_project_uuid(env::EnvCache, uuid::UUID) = project_uuid(env) == uuid
16+
# Context #
17+
###########
18+
19+
-const UPGRADABLE_STDLIBS = ["DelimitedFiles", "Statistics"]
20+
+const UPGRADABLE_STDLIBS = String[]
21+
const UPGRADABLE_STDLIBS_UUIDS = Set{UUID}()
22+
const STDLIB = Ref{Union{DictStdLibs, Nothing}}(nothing)
23+
function load_stdlib()
24+
--
25+
2.51.2
26+

‎archlinuxcn/julia-git/0002-Hard-code-7z-and-zstd-path.diff‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
From 295514a8f5f6f118a2192a85070a1726f537f254 Mon Sep 17 00:00:00 2001
2+
From: Yichao Yu <[email protected]>
3+
Date: Wed, 29 Oct 2025 10:48:58 -0400
4+
Subject: [PATCH] Hard code 7z and zstd path
5+
6+
---
7+
src/PlatformEngines.jl | 28 ++++------------------------
8+
1 file changed, 4 insertions(+), 24 deletions(-)
9+
10+
diff --git a/src/PlatformEngines.jl b/src/PlatformEngines.jl
11+
index 7ddaa27a6..f2e38f6b4 100644
12+
--- a/src/PlatformEngines.jl
13+
+++ b/src/PlatformEngines.jl
14+
@@ -12,36 +12,16 @@ using Base.BinaryPlatforms, p7zip_jll, Zstd_jll
15+
export verify, unpack, package, download_verify_unpack, get_extract_cmd, detect_archive_format
16+
17+
const EXE7Z_LOCK = ReentrantLock()
18+
-const EXE7Z = Ref{String}()
19+
+const EXE7Z = Ref{String}("/usr/bin/7z")
20+
const EXEZSTD_LOCK = ReentrantLock()
21+
-const EXEZSTD = Ref{String}()
22+
+const EXEZSTD = Ref{String}("/usr/bin/zstd")
23+
24+
function exe7z()
25+
- # If the JLL is available, use the wrapper function defined in there
26+
- if p7zip_jll.is_available()
27+
- return p7zip_jll.p7zip()
28+
- end
29+
-
30+
- return lock(EXE7Z_LOCK) do
31+
- if !isassigned(EXE7Z)
32+
- EXE7Z[] = find7z()
33+
- end
34+
- return Cmd([EXE7Z[]])
35+
- end
36+
+ return `/usr/bin/7z`
37+
end
38+
39+
function exezstd()
40+
- # If the JLL is available, use the wrapper function defined in there
41+
- if Zstd_jll.is_available()
42+
- return Zstd_jll.zstd()
43+
- end
44+
-
45+
- return lock(EXEZSTD_LOCK) do
46+
- if !isassigned(EXEZSTD)
47+
- EXEZSTD[] = findzstd()
48+
- end
49+
- return Cmd([EXEZSTD[]])
50+
- end
51+
+ return `/usr/bin/zstd`
52+
end
53+
54+
function find7z()
55+
--
56+
2.51.2
57+

‎archlinuxcn/julia-git/PKGBUILD‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ source=('git+https://github.com/JuliaLang/julia'
8787
julia-preinstall.hook
8888
julia-postinstall.hook
8989
arch-source-translate.cpp
90-
sysp7z.diff
91-
disable-upgrade.diff
90+
0001-Disable-upgrade-of-stdlib-package.diff
91+
0002-Hard-code-7z-and-zstd-path.diff
9292
download_curl.diff)
9393
sha512sums=('SKIP'
9494
'4a8a3f18b563291da01810f9b4024a30bd1b99bcde23f6c252309decb539564cf83436143484de79001e51ddb2a02b8ae3a7d73cba9ff1216eb0ab3f9f776326'
@@ -112,8 +112,8 @@ sha512sums=('SKIP'
112112
'997f22456f175c6cc03b2dd407b7584df514bc4c91602ef011b93d8b558f7c587b4e216535e573f6063f3a606f88c48dee3041a5122a7dbf0bee6d1bc8df15b4'
113113
'a668a9bd01cec8f53f457d9124107a230260c79fd57cbce4c4bf80e3451758d8e67263faa3f9d8b3da0c10bffbe29e4032106881ebe682c7f66414d8989638be'
114114
'c2da7461c53e56293d35581cb4aa2500ef9a98e52a354bfa9271f44bd768ed77c5b362e304e0ab467fb286d2198f3e28cf91089e8773ebcfc85e294223a12f0e'
115-
'79012833348654947f6b045e2ab5aa0a155aadbc1fd9e034c04456ce13acccdbbd2d3e6389daa2e4644c979b1f7ccea41afb0d54c1719b1b681f68fcb6006849'
116-
'cd5ce157624156d7fce015dc7955d3ba8c8efa4c10dbf2cb7ab532428d00e17d0a5be2c2963e2f8dd4c63471ac2ff895f207ecc0db17557fb0eb8b7d883891ec'
115+
'99b91e921e730016e758dba10fb80436c0bb595789c941536d4533fd053caeff1100c06d1813cd0326790c85a988f1c6e282bb185eba7991b0485d529d35ba2c'
116+
'6184ec0c916cf51a478760dba85d3a140077ec073a49aac1b95d9fd3f46b4ecefad44725729adfc4af576e6940f65ee8205bce153db1e9fe8fb432c6316f90c5'
117117
'5be40dcb72428885c06c8353019bd8fac0ea186a7536cf2bab2554d2724fb3d4a5b0b3f61727428e5cf7906f14a213f08dcb238b5bd10d408d86669e2c93ca78')
118118

119119
_versioned_llvm=
@@ -281,8 +281,9 @@ EOF
281281
make "${julia_opts[@]}" julia-stdlib
282282
(
283283
cd usr/share/julia/stdlib/v*/Pkg
284-
patch -Np0 --no-backup-if-mismatch < "$srcdir/sysp7z.diff"
285-
patch -Np1 --no-backup-if-mismatch < "$srcdir/disable-upgrade.diff"
284+
285+
patch -Np0 --no-backup-if-mismatch < "$srcdir/0001-Disable-upgrade-of-stdlib-package.diff"
286+
patch -Np1 --no-backup-if-mismatch < "$srcdir/0002-Hard-code-7z-and-zstd-path.diff"
286287
)
287288
(
288289
cd usr/share/julia/stdlib/v*/Downloads

‎archlinuxcn/julia-git/disable-upgrade.diff‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎archlinuxcn/julia-git/sysp7z.diff‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)