From d04cbcff8d4d01ced5b1e0bac4dadacdbc4b5057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jozef=20Steinh=C3=BCbl?= Date: Fri, 9 Aug 2024 09:19:07 +0200 Subject: [PATCH] zed: update to 0.147.2 --- .../0001-tweak-default-conf-for-privacy.patch | 85 ------------------- srcpkgs/zed/template | 14 ++- 2 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 srcpkgs/zed/patches/0001-tweak-default-conf-for-privacy.patch diff --git a/srcpkgs/zed/patches/0001-tweak-default-conf-for-privacy.patch b/srcpkgs/zed/patches/0001-tweak-default-conf-for-privacy.patch deleted file mode 100644 index 9b577c1..0000000 --- a/srcpkgs/zed/patches/0001-tweak-default-conf-for-privacy.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/assets/settings/default.json.old b/assets/settings/default.json -index 0ab3b1d9..d7b88b41 100644 ---- a/assets/settings/default.json.old -+++ b/assets/settings/default.json -@@ -25,8 +25,10 @@ - "base_keymap": "VSCode", - // Features that can be globally enabled or disabled - "features": { -+ // Disables copilot by default -+ "copilot": false, - // Which inline completion provider to use. -- "inline_completion_provider": "copilot" -+ "inline_completion_provider": "none" - }, - // The name of a font to use for rendering text in the editor - "buffer_font_family": "Zed Mono", -@@ -335,7 +337,7 @@ - // Version of this setting. - "version": "1", - // Whether the assistant is enabled. -- "enabled": true, -+ "enabled": false, - // Whether to show the assistant panel button in the status bar. - "button": true, - // Where to dock the assistant panel. Can be 'left', 'right' or 'bottom'. -@@ -458,13 +460,13 @@ - // 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 - }, - // Automatically update Zed. This setting may be ignored on Linux if - // installed through a package manager. -- "auto_update": true, -+ "auto_update": false, - // Diagnostics configuration. - "diagnostics": { - // Whether to show warnings or not by default. -@@ -513,7 +515,7 @@ - // May take 2 values: - // 1. hour12 - // 2. hour24 -- "hour_format": "hour12" -+ "hour_format": "hour24" - }, - // Settings specific to the terminal - "terminal": { -diff --git a/assets/settings/initial_user_settings.json.old b/assets/settings/initial_user_settings.json -index 75d4a026..53b0a30d 100644 ---- a/assets/settings/initial_user_settings.json.old -+++ b/assets/settings/initial_user_settings.json -@@ -9,4 +9,29 @@ - { - "ui_font_size": 16, - "buffer_font_size": 16 -+ -+ // The following settings have been changed from the upstream defaults to -+ // improve security and privacy. Here are the upstream defaults, you can -+ // uncomment them if you like. -+ // -+ // "features": { -+ // // Enable copilot (provided by an online service). -+ // "copilot": true, -+ // "inline_completion_provider": "copilot" -+ // }, -+ // "assistant": { -+ // "version": "1", -+ // // Enable the assistant (provided by an online service). -+ // "enabled": true -+ // }, -+ // "telemetry": { -+ // // Send debug info like crash reports to Zed Industries. -+ // "diagnostics": true, -+ // // Send anonymized usage data like what languages you're using Zed with -+ // // to Zed Industries. -+ // "metrics": true -+ // }, -+ // "journal": { -+ // "hour_format": "hour12" -+ // } - } diff --git a/srcpkgs/zed/template b/srcpkgs/zed/template index daf043c..9080d5d 100644 --- a/srcpkgs/zed/template +++ b/srcpkgs/zed/template @@ -1,15 +1,13 @@ -# Template file for 'zed' from https://github.com/void-linux/void-packages/pull/50476 -# Will be removed after merge - +# Template file for 'zed' pkgname=zed -version=0.140.5 +version=0.147.2 revision=1 archs="x86_64* aarch64*" build_style=cargo make_install_args="--path crates/zed" -hostmakedepends="pkg-config protobuf gettext mold" +hostmakedepends="pkg-config protobuf gettext mold clang18" makedepends="alsa-lib-devel fontconfig-devel libxcb-devel libxkbcommon-devel -libzstd-devel wayland-devel vulkan-loader openssl-devel libgit2-devel llvm17-devel" +libzstd-devel wayland-devel vulkan-loader openssl-devel libgit2-1.8-devel" depends="git" checkdepends="noto-fonts-ttf" short_desc="High-performance, multiplayer code editor" @@ -17,11 +15,11 @@ maintainer="SpidFightFR " license="GPL-3.0-or-later, Apache-2.0, AGPL-3.0-or-later" homepage="https://zed.dev/" distfiles="https://github.com/zed-industries/zed/archive/v${version}.tar.gz" -checksum="a634d8a29738446d76b299ea9a662beade7b7933f43deccb432e9f52cfa2b68b" +checksum="eec86197970729ee5d8acad578417e0c18f4909991e31b6f48ad623af5949042" post_install() { vlicense ${wrksrc}/LICENSE-AGPL - APP_NAME="Zed" DO_STARTUP_NOTIFY="true" APP_ICON="zed" envsubst < ${wrksrc}/crates/zed/resources/zed.desktop.in > ${wrksrc}/crates/zed/resources/zed.desktop + APP_NAME="Zed" DO_STARTUP_NOTIFY="true" APP_ICON="zed" APP_CLI="zedit" envsubst < ${wrksrc}/crates/zed/resources/zed.desktop.in > ${wrksrc}/crates/zed/resources/zed.desktop vinstall ${wrksrc}/crates/zed/resources/zed.desktop 644 usr/share/applications/ vinstall ${wrksrc}/crates/zed/resources/app-icon.png 644 usr/share/icons/hicolor/512x512/apps/ zed.png }