From fed98d2bcfe7a07b27c1b8a194a304228fe434ea6c04f22063675f134f484265 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 12 Nov 2023 06:22:46 +0000 Subject: [PATCH 1/9] - Update to version 20230712.072601.f4abf8fd+git207: * Default G1 to ASCII * docs: fix emoji stuff * Fallback to SGR when rendering 16/256 colors when MaxColors is 16M * Detect true color set by max_colors * deps: wgpu -> 0.18 * docs: Fix typo OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=98 --- _service | 23 +++++++++++++++---- _servicedata | 4 +++- vendor.tar.zst | 4 ++-- ...erm-20230712.072601.f4abf8fd+git207.tar.gz | 0 wezterm.changes | 11 +++++++++ wezterm.obsinfo | 6 ++--- wezterm.spec | 4 ++-- 7 files changed, 40 insertions(+), 12 deletions(-) rename wezterm-20230712.072601.f4abf8fd.tar.gz => wezterm-20230712.072601.f4abf8fd+git207.tar.gz (100%) diff --git a/_service b/_service index e3f7817..6c01212 100644 --- a/_service +++ b/_service @@ -1,9 +1,24 @@ - + + https://github.com/wez/wezterm + @PARENT_TAG@+git@TAG_OFFSET@ + git + f0e3eecba6faec0aa963a6f0067577afc99e11db + (\d+)-(\d+)-(\w+) + \1.\2.\3 + enable + socvirnyl.estela@gmail.com + + + + *.tar + zst + + - wezterm-20230712.072601.f4abf8fd.tar.gz - zst - false + wezterm + true + RUSTSEC-2022-0090 diff --git a/_servicedata b/_servicedata index 0dd2a94..f4a69d9 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,6 @@ https://github.com/wez/wezterm.git - 69ae847273aa2b0a64bdb07cf19d3f6fbaaa6b71 \ No newline at end of file + 69ae847273aa2b0a64bdb07cf19d3f6fbaaa6b71 + https://github.com/wez/wezterm + f0e3eecba6faec0aa963a6f0067577afc99e11db \ No newline at end of file diff --git a/vendor.tar.zst b/vendor.tar.zst index aa85a2a..f266a74 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c55c9288fe34179a089c3552d0af29abcb6457102396db6b45bf7156424e683 -size 45021414 +oid sha256:fd4c6b4f8722c3b69a3376f7ef9e8b7f93ccbe73ce9e1305b09d9baf56a7d9cb +size 82265669 diff --git a/wezterm-20230712.072601.f4abf8fd.tar.gz b/wezterm-20230712.072601.f4abf8fd+git207.tar.gz similarity index 100% rename from wezterm-20230712.072601.f4abf8fd.tar.gz rename to wezterm-20230712.072601.f4abf8fd+git207.tar.gz diff --git a/wezterm.changes b/wezterm.changes index 25f6b40..5dd2186 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Nov 12 05:51:03 UTC 2023 - socvirnyl.estela@gmail.com + +- Update to version 20230712.072601.f4abf8fd+git207: + * Default G1 to ASCII + * docs: fix emoji stuff + * Fallback to SGR when rendering 16/256 colors when MaxColors is 16M + * Detect true color set by max_colors + * deps: wgpu -> 0.18 + * docs: Fix typo + ------------------------------------------------------------------- Sun Oct 29 06:30:01 UTC 2023 - Soc Virnyl Estela diff --git a/wezterm.obsinfo b/wezterm.obsinfo index 9769196..de4537b 100644 --- a/wezterm.obsinfo +++ b/wezterm.obsinfo @@ -1,4 +1,4 @@ name: wezterm -version: 20230408.112425.69ae8472 -mtime: 1680978265 -commit: 69ae847273aa2b0a64bdb07cf19d3f6fbaaa6b71 +version: 20230712.072601.f4abf8fd+git207 +mtime: 1699370718 +commit: f0e3eecba6faec0aa963a6f0067577afc99e11db diff --git a/wezterm.spec b/wezterm.spec index 823bd2f..3c8a94f 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -20,12 +20,12 @@ %global _dashed_version 20230712-072601-f4abf8fd Name: wezterm -Version: 20230712.072601.f4abf8fd +Version: 20230712.072601.f4abf8fd+git207 Release: 0 Summary: GPU-accelerated cross-platform terminal emulator and multiplexer URL: https://github.com/wez/wezterm License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT OR BSD-2-Clause) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND ISC AND LGPL-2.1-only AND MIT AND MPL-2.0 AND WTFPL AND Zlib AND MIT -Source0: https://github.com/wez/wezterm/releases/download/%{_dashed_version}/wezterm-%{_dashed_version}-src.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz Source1: vendor.tar.zst Source2: cargo_config Requires: terminfo From df116b3fcf5a3e367a3ad71039f5f623d6b9c3dcc4101e91241daec9532f88d6 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 12 Nov 2023 06:25:35 +0000 Subject: [PATCH 2/9] - Remove cargo_config from source. It's part of the vendored tarball now OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=99 --- cargo_config | 20 -------------------- wezterm.changes | 5 +++++ wezterm.spec | 3 +-- 3 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 cargo_config diff --git a/cargo_config b/cargo_config deleted file mode 100644 index e25e1d0..0000000 --- a/cargo_config +++ /dev/null @@ -1,20 +0,0 @@ -[source.crates-io] -replace-with = "vendored-sources" - -[source."git+https://github.com/image-rs/image.git?rev=fe069785ae245a2c510fd724ef96da283b05a236"] -git = "https://github.com/image-rs/image.git" -rev = "fe069785ae245a2c510fd724ef96da283b05a236" -replace-with = "vendored-sources" - -[source."git+https://github.com/rust-x-bindings/rust-xcb?rev=dbdaa01c178c6fbe68bd51b7ad44c08172181083"] -git = "https://github.com/rust-x-bindings/rust-xcb" -rev = "dbdaa01c178c6fbe68bd51b7ad44c08172181083" -replace-with = "vendored-sources" - -[source."git+https://github.com/wez/xcb-imdkit-rs.git?branch=hangfix"] -git = "https://github.com/wez/xcb-imdkit-rs.git" -branch = "hangfix" -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" diff --git a/wezterm.changes b/wezterm.changes index 5dd2186..b1d7815 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 12 06:24:46 UTC 2023 - Soc Virnyl Estela + +- Remove cargo_config from source. It's part of the vendored tarball now + ------------------------------------------------------------------- Sun Nov 12 05:51:03 UTC 2023 - socvirnyl.estela@gmail.com diff --git a/wezterm.spec b/wezterm.spec index 3c8a94f..05368d7 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -27,7 +27,6 @@ URL: https://github.com/wez/wezterm License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT OR BSD-2-Clause) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND ISC AND LGPL-2.1-only AND MIT AND MPL-2.0 AND WTFPL AND Zlib AND MIT Source0: %{name}-%{version}.tar.gz Source1: vendor.tar.zst -Source2: cargo_config Requires: terminfo BuildRequires: Mesa-libEGL-devel @@ -111,7 +110,7 @@ Zsh completion script for %{name}. %prep %autosetup -a1 -n %{name}-%{_dashed_version} mkdir -p .cargo -cp %{SOURCE2} .cargo/config +cp cargo_config .cargo/config tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo printf "%{version}" > .tag From 217b6948d772ec610d9d7977949b9f8390a52d80a955d59c298d5ba94a44189b Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 12 Nov 2023 06:48:39 +0000 Subject: [PATCH 3/9] OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=100 --- wezterm-20230712.072601.f4abf8fd+git207.tar.gz | 3 --- wezterm-20230712.072601.f4abf8fd+git207.tar.zst | 3 +++ wezterm.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 wezterm-20230712.072601.f4abf8fd+git207.tar.gz create mode 100644 wezterm-20230712.072601.f4abf8fd+git207.tar.zst diff --git a/wezterm-20230712.072601.f4abf8fd+git207.tar.gz b/wezterm-20230712.072601.f4abf8fd+git207.tar.gz deleted file mode 100644 index 30f8d33..0000000 --- a/wezterm-20230712.072601.f4abf8fd+git207.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cecb56697f912826abea548e948950e7556ff7c706192fa304992811fe0245a8 -size 46238712 diff --git a/wezterm-20230712.072601.f4abf8fd+git207.tar.zst b/wezterm-20230712.072601.f4abf8fd+git207.tar.zst new file mode 100644 index 0000000..f3133a7 --- /dev/null +++ b/wezterm-20230712.072601.f4abf8fd+git207.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e80abeff4474b68feeef5ba48f27a09bd2da4e06ec2b2ff3251c872b2a43577 +size 100711707 diff --git a/wezterm.spec b/wezterm.spec index 05368d7..eb2ea54 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -25,7 +25,7 @@ Release: 0 Summary: GPU-accelerated cross-platform terminal emulator and multiplexer URL: https://github.com/wez/wezterm License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT OR BSD-2-Clause) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND ISC AND LGPL-2.1-only AND MIT AND MPL-2.0 AND WTFPL AND Zlib AND MIT -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.zst Source1: vendor.tar.zst Requires: terminfo BuildRequires: Mesa-libEGL-devel From a1e5f18539365027432fae11dfc5015c9c575ed0cb174a6e1a5a40abd778acd2 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 12 Nov 2023 06:52:30 +0000 Subject: [PATCH 4/9] OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=101 --- wezterm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wezterm.spec b/wezterm.spec index eb2ea54..c259cd2 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -17,7 +17,7 @@ %global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 -%global _dashed_version 20230712-072601-f4abf8fd +# %%global _dashed_version 20230712-072601-f4abf8fd Name: wezterm Version: 20230712.072601.f4abf8fd+git207 @@ -108,7 +108,7 @@ BuildArch: noarch Zsh completion script for %{name}. %prep -%autosetup -a1 -n %{name}-%{_dashed_version} +%autosetup -a1 mkdir -p .cargo cp cargo_config .cargo/config tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo From e6d074c066fed8d8bd7e90440ff4387fba80f62a091b5b1970f64e20ae305a19 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 12 Nov 2023 07:05:30 +0000 Subject: [PATCH 5/9] OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=102 --- wezterm.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wezterm.spec b/wezterm.spec index c259cd2..956b492 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -126,10 +126,10 @@ cargo build --offline --release --no-default-features --features vendored-fonts, %endif %install -install -Dm 0755 %{_builddir}/%{name}-%{_dashed_version}/target/release/wezterm %{buildroot}%{_bindir}/wezterm -install -Dm 0755 %{_builddir}/%{name}-%{_dashed_version}/target/release/wezterm-gui %{buildroot}%{_bindir}/wezterm-gui -install -Dm 0755 %{_builddir}/%{name}-%{_dashed_version}/target/release/wezterm-mux-server %{buildroot}%{_bindir}/wezterm-mux-server -install -Dm 0755 %{_builddir}/%{name}-%{_dashed_version}/target/release/strip-ansi-escapes %{buildroot}%{_bindir}/strip-ansi-escapes +install -Dm 0755 %{_builddir}/%{name}-%{version}/target/release/wezterm %{buildroot}%{_bindir}/wezterm +install -Dm 0755 %{_builddir}/%{name}-%{version}/target/release/wezterm-gui %{buildroot}%{_bindir}/wezterm-gui +install -Dm 0755 %{_builddir}/%{name}-%{version}/target/release/wezterm-mux-server %{buildroot}%{_bindir}/wezterm-mux-server +install -Dm 0755 %{_builddir}/%{name}-%{version}/target/release/strip-ansi-escapes %{buildroot}%{_bindir}/strip-ansi-escapes install -Dm 0644 terminfo/w/wezterm %{buildroot}%{_datadir}/terminfo/w/wezterm install -Dm 0644 assets/%{name}.desktop %{buildroot}%{_datadir}/applications/org.wezfurlong.%{name}.desktop From aa1c6f425e8ce0afb52f4b66bcdee1da6236f023bfef07e4330b915a35f3f7fe Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 12 Nov 2023 07:56:49 +0000 Subject: [PATCH 6/9] - Move shell integration to /usr/etc. It won't be read but it's optional OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=103 --- wezterm.changes | 5 +++++ wezterm.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/wezterm.changes b/wezterm.changes index b1d7815..4e77d7b 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 12 07:56:01 UTC 2023 - Soc Virnyl Estela + +- Move shell integration to /usr/etc. It won't be read but it's optional + ------------------------------------------------------------------- Sun Nov 12 06:24:46 UTC 2023 - Soc Virnyl Estela diff --git a/wezterm.spec b/wezterm.spec index 956b492..a52217b 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -135,7 +135,7 @@ install -Dm 0644 terminfo/w/wezterm %{buildroot}%{_datadir}/terminfo/w/wezterm install -Dm 0644 assets/%{name}.desktop %{buildroot}%{_datadir}/applications/org.wezfurlong.%{name}.desktop install -Dm 0644 assets/icon/%{name}-icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.wezfurlong.%{name}.svg install -Dm 0644 assets/%{name}.appdata.xml %{buildroot}%{_datadir}/metainfo/org.wezfurlong.%{name}.appdata.xml -install -Dm 0644 assets/shell-integration/* -t %{buildroot}%{_sysconfdir}/profile.d +install -Dm 0644 assets/shell-integration/* -t %{buildroot}%{_distconfdir}/profile.d install -Dm 0644 assets/%{name}-nautilus.py %{buildroot}%{_datadir}/nautilus-python/extensions/%{name}-nautilus.py # Bash completion @@ -160,7 +160,7 @@ install -D -m 0644 assets/shell-completion/fish %{buildroot}%{_datadir}/fish/ven %{_datadir}/icons/hicolor/scalable/apps/org.wezfurlong.wezterm.svg %{_datadir}/metainfo/org.wezfurlong.wezterm.appdata.xml %{_datadir}/nautilus-python/extensions/wezterm-nautilus.py -%config %{_sysconfdir}/profile.d/wezterm.sh +%{_distconfdir}/profile.d/wezterm.sh %files mux-server %license LICENSE.md From 6d383b58da3fcddfae6a38e710dd3211cd1783d57305365571d24a4910a2f4c5 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sat, 18 Nov 2023 21:58:16 +0000 Subject: [PATCH 7/9] - Add do-not-send-eof-when-closing-application.patch * resolves issue when closing app but also sends an EOF to other multiplexers e.g. tmux, screen, zellij OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=104 --- do-not-send-eof-when-closing-application.patch | 17 +++++++++++++++++ wezterm.changes | 7 +++++++ wezterm.spec | 3 ++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 do-not-send-eof-when-closing-application.patch diff --git a/do-not-send-eof-when-closing-application.patch b/do-not-send-eof-when-closing-application.patch new file mode 100644 index 0000000..a253d4c --- /dev/null +++ b/do-not-send-eof-when-closing-application.patch @@ -0,0 +1,17 @@ +diff --git a/pty/src/unix.rs b/pty/src/unix.rs +index cbe0f76..92bf82b 100644 +--- a/pty/src/unix.rs ++++ b/pty/src/unix.rs +@@ -396,9 +396,9 @@ impl Drop for UnixMasterWriter { + // EOF is only interpreted after a newline, so if it is set, + // we send a newline followed by EOF. + let eot = t.c_cc[libc::VEOF]; +- if eot != 0 { +- let _ = self.fd.0.write_all(&[b'\n', eot]); +- } ++ // if eot != 0 { ++ // let _ = self.fd.0.write_all(&[b'\n', eot]); ++ // } + } + } + } diff --git a/wezterm.changes b/wezterm.changes index 4e77d7b..5a23ee1 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Nov 18 21:57:26 UTC 2023 - Soc Virnyl Estela + +- Add do-not-send-eof-when-closing-application.patch + * resolves issue when closing app but also sends an EOF + to other multiplexers e.g. tmux, screen, zellij + ------------------------------------------------------------------- Sun Nov 12 07:56:01 UTC 2023 - Soc Virnyl Estela diff --git a/wezterm.spec b/wezterm.spec index a52217b..2d0fc20 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -27,6 +27,7 @@ URL: https://github.com/wez/wezterm License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT OR BSD-2-Clause) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND ISC AND LGPL-2.1-only AND MIT AND MPL-2.0 AND WTFPL AND Zlib AND MIT Source0: %{name}-%{version}.tar.zst Source1: vendor.tar.zst +Patch0: do-not-send-eof-when-closing-application.patch Requires: terminfo BuildRequires: Mesa-libEGL-devel @@ -108,7 +109,7 @@ BuildArch: noarch Zsh completion script for %{name}. %prep -%autosetup -a1 +%autosetup -a1 -p1 mkdir -p .cargo cp cargo_config .cargo/config tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo From 7d341ccdcf0f3b601ae156a39bf024397f8e9733491fedde2a065aac1efdbd2a Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sat, 18 Nov 2023 22:32:56 +0000 Subject: [PATCH 8/9] - Update to version 20230712.072601.f4abf8fd+git210: * cargo update * docs: changelog for #4563 * Make RIS also clear the alternate screen OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=105 --- _service | 4 ++-- _servicedata | 2 +- vendor.tar.zst | 4 ++-- wezterm-20230712.072601.f4abf8fd+git207.tar.zst | 3 --- wezterm-20230712.072601.f4abf8fd+git210.tar.zst | 3 +++ wezterm.changes | 8 ++++++++ wezterm.obsinfo | 6 +++--- wezterm.spec | 4 +--- 8 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 wezterm-20230712.072601.f4abf8fd+git207.tar.zst create mode 100644 wezterm-20230712.072601.f4abf8fd+git210.tar.zst diff --git a/_service b/_service index 6c01212..62eb4fa 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/wez/wezterm @PARENT_TAG@+git@TAG_OFFSET@ git - f0e3eecba6faec0aa963a6f0067577afc99e11db + 600652583594e9f6195a6427d1fabb09068622a7 (\d+)-(\d+)-(\w+) \1.\2.\3 enable @@ -16,7 +16,7 @@ - wezterm + wezterm true RUSTSEC-2022-0090 diff --git a/_servicedata b/_servicedata index f4a69d9..845d714 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,4 @@ https://github.com/wez/wezterm.git 69ae847273aa2b0a64bdb07cf19d3f6fbaaa6b71 https://github.com/wez/wezterm - f0e3eecba6faec0aa963a6f0067577afc99e11db \ No newline at end of file + 600652583594e9f6195a6427d1fabb09068622a7 \ No newline at end of file diff --git a/vendor.tar.zst b/vendor.tar.zst index f266a74..9bd490c 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd4c6b4f8722c3b69a3376f7ef9e8b7f93ccbe73ce9e1305b09d9baf56a7d9cb -size 82265669 +oid sha256:e33ab6583dbf15dd762e2c2c55198cc1779b7fc37bf5e6659a26095fd14179e3 +size 82336991 diff --git a/wezterm-20230712.072601.f4abf8fd+git207.tar.zst b/wezterm-20230712.072601.f4abf8fd+git207.tar.zst deleted file mode 100644 index f3133a7..0000000 --- a/wezterm-20230712.072601.f4abf8fd+git207.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e80abeff4474b68feeef5ba48f27a09bd2da4e06ec2b2ff3251c872b2a43577 -size 100711707 diff --git a/wezterm-20230712.072601.f4abf8fd+git210.tar.zst b/wezterm-20230712.072601.f4abf8fd+git210.tar.zst new file mode 100644 index 0000000..638562b --- /dev/null +++ b/wezterm-20230712.072601.f4abf8fd+git210.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:088b2b83ea864f71013faa1c841fe2f64682443b9b7eeac86508f23d492f49cd +size 100711736 diff --git a/wezterm.changes b/wezterm.changes index 5a23ee1..a91634f 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Nov 18 22:03:10 UTC 2023 - socvirnyl.estela@gmail.com + +- Update to version 20230712.072601.f4abf8fd+git210: + * cargo update + * docs: changelog for #4563 + * Make RIS also clear the alternate screen + ------------------------------------------------------------------- Sat Nov 18 21:57:26 UTC 2023 - Soc Virnyl Estela diff --git a/wezterm.obsinfo b/wezterm.obsinfo index de4537b..39a8c41 100644 --- a/wezterm.obsinfo +++ b/wezterm.obsinfo @@ -1,4 +1,4 @@ name: wezterm -version: 20230712.072601.f4abf8fd+git207 -mtime: 1699370718 -commit: f0e3eecba6faec0aa963a6f0067577afc99e11db +version: 20230712.072601.f4abf8fd+git210 +mtime: 1700259065 +commit: 600652583594e9f6195a6427d1fabb09068622a7 diff --git a/wezterm.spec b/wezterm.spec index 2d0fc20..a605d80 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -20,7 +20,7 @@ # %%global _dashed_version 20230712-072601-f4abf8fd Name: wezterm -Version: 20230712.072601.f4abf8fd+git207 +Version: 20230712.072601.f4abf8fd+git210 Release: 0 Summary: GPU-accelerated cross-platform terminal emulator and multiplexer URL: https://github.com/wez/wezterm @@ -110,8 +110,6 @@ Zsh completion script for %{name}. %prep %autosetup -a1 -p1 -mkdir -p .cargo -cp cargo_config .cargo/config tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo printf "%{version}" > .tag From 9f30fa92fa0cd15458ca7e97e0ae1275428c4f41d0c5dae25580627b829c94ac Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 19 Nov 2023 13:33:17 +0000 Subject: [PATCH 9/9] - Update vendored dependencies. - Add add-terminator-to-sync-capability.patch OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=106 --- add-terminator-to-sync-capability.patch | 27 +++++++++++++++++++ vendor.tar.zst | 4 +-- ...rm-20230712.072601.f4abf8fd+git210.tar.zst | 4 +-- wezterm.changes | 6 +++++ wezterm.spec | 1 + 5 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 add-terminator-to-sync-capability.patch diff --git a/add-terminator-to-sync-capability.patch b/add-terminator-to-sync-capability.patch new file mode 100644 index 0000000..e4c5980 --- /dev/null +++ b/add-terminator-to-sync-capability.patch @@ -0,0 +1,27 @@ +From 963413f8c550e7cf417a468a9f78bafcda512006 Mon Sep 17 00:00:00 2001 +From: Gregory Anders +Date: Mon, 13 Nov 2023 19:14:14 -0600 +Subject: [PATCH] wezterm.terminfo: add terminator to Sync capability + +I'm not sure if this is strictly necessary, but according to the +terminfo specification [1], a conditional string should be terminated +with `%;`. + +[1]: https://man7.org/linux/man-pages/man5/terminfo.5.html +--- + termwiz/data/wezterm.terminfo | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/termwiz/data/wezterm.terminfo b/termwiz/data/wezterm.terminfo +index f7a4af4275b..369763f63f6 100644 +--- a/termwiz/data/wezterm.terminfo ++++ b/termwiz/data/wezterm.terminfo +@@ -29,7 +29,7 @@ wezterm|Wez's terminal emulator, + Cr=\E]112\007, Cs=\E]12;%p1%s\007, Ms=\E]52;%p1%s;%p2%s\007, Se=\E[2\sq, + Ss=\E[%p1%d\sq, + Smulx=\E[4:%p1%dm, +- Sync=\E[?2026%?%p1%{1}%-%tl%eh, ++ Sync=\E[?2026%?%p1%{1}%-%tl%eh%;, + Setulc=\E[58:2::%p1%{65536}%/%d:%p1%{256}%/%{255}%&%d:%p1%{255}%&%d%;m, + Smol=\E[53m, + am, bce, ccc, km, mc5i, mir, msgr, npc, xenl, diff --git a/vendor.tar.zst b/vendor.tar.zst index 9bd490c..3593a08 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e33ab6583dbf15dd762e2c2c55198cc1779b7fc37bf5e6659a26095fd14179e3 -size 82336991 +oid sha256:b62e771d020c3db7a001d0b6ffb643aed963f3902a68456d506dcb43ce41c59e +size 82388436 diff --git a/wezterm-20230712.072601.f4abf8fd+git210.tar.zst b/wezterm-20230712.072601.f4abf8fd+git210.tar.zst index 638562b..f2765db 100644 --- a/wezterm-20230712.072601.f4abf8fd+git210.tar.zst +++ b/wezterm-20230712.072601.f4abf8fd+git210.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:088b2b83ea864f71013faa1c841fe2f64682443b9b7eeac86508f23d492f49cd -size 100711736 +oid sha256:fdfb2f8480b6e35970efb8eeed94974ccd498779560c5565cb848aee50d7d726 +size 100711676 diff --git a/wezterm.changes b/wezterm.changes index a91634f..2b3c193 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 19 13:26:35 UTC 2023 - Soc Virnyl Estela + +- Update vendored dependencies. +- Add add-terminator-to-sync-capability.patch + ------------------------------------------------------------------- Sat Nov 18 22:03:10 UTC 2023 - socvirnyl.estela@gmail.com diff --git a/wezterm.spec b/wezterm.spec index a605d80..064434c 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -28,6 +28,7 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (0BSD OR MIT OR Apache- Source0: %{name}-%{version}.tar.zst Source1: vendor.tar.zst Patch0: do-not-send-eof-when-closing-application.patch +Patch1: https://github.com/wez/wezterm/pull/4578/commits/963413f8c550e7cf417a468a9f78bafcda512006.patch#/add-terminator-to-sync-capability.patch Requires: terminfo BuildRequires: Mesa-libEGL-devel