DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2026-01-01 16:40:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

zellij: Bump to 0.34.3

Browse Source
This commit is contained in:
termux-pacman-bot
2022-12-09 15:31:11 +00:00
parent 72dd4edfd8
commit dd716fdfde
5 changed files with 26 additions and 1201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/zellij/build.sh
View File

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE="https://zellij.dev/"
TERMUX_PKG_DESCRIPTION="A terminal workspace with batteries included"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Jonathan Lei <me@xjonathan.dev>"
TERMUX_PKG_VERSION="0.33.0"
TERMUX_PKG_VERSION="0.34.3"
TERMUX_PKG_SRCURL="https://github.com/zellij-org/zellij/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
TERMUX_PKG_SHA256="63eaf8ca0c1235389281e3ee5f599b810de3921d220e500cb35c46ec9b5125ff"
TERMUX_PKG_SHA256="1cf1e5a87eb3bd458487b2db91cd8918b6df308de2809041fc62df30c50a735c"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_AUTO_UPDATE=true

1154
packages/zellij/cargo-lock.patch
View File

File diff suppressed because it is too large Load Diff

11
packages/zellij/etc-path.patch
View File

@@ -1,11 +0,0 @@
--- a/zellij-utils/src/consts.rs
+++ b/zellij-utils/src/consts.rs
@@ -13,7 +13,7 @@ pub const DEFAULT_SCROLL_BUFFER_SIZE: usize = 10_000;
pub static SCROLL_BUFFER_SIZE: OnceCell<usize> = OnceCell::new();
pub static DEBUG_MODE: OnceCell<bool> = OnceCell::new();
-pub const SYSTEM_DEFAULT_CONFIG_DIR: &str = "/etc/zellij";
+pub const SYSTEM_DEFAULT_CONFIG_DIR: &str = "@TERMUX_PREFIX@/etc/zellij";
pub const SYSTEM_DEFAULT_DATA_DIR_PREFIX: &str = system_default_data_dir();
const fn system_default_data_dir() -> &'static str {

24
packages/zellij/prefix.patch Normal file
View File

@@ -0,0 +1,24 @@
--- a/zellij-server/src/pty.rs
+++ b/zellij-server/src/pty.rs
@@ -445,8 +445,8 @@ impl Pty {
}
pub fn get_default_terminal(&self, cwd: Option<PathBuf>) -> TerminalAction {
let shell = PathBuf::from(env::var("SHELL").unwrap_or_else(|_| {
- log::warn!("Cannot read SHELL env, falling back to use /bin/sh");
- "/bin/sh".to_string()
+ log::warn!("Cannot read SHELL env, falling back to use @TERMUX_PREFIX@/bin/sh");
+ "@TERMUX_PREFIX@/bin/sh".to_string()
}));
if !shell.exists() {
panic!("Cannot find shell {}", shell.display());
--- a/zellij-utils/src/consts.rs
+++ b/zellij-utils/src/consts.rs
@@ -13,7 +13,7 @@ pub const DEFAULT_SCROLL_BUFFER_SIZE: usize = 10_000;
pub static SCROLL_BUFFER_SIZE: OnceCell<usize> = OnceCell::new();
pub static DEBUG_MODE: OnceCell<bool> = OnceCell::new();
-pub const SYSTEM_DEFAULT_CONFIG_DIR: &str = "/etc/zellij";
+pub const SYSTEM_DEFAULT_CONFIG_DIR: &str = "@TERMUX_PREFIX@/etc/zellij";
pub const SYSTEM_DEFAULT_DATA_DIR_PREFIX: &str = system_default_data_dir();
const fn system_default_data_dir() -> &'static str {

34
packages/zellij/wasmer.patch
View File

@@ -1,34 +0,0 @@
--- a/zellij-server/Cargo.toml
+++ b/zellij-server/Cargo.toml
@@ -18,8 +18,8 @@ daemonize = "0.4.1"
serde_json = "1.0"
unicode-width = "0.1.8"
url = "2.2.2"
-wasmer = "1.0.0"
-wasmer-wasi = "1.0.0"
+wasmer = "2.3.0"
+wasmer-wasi = "2.3.0"
cassowary = "0.3.0"
zellij-utils = { path = "../zellij-utils/", version = "0.33.0" }
log = "0.4.17"
--- a/zellij-server/src/logging_pipe.rs
+++ b/zellij-server/src/logging_pipe.rs
@@ -114,7 +114,6 @@ impl Seek for LoggingPipe {
}
}
-#[typetag::serde]
impl WasiFile for LoggingPipe {
fn last_accessed(&self) -> u64 {
0
--- a/zellij-server/src/panes/grid.rs
+++ b/zellij-server/src/panes/grid.rs
@@ -2563,7 +2563,7 @@ impl Perform for Grid {
};
if first_intermediate_is_questionmark {
let query_type = params_iter.next();
- let is_query = params_iter.next() == Some(&[1]);
+ let is_query = matches!(params_iter.next(), Some(&[1]));
if is_query {
// XTSMGRAPHICS
match query_type {