Skip to content

Commit cd31e4a

Browse files
authored
zed: update to 0.177.9 (#23662)
1 parent 8082390 commit cd31e4a

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

mingw-w64-zed/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/zed
22
/aws-lc-rs
3+
/aws-lc

mingw-w64-zed/PKGBUILD

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=zed
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
66
"${MINGW_PACKAGE_PREFIX}-${_realname}-docs")
7-
pkgver=0.177.8
7+
pkgver=0.177.9
88
pkgrel=1
99
pkgdesc="A high-performance, multiplayer code editor (mingw-w64)"
1010
arch=('any')
@@ -44,24 +44,27 @@ if [[ ${MSYSTEM} != CLANG* ]]; then
4444
optdepends+=("${MINGW_PACKAGE_PREFIX}-mesonlsp: for 'Meson' extension")
4545
fi
4646
source=("git+${msys2_repository_url}.git#tag=v${pkgver}"
47-
"git+https://github.com/aws/aws-lc-rs.git#tag=aws-lc-sys/v0.25.0"
47+
"git+https://github.com/aws/aws-lc-rs.git#tag=aws-lc-sys/v0.27.0"
48+
"git+https://github.com/aws/aws-lc.git"
4849
"zstd-sys.tar.gz::https://crates.io/api/v1/crates/zstd-sys/2.0.13+zstd.1.5.6/download"
4950
"aws-lc-clang-build.patch"
5051
"zed-dont-vendor-cargo-about.patch"
5152
"zstd-sys-remove-statik.patch")
52-
sha256sums=('204e79e0543c9139c04851649c0474909e818efb49576f2cb34b4038912f6420'
53-
'f7ef2e96d54e33481b5e4838ee3336a9382b8b7a24767ca47fd39069aa466723'
53+
sha256sums=('de20f2230ead24800fdf9ef21dcdc7fbcd4d3004ed945a7006c3e4b87aab62dc'
54+
'371b865c75caa66947b3b8e4e001e4255577c8320ba8875ae5212d3dc7dcc3a1'
55+
'SKIP'
5456
'38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa'
5557
'2e3d7ef6fdb3ef8a2ec11207e8120ea34553888116ea8a032cb425a8a6261c39'
5658
'b126b7a9e3cc8d3d68c49dbfc184d54691b10172dbfd3272d4c2f43424cfca5b'
5759
'48f4900ceb02d3aaf9a1020f33d56629156e96759f456c0e7ca18bfcf910767b')
5860

5961
prepare() {
60-
cd "${_realname}"
61-
62-
# fetch submodules for aws-lc-rs locally
63-
git -C ../aws-lc-rs submodule update --init --recursive
62+
(cd aws-lc-rs
63+
git config submodule."aws-lc-sys/aws-lc".url "${srcdir}/aws-lc"
64+
git config submodule."aws-lc-fips-sys/aws-lc".url "${srcdir}/aws-lc"
65+
git -c protocol.file.allow=always submodule update --init --recursive)
6466

67+
cd "${_realname}"
6568
rm rust-toolchain.toml
6669

6770
# use system cargo about to generate license file
@@ -83,7 +86,7 @@ prepare() {
8386
git config --global core.longpaths true
8487
fi
8588

86-
cargo update -p aws-lc-sys -p zstd-sys
89+
cargo update -p aws-lc-rs -p aws-lc-sys -p zstd-sys
8790
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
8891
# generate license for whole Zed contents
8992
sh script/generate-licenses
@@ -109,9 +112,6 @@ build() {
109112
export RUSTFLAGS="$RUSTFLAGS -C link-arg=-fuse-ld=lld -C symbol-mangling-version=v0
110113
-C target-feature=-crt-static --cfg tokio_unstable --cfg windows_slim_errors"
111114

112-
# set path to aws-lc include explicitly: https://github.com/aws/aws-lc-rs/issues/696
113-
export CFLAGS="$CFLAGS -I$(cygpath -am ${srcdir}/aws-lc-rs/aws-lc-sys/aws-lc/include)"
114-
115115
cargo build --release --frozen -p zed -p cli
116116

117117
cd docs

0 commit comments

Comments
 (0)