From nobody Sun Oct 30 20:10:03 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N0nSr0QlJz4gTcV; Sun, 30 Oct 2022 20:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N0nSq6xy0z3cqB; Sun, 30 Oct 2022 20:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667160604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zdKrAne16Hc4RFomrMa4nvQjLnDFNejV1QDU3dITeqY=; b=HKAPuIPktuRCPMO4rkRgDjG8v+1Rb7dMlussalQPAWohBIb6Nd68ERwyKuszwTuNPxrH5g ywPcmZqm3A/grDo/QT+I4BW8nh6SEglrdwO009n/GIRzbL9SV0ImCPp2MNPxazeeDSxga4 ih/9kgdGAxjc2NdYIZnhL//KUcLJkqrNxdt0TU8ObTr+Qc0+gL3H/BJohtx4mxIU2v7rD6 d/um2Lkk/0Qw/BfQWSt41n+YSZIlgZ7gwExIsxEBm9TBYQnKSVm2Ct48lSnC4mH/pdR48J uq58lj0Wktraj+slOeMFRzB/4di+cy/+pjCuCjK11HcCT0Z1ujQI38n4OA08Ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N0nSq5v8Bz18hD; Sun, 30 Oct 2022 20:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29UKA31q014163; Sun, 30 Oct 2022 20:10:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29UKA3a2014160; Sun, 30 Oct 2022 20:10:03 GMT (envelope-from git) Date: Sun, 30 Oct 2022 20:10:03 GMT Message-Id: <202210302010.29UKA3a2014160@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: e773ad17f53e - main - editors/lapce: Remove unneeded patch List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e773ad17f53ed443b1a04f41481bf5d51c7c86ab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667160604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zdKrAne16Hc4RFomrMa4nvQjLnDFNejV1QDU3dITeqY=; b=aeTK0btHRk88OoCpCQ49xxE8pD4Gt8AIUCebJb0TSaaTVeF3C1WhIjRwNOJAlBvXjc1Py/ 27cmnEuKrQb80yPqfXk1PA52pX/M3pvzfXhaS6IQK9hZd+3woMgIpJtBbrAwhqNPr0iVJF avj2WgZOjhSeLvdBhht0VAjEZt7LP8lPMWg0cWXSZ8gJmhk27flCbaIFq+ysACcOr/FKLS ukQvCPyw39Uc+dk+O0yHsxZzTAXt3JQKCV8bMezJlVWlfKLWCp3AMVFm7wmsDVXGBU29qQ xfQ8Z/RYBYwZnyS4eO2e2JRyHfcGsrj11qLC0n7j3c4hJ8PKTetmrxfTQEllMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667160604; a=rsa-sha256; cv=none; b=Z0TiM+7WLrLFw/9iDDhuHDZAr2sH30Rexbvqvo8QW3+lOsUYdqiSitMMMNZJLADIVH3MuL kz7ru3F4WGjgGTAMRu+oNo6WNyUze6YbmL+xbz4iRQ9CnwaWYuqhcfjMBNLWqLhj09cNMP x6uZm0+uG2BJCET4rDU+XNE7O5Vvf5DLG5vRy7OpEI6FleSDo9nZliFkI06UP+ZJe3Suz1 RjOdmxzltQK9CMjsxV/8E8fF+B0aLUaFWPZnVK4qK80f7HXQoUICSyxuSaeCillJM60Psj mNm67ktH8EYXdcf24lqW7uDusOLKKo/JJDWWNDF/6mtBDqhrFVa18ptEVEULzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=e773ad17f53ed443b1a04f41481bf5d51c7c86ab commit e773ad17f53ed443b1a04f41481bf5d51c7c86ab Author: Nuno Teixeira AuthorDate: 2022-10-30 20:06:47 +0000 Commit: Nuno Teixeira CommitDate: 2022-10-30 20:09:50 +0000 editors/lapce: Remove unneeded patch - Remove unneeded patch since rust 1.64.0 has landed. --- editors/lapce/Makefile | 3 +- editors/lapce/files/patch-lapce-data_src_config.rs | 143 --------------------- 2 files changed, 1 insertion(+), 145 deletions(-) diff --git a/editors/lapce/Makefile b/editors/lapce/Makefile index 523999cca3c6..e969debb0adc 100644 --- a/editors/lapce/Makefile +++ b/editors/lapce/Makefile @@ -1,7 +1,6 @@ PORTNAME= lapce DISTVERSIONPREFIX= v -DISTVERSION= 0.2.1 # remove openssl-src-* from CARGO-CRATES each update \ - remove patch-lapce-data_src_config.rs rust >= 1.64.0 +DISTVERSION= 0.2.1 # remove openssl-src-* from CARGO-CRATES each update PORTREVISION= 1 CATEGORIES= editors diff --git a/editors/lapce/files/patch-lapce-data_src_config.rs b/editors/lapce/files/patch-lapce-data_src_config.rs deleted file mode 100644 index 1d16e3e78f9b..000000000000 --- a/editors/lapce/files/patch-lapce-data_src_config.rs +++ /dev/null @@ -1,143 +0,0 @@ ---- lapce-data/src/config.rs.orig 2022-10-14 18:40:17 UTC -+++ lapce-data/src/config.rs -@@ -35,79 +35,79 @@ impl LapceTheme { - pub struct LapceTheme {} - - impl LapceTheme { -- pub const LAPCE_WARN: &str = "lapce.warn"; -- pub const LAPCE_ERROR: &str = "lapce.error"; -- pub const LAPCE_ACTIVE_TAB: &str = "lapce.active_tab"; -- pub const LAPCE_INACTIVE_TAB: &str = "lapce.inactive_tab"; -- pub const LAPCE_DROPDOWN_SHADOW: &str = "lapce.dropdown_shadow"; -- pub const LAPCE_BORDER: &str = "lapce.border"; -- pub const LAPCE_SCROLL_BAR: &str = "lapce.scroll_bar"; -+ pub const LAPCE_WARN: &'static str = "lapce.warn"; -+ pub const LAPCE_ERROR: &'static str = "lapce.error"; -+ pub const LAPCE_ACTIVE_TAB: &'static str = "lapce.active_tab"; -+ pub const LAPCE_INACTIVE_TAB: &'static str = "lapce.inactive_tab"; -+ pub const LAPCE_DROPDOWN_SHADOW: &'static str = "lapce.dropdown_shadow"; -+ pub const LAPCE_BORDER: &'static str = "lapce.border"; -+ pub const LAPCE_SCROLL_BAR: &'static str = "lapce.scroll_bar"; - -- pub const EDITOR_BACKGROUND: &str = "editor.background"; -- pub const EDITOR_FOREGROUND: &str = "editor.foreground"; -- pub const EDITOR_DIM: &str = "editor.dim"; -- pub const EDITOR_FOCUS: &str = "editor.focus"; -- pub const EDITOR_CARET: &str = "editor.caret"; -- pub const EDITOR_SELECTION: &str = "editor.selection"; -- pub const EDITOR_CURRENT_LINE: &str = "editor.current_line"; -- pub const EDITOR_LINK: &str = "editor.link"; -- pub const EDITOR_VISIBLE_WHITESPACE: &str = "editor.visible_whitespace"; -+ pub const EDITOR_BACKGROUND: &'static str = "editor.background"; -+ pub const EDITOR_FOREGROUND: &'static str = "editor.foreground"; -+ pub const EDITOR_DIM: &'static str = "editor.dim"; -+ pub const EDITOR_FOCUS: &'static str = "editor.focus"; -+ pub const EDITOR_CARET: &'static str = "editor.caret"; -+ pub const EDITOR_SELECTION: &'static str = "editor.selection"; -+ pub const EDITOR_CURRENT_LINE: &'static str = "editor.current_line"; -+ pub const EDITOR_LINK: &'static str = "editor.link"; -+ pub const EDITOR_VISIBLE_WHITESPACE: &'static str = "editor.visible_whitespace"; - -- pub const INLAY_HINT_FOREGROUND: &str = "inlay_hint.foreground"; -- pub const INLAY_HINT_BACKGROUND: &str = "inlay_hint.background"; -+ pub const INLAY_HINT_FOREGROUND: &'static str = "inlay_hint.foreground"; -+ pub const INLAY_HINT_BACKGROUND: &'static str = "inlay_hint.background"; - -- pub const ERROR_LENS_ERROR_FOREGROUND: &str = "error_lens.error.foreground"; -- pub const ERROR_LENS_ERROR_BACKGROUND: &str = "error_lens.error.background"; -- pub const ERROR_LENS_WARNING_FOREGROUND: &str = "error_lens.warning.foreground"; -- pub const ERROR_LENS_WARNING_BACKGROUND: &str = "error_lens.warning.background"; -- pub const ERROR_LENS_OTHER_FOREGROUND: &str = "error_lens.other.foreground"; -- pub const ERROR_LENS_OTHER_BACKGROUND: &str = "error_lens.other.background"; -+ pub const ERROR_LENS_ERROR_FOREGROUND: &'static str = "error_lens.error.foreground"; -+ pub const ERROR_LENS_ERROR_BACKGROUND: &'static str = "error_lens.error.background"; -+ pub const ERROR_LENS_WARNING_FOREGROUND: &'static str = "error_lens.warning.foreground"; -+ pub const ERROR_LENS_WARNING_BACKGROUND: &'static str = "error_lens.warning.background"; -+ pub const ERROR_LENS_OTHER_FOREGROUND: &'static str = "error_lens.other.foreground"; -+ pub const ERROR_LENS_OTHER_BACKGROUND: &'static str = "error_lens.other.background"; - -- pub const SOURCE_CONTROL_ADDED: &str = "source_control.added"; -- pub const SOURCE_CONTROL_REMOVED: &str = "source_control.removed"; -- pub const SOURCE_CONTROL_MODIFIED: &str = "source_control.modified"; -+ pub const SOURCE_CONTROL_ADDED: &'static str = "source_control.added"; -+ pub const SOURCE_CONTROL_REMOVED: &'static str = "source_control.removed"; -+ pub const SOURCE_CONTROL_MODIFIED: &'static str = "source_control.modified"; - -- pub const TERMINAL_CURSOR: &str = "terminal.cursor"; -- pub const TERMINAL_BACKGROUND: &str = "terminal.background"; -- pub const TERMINAL_FOREGROUND: &str = "terminal.foreground"; -- pub const TERMINAL_RED: &str = "terminal.red"; -- pub const TERMINAL_BLUE: &str = "terminal.blue"; -- pub const TERMINAL_GREEN: &str = "terminal.green"; -- pub const TERMINAL_YELLOW: &str = "terminal.yellow"; -- pub const TERMINAL_BLACK: &str = "terminal.black"; -- pub const TERMINAL_WHITE: &str = "terminal.white"; -- pub const TERMINAL_CYAN: &str = "terminal.cyan"; -- pub const TERMINAL_MAGENTA: &str = "terminal.magenta"; -+ pub const TERMINAL_CURSOR: &'static str = "terminal.cursor"; -+ pub const TERMINAL_BACKGROUND: &'static str = "terminal.background"; -+ pub const TERMINAL_FOREGROUND: &'static str = "terminal.foreground"; -+ pub const TERMINAL_RED: &'static str = "terminal.red"; -+ pub const TERMINAL_BLUE: &'static str = "terminal.blue"; -+ pub const TERMINAL_GREEN: &'static str = "terminal.green"; -+ pub const TERMINAL_YELLOW: &'static str = "terminal.yellow"; -+ pub const TERMINAL_BLACK: &'static str = "terminal.black"; -+ pub const TERMINAL_WHITE: &'static str = "terminal.white"; -+ pub const TERMINAL_CYAN: &'static str = "terminal.cyan"; -+ pub const TERMINAL_MAGENTA: &'static str = "terminal.magenta"; - -- pub const TERMINAL_BRIGHT_RED: &str = "terminal.bright_red"; -- pub const TERMINAL_BRIGHT_BLUE: &str = "terminal.bright_blue"; -- pub const TERMINAL_BRIGHT_GREEN: &str = "terminal.bright_green"; -- pub const TERMINAL_BRIGHT_YELLOW: &str = "terminal.bright_yellow"; -- pub const TERMINAL_BRIGHT_BLACK: &str = "terminal.bright_black"; -- pub const TERMINAL_BRIGHT_WHITE: &str = "terminal.bright_white"; -- pub const TERMINAL_BRIGHT_CYAN: &str = "terminal.bright_cyan"; -- pub const TERMINAL_BRIGHT_MAGENTA: &str = "terminal.bright_magenta"; -+ pub const TERMINAL_BRIGHT_RED: &'static str = "terminal.bright_red"; -+ pub const TERMINAL_BRIGHT_BLUE: &'static str = "terminal.bright_blue"; -+ pub const TERMINAL_BRIGHT_GREEN: &'static str = "terminal.bright_green"; -+ pub const TERMINAL_BRIGHT_YELLOW: &'static str = "terminal.bright_yellow"; -+ pub const TERMINAL_BRIGHT_BLACK: &'static str = "terminal.bright_black"; -+ pub const TERMINAL_BRIGHT_WHITE: &'static str = "terminal.bright_white"; -+ pub const TERMINAL_BRIGHT_CYAN: &'static str = "terminal.bright_cyan"; -+ pub const TERMINAL_BRIGHT_MAGENTA: &'static str = "terminal.bright_magenta"; - -- pub const PALETTE_BACKGROUND: &str = "palette.background"; -- pub const PALETTE_CURRENT: &str = "palette.current"; -+ pub const PALETTE_BACKGROUND: &'static str = "palette.background"; -+ pub const PALETTE_CURRENT: &'static str = "palette.current"; - -- pub const COMPLETION_BACKGROUND: &str = "completion.background"; -- pub const COMPLETION_CURRENT: &str = "completion.current"; -+ pub const COMPLETION_BACKGROUND: &'static str = "completion.background"; -+ pub const COMPLETION_CURRENT: &'static str = "completion.current"; - -- pub const HOVER_BACKGROUND: &str = "hover.background"; -+ pub const HOVER_BACKGROUND: &'static str = "hover.background"; - -- pub const ACTIVITY_BACKGROUND: &str = "activity.background"; -- pub const ACTIVITY_CURRENT: &str = "activity.current"; -+ pub const ACTIVITY_BACKGROUND: &'static str = "activity.background"; -+ pub const ACTIVITY_CURRENT: &'static str = "activity.current"; - -- pub const PANEL_BACKGROUND: &str = "panel.background"; -- pub const PANEL_CURRENT: &str = "panel.current"; -- pub const PANEL_HOVERED: &str = "panel.hovered"; -+ pub const PANEL_BACKGROUND: &'static str = "panel.background"; -+ pub const PANEL_CURRENT: &'static str = "panel.current"; -+ pub const PANEL_HOVERED: &'static str = "panel.hovered"; - -- pub const STATUS_BACKGROUND: &str = "status.background"; -- pub const STATUS_MODAL_NORMAL: &str = "status.modal.normal"; -- pub const STATUS_MODAL_INSERT: &str = "status.modal.insert"; -- pub const STATUS_MODAL_VISUAL: &str = "status.modal.visual"; -- pub const STATUS_MODAL_TERMINAL: &str = "status.modal.terminal"; -+ pub const STATUS_BACKGROUND: &'static str = "status.background"; -+ pub const STATUS_MODAL_NORMAL: &'static str = "status.modal.normal"; -+ pub const STATUS_MODAL_INSERT: &'static str = "status.modal.insert"; -+ pub const STATUS_MODAL_VISUAL: &'static str = "status.modal.visual"; -+ pub const STATUS_MODAL_TERMINAL: &'static str = "status.modal.terminal"; - - pub const PALETTE_INPUT_LINE_HEIGHT: druid::Key = - druid::Key::new("lapce.palette_input_line_height");