* [PR PATCH] zellij: update to 0.41.0
@ 2024-11-04 10:40 tranzystorekk
2024-11-04 10:43 ` [PR PATCH] [Updated] " tranzystorekk
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: tranzystorekk @ 2024-11-04 10:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is a new pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages zellij
https://github.com/void-linux/void-packages/pull/52911
zellij: update to 0.41.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52911.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zellij-52911.patch --]
[-- Type: text/x-diff, Size: 4396 bytes --]
From bfae521204a38d0d4dfd95407e16715fd981d280 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Mon, 4 Nov 2024 11:37:18 +0100
Subject: [PATCH] zellij: update to 0.41.0
---
.../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 31b5d8f31fe474..00000000000000
--- 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 <tranzystorek.io@protonmail.com>
-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 00000000000000..615978879b8d61
--- /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 4cccb374076fee..0ea23a408e8d6a 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.0
+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 <tranzystorek.io@protonmail.com>"
@@ -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=cfe987c6ab8adeb484cd429618a8019d162b7298b98da2288eed1b1d9aaf8ef5
make_check_pre="env LIBSSH2_SYS_USE_PKG_CONFIG=1"
post_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] zellij: update to 0.41.0
2024-11-04 10:40 [PR PATCH] zellij: update to 0.41.0 tranzystorekk
@ 2024-11-04 10:43 ` tranzystorekk
2024-11-04 10:47 ` tranzystorekk
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: tranzystorekk @ 2024-11-04 10:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages zellij
https://github.com/void-linux/void-packages/pull/52911
zellij: update to 0.41.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52911.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zellij-52911.patch --]
[-- Type: text/x-diff, Size: 4531 bytes --]
From f5da4c82fe15627d05fe77b9343a4d89eb036f80 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Mon, 4 Nov 2024 11:37:18 +0100
Subject: [PATCH] zellij: update to 0.41.0
---
.../zellij/patches/fix-underline-colors.patch | 27 -------------------
.../zellij/patches/use-system-libcurl.patch | 15 +++++++++++
srcpkgs/zellij/template | 13 +++++----
3 files changed, 21 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 31b5d8f31fe474..00000000000000
--- 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 <tranzystorek.io@protonmail.com>
-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 00000000000000..9370d382618516
--- /dev/null
+++ b/srcpkgs/zellij/patches/use-system-libcurl.patch
@@ -0,0 +1,15 @@
+diff --git a/zellij-utils/Cargo.toml b/zellij-utils/Cargo.toml
+index a5aca05..926a477 100644
+--- a/zellij-utils/Cargo.toml
++++ b/zellij-utils/Cargo.toml
+@@ -56,9 +56,7 @@ async-std = { version = "1.3.0", features = ["unstable", "attributes"] }
+ 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"
+-curl-sys = { version = "0.4", features = ["force-system-lib-on-osx"] }
++isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] }
+
+ [dev-dependencies]
+ insta = { version = "1.6.0", features = ["backtrace"] }
diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 4cccb374076fee..0ea23a408e8d6a 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.0
+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 <tranzystorek.io@protonmail.com>"
@@ -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=cfe987c6ab8adeb484cd429618a8019d162b7298b98da2288eed1b1d9aaf8ef5
make_check_pre="env LIBSSH2_SYS_USE_PKG_CONFIG=1"
post_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] zellij: update to 0.41.0
2024-11-04 10:40 [PR PATCH] zellij: update to 0.41.0 tranzystorekk
2024-11-04 10:43 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-11-04 10:47 ` tranzystorekk
2024-11-04 11:36 ` tranzystorekk
2024-11-04 11:53 ` [PR PATCH] [Merged]: zellij: update to 0.41.1 tranzystorekk
3 siblings, 0 replies; 5+ messages in thread
From: tranzystorekk @ 2024-11-04 10:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages zellij
https://github.com/void-linux/void-packages/pull/52911
zellij: update to 0.41.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52911.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zellij-52911.patch --]
[-- Type: text/x-diff, Size: 4396 bytes --]
From f83b3be31c2b049e4d5601eb3597d4108f635a43 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Mon, 4 Nov 2024 11:37:18 +0100
Subject: [PATCH] zellij: update to 0.41.0
---
.../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 31b5d8f31fe474..00000000000000
--- 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 <tranzystorek.io@protonmail.com>
-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 00000000000000..615978879b8d61
--- /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 4cccb374076fee..0ea23a408e8d6a 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.0
+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 <tranzystorek.io@protonmail.com>"
@@ -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=cfe987c6ab8adeb484cd429618a8019d162b7298b98da2288eed1b1d9aaf8ef5
make_check_pre="env LIBSSH2_SYS_USE_PKG_CONFIG=1"
post_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] zellij: update to 0.41.0
2024-11-04 10:40 [PR PATCH] zellij: update to 0.41.0 tranzystorekk
2024-11-04 10:43 ` [PR PATCH] [Updated] " tranzystorekk
2024-11-04 10:47 ` tranzystorekk
@ 2024-11-04 11:36 ` tranzystorekk
2024-11-04 11:53 ` [PR PATCH] [Merged]: zellij: update to 0.41.1 tranzystorekk
3 siblings, 0 replies; 5+ messages in thread
From: tranzystorekk @ 2024-11-04 11:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages zellij
https://github.com/void-linux/void-packages/pull/52911
zellij: update to 0.41.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52911.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zellij-52911.patch --]
[-- Type: text/x-diff, Size: 4396 bytes --]
From b08bc66e52fd36333210bce825eb6e88cdcab5a5 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
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 31b5d8f31fe474..00000000000000
--- 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 <tranzystorek.io@protonmail.com>
-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 00000000000000..615978879b8d61
--- /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 4cccb374076fee..b0150e875515d1 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 <tranzystorek.io@protonmail.com>"
@@ -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() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: zellij: update to 0.41.1
2024-11-04 10:40 [PR PATCH] zellij: update to 0.41.0 tranzystorekk
` (2 preceding siblings ...)
2024-11-04 11:36 ` tranzystorekk
@ 2024-11-04 11:53 ` tranzystorekk
3 siblings, 0 replies; 5+ messages in thread
From: tranzystorekk @ 2024-11-04 11:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
There's a merged pull request on the void-packages repository
zellij: update to 0.41.1
https://github.com/void-linux/void-packages/pull/52911
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-11-04 11:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-11-04 10:40 [PR PATCH] zellij: update to 0.41.0 tranzystorekk
2024-11-04 10:43 ` [PR PATCH] [Updated] " tranzystorekk
2024-11-04 10:47 ` tranzystorekk
2024-11-04 11:36 ` tranzystorekk
2024-11-04 11:53 ` [PR PATCH] [Merged]: zellij: update to 0.41.1 tranzystorekk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).