rpm/wezterm
SHA256
1
0
Fork 0
forked from pool/wezterm
Code Pull Requests Activity

Accepting request 1127902 from X11:terminals

Browse Source 
- Update vendored dependencies.
- Add add-terminator-to-sync-capability.patch
- Update to version 20230712.072601.f4abf8fd+git210:
  * cargo update
  * docs: changelog for #4563
  * Make RIS also clear the alternate screen
- 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
- Move shell integration to /usr/etc. It won't be read but it's optional
- Remove cargo_config from source. It's part of the vendored tarball now
- 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/request/show/1127902
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wezterm?expand=0&rev=32
This commit is contained in:
Ana Guerrero 2023-11-21 20:32:52 +00:00 committed by Git OBS Bridge
commit 2d580bb482
11 changed files with 128 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
_service
View File

@ -1,9 +1,24 @@
<services>
<service mode="manual" name="download_files" />
<service name="cargo_vendor" mode="manual">
<param name="srctar">wezterm-20230712.072601.f4abf8fd.tar.gz</param>
<service mode="manual" name="obs_scm">
<param name="url">https://github.com/wez/wezterm</param>
<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@</param>
<param name="scm">git</param>
<param name="revision">600652583594e9f6195a6427d1fabb09068622a7</param>
<param name="versionrewrite-pattern">(\d+)-(\d+)-(\w+)</param>
<param name="versionrewrite-replacement">\1.\2.\3</param>
<param name="changesgenerate">enable</param>
<param name="changesauthor">socvirnyl.estela@gmail.com</param>
</service>
<service mode="manual" name="tar" />
<service mode="manual" name="recompress">
<param name="file">*.tar</param>
<param name="compression">zst</param>
<param name="update">false</param>
</service>
<service mode="manual" name="set_version"/>
<service name="cargo_vendor" mode="manual">
<param name="src">wezterm</param>
<param name="update">true</param>
<param name="i-accept-the-risk">RUSTSEC-2022-0090</param>
</service>
<service name="cargo_audit" mode="manual" />
</services>

4
_servicedata
View File

@ -1,4 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/wez/wezterm.git</param>
<param name="changesrevision">69ae847273aa2b0a64bdb07cf19d3f6fbaaa6b71</param></service></servicedata>
<param name="changesrevision">69ae847273aa2b0a64bdb07cf19d3f6fbaaa6b71</param></service><service name="tar_scm">
<param name="url">https://github.com/wez/wezterm</param>
<param name="changesrevision">600652583594e9f6195a6427d1fabb09068622a7</param></service></servicedata>

27
add-terminator-to-sync-capability.patch Normal file
View File

@ -0,0 +1,27 @@
From 963413f8c550e7cf417a468a9f78bafcda512006 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
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,

20
cargo_config
View File

@ -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"

17
do-not-send-eof-when-closing-application.patch Normal file
View File

@ -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]);
+ // }
}
}
}

4
vendor.tar.zst
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c55c9288fe34179a089c3552d0af29abcb6457102396db6b45bf7156424e683
size 45021414
oid sha256:b62e771d020c3db7a001d0b6ffb643aed963f3902a68456d506dcb43ce41c59e
size 82388436

3
wezterm-20230712.072601.f4abf8fd+git210.tar.zst Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fdfb2f8480b6e35970efb8eeed94974ccd498779560c5565cb848aee50d7d726
size 100711676

3
wezterm-20230712.072601.f4abf8fd.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cecb56697f912826abea548e948950e7556ff7c706192fa304992811fe0245a8
size 46238712

42
wezterm.changes
View File

@ -1,3 +1,45 @@
-------------------------------------------------------------------
Sun Nov 19 13:26:35 UTC 2023 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>
- Update vendored dependencies.
- Add add-terminator-to-sync-capability.patch
-------------------------------------------------------------------
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 <uncomfy+openbuildservice@uncomfyhalomacro.pl>
- 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 <uncomfy+openbuildservice@uncomfyhalomacro.pl>
- 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 <uncomfy+openbuildservice@uncomfyhalomacro.pl>
- 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
- 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 <uncomfy+openbuildservice@uncomfyhalomacro.pl>

6
wezterm.obsinfo
View File

@ -1,4 +1,4 @@
name: wezterm
version: 20230408.112425.69ae8472
mtime: 1680978265
commit: 69ae847273aa2b0a64bdb07cf19d3f6fbaaa6b71
version: 20230712.072601.f4abf8fd+git210
mtime: 1700259065
commit: 600652583594e9f6195a6427d1fabb09068622a7

25
wezterm.spec
View File

@ -17,17 +17,18 @@
%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
Version: 20230712.072601.f4abf8fd+git210
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.zst
Source1: vendor.tar.zst
Source2: cargo_config
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
@ -109,9 +110,7 @@ BuildArch: noarch
Zsh completion script for %{name}.
%prep
%autosetup -a1 -n %{name}-%{_dashed_version}
mkdir -p .cargo
cp %{SOURCE2} .cargo/config
%autosetup -a1 -p1
tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo
printf "%{version}" > .tag
@ -127,16 +126,16 @@ 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
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
@ -161,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