From e470818af480fa8a46a72ef32e827916b5564883 Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Mon, 4 Nov 2024 11:37:18 +0100 Subject: [PATCH] zellij: update to 0.41.1 --- .../zellij/patches/fix-underline-colors.patch | 27 ------------------- .../zellij/patches/use-system-libcurl.patch | 13 +++++++++ srcpkgs/zellij/template | 13 +++++---- 3 files changed, 19 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/zellij/patches/fix-underline-colors.patch create mode 100644 srcpkgs/zellij/patches/use-system-libcurl.patch diff --git a/srcpkgs/zellij/patches/fix-underline-colors.patch b/srcpkgs/zellij/patches/fix-underline-colors.patch deleted file mode 100644 index 31b5d8f31fe..00000000000 --- a/srcpkgs/zellij/patches/fix-underline-colors.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 475dd0862312c9f7a6b0e913400e3372aa09c591 Mon Sep 17 00:00:00 2001 -From: tranzystorekk -Date: Fri, 21 Jun 2024 13:46:17 +0200 -Subject: [PATCH] fix(terminal): use ITU T.418 format for emitted CSI 58 - sequences (#3440) - ---- - zellij-server/src/panes/terminal_character.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/zellij-server/src/panes/terminal_character.rs b/zellij-server/src/panes/terminal_character.rs -index c3e6b19df9..3bdc6559fd 100644 ---- a/zellij-server/src/panes/terminal_character.rs -+++ b/zellij-server/src/panes/terminal_character.rs -@@ -619,10 +619,10 @@ impl Display for CharacterStyles { - if let Some(ansi_code) = self.underline_color { - match ansi_code { - AnsiCode::RgbCode((r, g, b)) => { -- write!(f, "\u{1b}[58;2;{};{};{}m", r, g, b)?; -+ write!(f, "\u{1b}[58:2::{}:{}:{}m", r, g, b)?; - }, - AnsiCode::ColorIndex(color_index) => { -- write!(f, "\u{1b}[58;5;{}m", color_index)?; -+ write!(f, "\u{1b}[58:5:{}m", color_index)?; - }, - AnsiCode::Reset => { - write!(f, "\u{1b}[59m")?; diff --git a/srcpkgs/zellij/patches/use-system-libcurl.patch b/srcpkgs/zellij/patches/use-system-libcurl.patch new file mode 100644 index 00000000000..615978879b8 --- /dev/null +++ b/srcpkgs/zellij/patches/use-system-libcurl.patch @@ -0,0 +1,13 @@ +diff --git a/zellij-utils/Cargo.toml b/zellij-utils/Cargo.toml +index a5aca05..9e77f09 100644 +--- a/zellij-utils/Cargo.toml ++++ b/zellij-utils/Cargo.toml +@@ -57,7 +57,7 @@ notify-debouncer-full = "0.1.0" + humantime = "2.1.0" + futures = "0.3.28" + openssl-sys = { version = "0.9.93", features = ["vendored"] } +-isahc = "1.7.2" ++isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] } + curl-sys = { version = "0.4", features = ["force-system-lib-on-osx"] } + + [dev-dependencies] diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template index 4cccb374076..b0150e87551 100644 --- a/srcpkgs/zellij/template +++ b/srcpkgs/zellij/template @@ -1,15 +1,14 @@ # Template file for 'zellij' pkgname=zellij -version=0.40.1 -revision=2 -# Wasmer runtime only supports the following archs: x86_64, arm64 -# https://docs.wasmer.io/runtime/features#backend-support-by-chipset -# https://github.com/wasmerio/wasmer/issues/4244#issuecomment-1751365804 +version=0.41.1 +revision=1 +# Wasmtime runtime only supports the following archs: x86_64, arm64 +# https://docs.wasmtime.dev/stability-tiers.html#unsupported-features-and-platforms archs="x86_64* aarch64*" build_style=cargo build_helper=qemu hostmakedepends="mandown pkg-config" -makedepends="libcurl-devel" +makedepends="libcurl-devel libzstd-devel" checkdepends="libssh2-devel" short_desc="Terminal workspace with batteries included" maintainer="tranzystorekk " @@ -17,7 +16,7 @@ license="MIT" homepage="https://zellij.dev" changelog="https://raw.githubusercontent.com/zellij-org/zellij/main/CHANGELOG.md" distfiles="https://github.com/zellij-org/zellij/archive/refs/tags/v${version}.tar.gz" -checksum=1f0bfa13f2dbe657d76341a196f98a3b4caa47ac63abee06b39883a11ca220a8 +checksum=72db7eb7257db08f338f37f0294791ea815140f739fbcb7059ccb0c8165a99d3 make_check_pre="env LIBSSH2_SYS_USE_PKG_CONFIG=1" post_install() {