Gentoo Archives: gentoo-commits

From: Jonas Frei <freijon@××.me>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-editors/helix/files/
Date: Sun, 04 Sep 2022 04:14:02
Message-Id: 1662264807.e56d0e1ef7c064ae0f2fd2b640008e6466a6c81e.freijon@gentoo
1 commit: e56d0e1ef7c064ae0f2fd2b640008e6466a6c81e
2 Author: Jonas Frei <freijon <AT> pm <DOT> me>
3 AuthorDate: Sun Sep 4 04:13:27 2022 +0000
4 Commit: Jonas Frei <freijon <AT> pm <DOT> me>
5 CommitDate: Sun Sep 4 04:13:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e56d0e1e
7
8 app-editors/helix: Removed helix-0.4.1.patch
9
10 Signed-off-by: Jonas Frei <freijon <AT> pm.me>
11
12 app-editors/helix/files/helix-0.4.1.patch | 44 -------------------------------
13 1 file changed, 44 deletions(-)
14
15 diff --git a/app-editors/helix/files/helix-0.4.1.patch b/app-editors/helix/files/helix-0.4.1.patch
16 deleted file mode 100644
17 index 259720ba4..000000000
18 --- a/app-editors/helix/files/helix-0.4.1.patch
19 +++ /dev/null
20 @@ -1,44 +0,0 @@
21 -From 8c6e60e59c1c99341492d79608388f6cf12c9d40 Mon Sep 17 00:00:00 2001
22 -From: QaidVoid <qaidvoid@×××××.com>
23 -Date: Tue, 19 Oct 2021 00:33:57 +0545
24 -Subject: [PATCH] check helix runtime in /usr/share
25 -
26 ----
27 - helix-core/src/lib.rs | 14 ++++++++++++++
28 - 1 file changed, 14 insertions(+)
29 -
30 -diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
31 -index 2823959..60c3bb7 100644
32 ---- a/helix-core/src/lib.rs
33 -+++ b/helix-core/src/lib.rs
34 -@@ -69,6 +69,11 @@ pub fn runtime_dir() -> std::path::PathBuf {
35 - return conf_dir;
36 - }
37 -
38 -+ let sys_dir = sys_share_dir().join(RT_DIR);
39 -+ if sys_dir.exists() {
40 -+ return sys_dir;
41 -+ }
42 -+
43 - if let Ok(dir) = std::env::var("CARGO_MANIFEST_DIR") {
44 - // this is the directory of the crate being run by cargo, we need the workspace path so we take the parent
45 - return std::path::PathBuf::from(dir).parent().unwrap().join(RT_DIR);
46 -@@ -81,6 +86,15 @@ pub fn runtime_dir() -> std::path::PathBuf {
47 - .unwrap()
48 - }
49 -
50 -+pub fn sys_share_dir() -> std::path::PathBuf {
51 -+ let mut path = std::path::Path::new("/usr/share/").to_path_buf();
52 -+ if !path.exists() {
53 -+ panic!("Unable to find system share directory!");
54 -+ }
55 -+ path.push("helix");
56 -+ path
57 -+}
58 -+
59 - pub fn config_dir() -> std::path::PathBuf {
60 - // TODO: allow env var override
61 - let strategy = choose_base_strategy().expect("Unable to find the config directory!");
62 ---
63 -2.33.1
64 -