From f36c44e0b3031aa3adc20dd990eff08de035a08c Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 31 Mar 2022 09:20:46 +0200 Subject: [PATCH] vivid: fix @TERMUX_PREFIX@/usr -> @TERMUX_PREFIX@ in patches Or else we end up with /data/data/com.termux/files/usr/usr. --- packages/vivid/build.sh | 1 + packages/vivid/src-main.rs.patch | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/vivid/build.sh b/packages/vivid/build.sh index 6c6e2abc4..ffc1872e8 100644 --- a/packages/vivid/build.sh +++ b/packages/vivid/build.sh @@ -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_MAINTAINER="@termux" 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_SHA256=e58e0936db25c81ff257775463f1d422d97c706aec2d0134e39b62151ded23cb TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/vivid/src-main.rs.patch b/packages/vivid/src-main.rs.patch index bb1613c54..33c9ab997 100644 --- a/packages/vivid/src-main.rs.patch +++ b/packages/vivid/src-main.rs.patch @@ -7,7 +7,7 @@ index 67a3216..1dbd984 100644 struct ThemeAssets; -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 { #[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_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 .or(database_path_env)