-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New package: zeditor-0.231.1 #59813
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
New package: zeditor-0.231.1 #59813
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| diff --git a/assets/settings/default.json b/assets/settings/default.json | ||
| index efb0cc9..08fc993 100644 | ||
| --- a/assets/settings/default.json | ||
| +++ b/assets/settings/default.json | ||
| @@ -1240,9 +1240,9 @@ | ||
| // Control what info is collected by Zed. | ||
| "telemetry": { | ||
| // Send debug info like crash reports. | ||
| - "diagnostics": true, | ||
| + "diagnostics": false, | ||
| // Send anonymized usage data like what languages you're using Zed with. | ||
| - "metrics": true, | ||
| + "metrics": false | ||
| }, | ||
| // Whether to disable all AI features in Zed. | ||
| // |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,61 @@ | ||||||
| # Template file for 'zeditor' | ||||||
| pkgname=zeditor | ||||||
| version=0.231.1 | ||||||
| revision=1 | ||||||
| archs="x86_64 aarch64" | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Didn't compile successfully on musl versions locally
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Then that is a merge blocker, there is no reason it shouldn't work with musl.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because of dependencies not existing in one of the musl version. For details, I'll let you know when I get home |
||||||
| build_style=cargo | ||||||
| make_build_args="--package cli --package zed" # --package remote_server # reason below | ||||||
| make_check_args="--workspace" | ||||||
| hostmakedepends="pkg-config cmake gettext perl libzstd-devel bzip2-devel" | ||||||
| makedepends="gettext-devel elfutils-devel alsa-lib-devel fontconfig-devel glib-devel libva-devel libxcb-devel libxkbcommon-devel libzstd-devel openssl-devel wayland-devel vulkan-loader sqlite-devel libX11-devel libgit2-1.9-devel" | ||||||
| short_desc="High-performance multiplayer code editor" | ||||||
| maintainer="JudahJL <judahlegy@gmail.com>" | ||||||
| license="GPL-3.0-or-later" | ||||||
| homepage="https://zed.dev/" | ||||||
| distfiles="https://github.com/zed-industries/zed/archive/refs/tags/v${version}.tar.gz" | ||||||
| checksum=1e7f356e3498d432501033578c5d4a6f56aff611b9204a35ad6245b8b33b2abf | ||||||
| make_check=ci-skip # too slow and memory-intensive for build environment | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this confirmed?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Compilation took ~50 Gb. OS killed the test processes too locally |
||||||
|
|
||||||
| pre_build() { | ||||||
| echo -n stable > crates/zed/RELEASE_CHANNEL | ||||||
| export RELEASE_VERSION="${version}" | ||||||
| export ZED_UPDATE_EXPLANATION="Please use 'xbps-install -S zeditor' to update." | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This needs
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. https://zed.dev/docs/development/linux#notes-for-packaging-zed I can update the command though |
||||||
| export ZED_BUNDLE=true | ||||||
|
|
||||||
| if [ "$CROSS_BUILD" ]; then | ||||||
| export PKG_CONFIG_ALLOW_CROSS=1 | ||||||
|
|
||||||
| # workaround the cc-rs mixing CFLAGS for host and target. | ||||||
| # https://github.com/rust-lang/cc-rs/issues/1469 | ||||||
| export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}" \ | ||||||
| CXXFLAGS_${RUST_BUILD//-/_}="${CXXFLAGS_host}" \ | ||||||
| LDFLAGS_${RUST_BUILD//-/_}="${LDFLAGS_host}" \ | ||||||
| CFLAGS_${RUST_TARGET//-/_}="${CFLAGS}" \ | ||||||
| CXXFLAGS_${RUST_TARGET//-/_}="${CXXFLAGS}" \ | ||||||
| LDFLAGS_${RUST_TARGET//-/_}="${LDFLAGS}" \ | ||||||
| CFLAGS="" CXXFLAGS="" LDFLAGS="" | ||||||
| fi | ||||||
| } | ||||||
|
|
||||||
| do_install() { | ||||||
| local app_id="dev.zed.Zed" | ||||||
| local app_cli_name="zed-cli" | ||||||
|
Comment on lines
+41
to
+42
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just remove those variables, they are mostly useless. Also not sure if "zed-cli` is a good choice, no other distribution calls it that.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Vars are there for easy refactoring only. Couldn't think of better names. Suggestions are welcome
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We don't optimize for easy refactoring. Its not a variable, don't make it more complicated than it has to be.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it's better rename to zed-editor. package name also
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok |
||||||
|
|
||||||
| vbin "target/${RUST_TARGET}/release/cli" "${app_cli_name}" | ||||||
| vinstall "target/${RUST_TARGET}/release/zed" 755 usr/libexec zed-editor | ||||||
| # TODO 1: https://github.com/zed-industries/zed/blob/c372f246a0790da012dddbe3935ee2758a3a9c3b/script/bundle-linux#L87-L88 seperately build remote_server. will include it later. | ||||||
| # TODO 2: confirm install location of remote_server | ||||||
| # vinstall "target/${RUST_TARGET}/release/remote_server" 755 usr/libexec | ||||||
|
|
||||||
| export APP_NAME="Zed" | ||||||
| export APP_CLI="${app_cli_name}"s | ||||||
| export APP_ICON="zed" | ||||||
| export APP_ARGS="%U" | ||||||
| export DO_STARTUP_NOTIFY="true" | ||||||
|
|
||||||
| envsubst < "crates/zed/resources/zed.desktop.in" > "${app_id}.desktop" | ||||||
| vinstall "${app_id}.desktop" 644 usr/share/applications | ||||||
|
|
||||||
| vinstall "crates/zed/resources/app-icon.png" 644 usr/share/icons/hicolor/512x512/apps zed.png | ||||||
| vinstall "crates/zed/resources/app-icon@2x.png" 644 usr/share/icons/hicolor/1024x1024/apps zed.png | ||||||
| } | ||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think the package name is a good choice.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://zed.dev/docs/development/linux#notes-for-packaging-zed
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Binary != package name and you named the binary different from that too. There is no reason to not name the package "zed".