Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Stop bundling GLib in Linux release archives (#61593)

Neel1b04e4caf01e
diff --git a/crates/livekit_client/src/livekit_client/linux.rs b/crates/livekit_client/src/livekit_client/linux.rs
index fe7189e901d..0ce630976d2 100644
--- a/crates/livekit_client/src/livekit_client/linux.rs
+++ b/crates/livekit_client/src/livekit_client/linux.rs
@@ -189,8 +189,8 @@ pub(crate) async fn start_wayland_desktop_capture(
.ok_or_else(|| {
stop_flag.store(true, Ordering::Relaxed);
anyhow::anyhow!(
- "Screen sharing was canceled or the portal denied permission. \
- You can try again from the screen share button."
+ "Screen sharing was canceled, permission was denied, or the PipeWire \
+ connection failed. You can try again from the screen share button."
)
})?;
diff --git a/script/bundle-linux b/script/bundle-linux
index 0b1fabe9826..79de85b2a81 100755
--- a/script/bundle-linux
+++ b/script/bundle-linux
@@ -155,10 +155,15 @@ cp "${target_dir}/${target_triple}/release/cli" "${zed_dir}/bin/zed"
# Libs
# Bundle libstdc++ so older supported systems can run binaries built with our
# toolchain even when their system libstdc++.so.6 lacks required GLIBCXX symbols.
+#
+# Never bundle the GLib family or its private dependencies: host libraries that
+# get dlopen'd are built against the system GLib, and resolving them against an
+# older bundled copy fails with missing symbols.
find_libs() {
ldd ${target_dir}/${target_triple}/release/zed |\
cut -d' ' -f3 |\
- grep -v '\<\(libc.so\|libgcc_s.so\|libm.so\|libpthread.so\|libdl.so\|libasound.so\)'
+ grep -v '\<\(libc.so\|libgcc_s.so\|libm.so\|libpthread.so\|libdl.so\|libasound.so\)' |\
+ grep -v '\<\(libglib-2.0.so\|libgobject-2.0.so\|libgio-2.0.so\|libgmodule-2.0.so\|libpcre.so\|libpcre2-8.so\|libmount.so\|libblkid.so\|libselinux.so\|libffi.so\|libresolv.so\|libz.so\)'
}
mkdir -p "${zed_dir}/lib"
diff --git a/script/install.sh b/script/install.sh
index f3a32b102a0..0a8278b0c54 100755
--- a/script/install.sh
+++ b/script/install.sh
@@ -116,6 +116,16 @@ linux() {
mkdir -p "$HOME/.local/zed$suffix.app"
tar -xzf "$temp/zed-linux-$arch.tar.gz" -C "$HOME/.local/"
+ zed_editor="$HOME/.local/zed$suffix.app/libexec/zed-editor"
+ if [ -f "$zed_editor" ] && command -v ldd >/dev/null 2>&1; then
+ missing="$(ldd "$zed_editor" 2>/dev/null | sed -n 's/^[[:space:]]*\(.*\) => not found$/\1/p')"
+ if [ -n "$missing" ]; then
+ echo "Warning: your system is missing libraries that Zed needs:"
+ echo "$missing" | sed 's/^/ /'
+ echo "Install them with your package manager, or Zed will fail to start."
+ fi
+ fi
+
# Setup ~/.local directories
mkdir -p "$HOME/.local/bin" "$HOME/.local/share/applications"