sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vivid: fix @TERMUX_PREFIX@/usr -> @TERMUX_PREFIX@ in patches

Browse Source 
Or else we end up with /data/data/com.termux/files/usr/usr.
This commit is contained in:
Henrik Grimler 2022-03-31 09:20:46 +02:00
parent 2e06789768
commit f36c44e0b3
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/vivid/build.sh
View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A themeable LS_COLORS generator with a rich filetype dat
TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.8.0 TERMUX_PKG_VERSION=0.8.0
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/sharkdp/vivid/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SRCURL=https://github.com/sharkdp/vivid/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=e58e0936db25c81ff257775463f1d422d97c706aec2d0134e39b62151ded23cb TERMUX_PKG_SHA256=e58e0936db25c81ff257775463f1d422d97c706aec2d0134e39b62151ded23cb
TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_AUTO_UPDATE=true

4
packages/vivid/src-main.rs.patch
View File

@ -7,7 +7,7 @@ index 67a3216..1dbd984 100644
struct ThemeAssets; struct ThemeAssets;
-const THEME_PATH_SYSTEM: &str = "/usr/share/vivid/themes/"; -const THEME_PATH_SYSTEM: &str = "/usr/share/vivid/themes/";
+const THEME_PATH_SYSTEM: &str = "@TERMUX_PREFIX@/usr/share/vivid/themes/"; +const THEME_PATH_SYSTEM: &str = "@TERMUX_PREFIX@/share/vivid/themes/";
fn get_user_config_path() -> PathBuf { fn get_user_config_path() -> PathBuf {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
@ -16,7 +16,7 @@ index 67a3216..1dbd984 100644
let database_path_env = database_path_env_s.as_ref().map(Path::new); let database_path_env = database_path_env_s.as_ref().map(Path::new);
- let database_path_system = Path::new("/usr/share/vivid/filetypes.yml"); - let database_path_system = Path::new("/usr/share/vivid/filetypes.yml");
+ let database_path_system = Path::new("@TERMUX_PREFIX@/usr/share/vivid/filetypes.yml"); + let database_path_system = Path::new("@TERMUX_PREFIX@/share/vivid/filetypes.yml");
let database_path = database_path_from_arg let database_path = database_path_from_arg
.or(database_path_env) .or(database_path_env)