diff --git a/_service b/_service
index e3f7817..62eb4fa 100644
--- a/_service
+++ b/_service
@@ -1,9 +1,24 @@
-
+
+ https://github.com/wez/wezterm
+ @PARENT_TAG@+git@TAG_OFFSET@
+ git
+ 600652583594e9f6195a6427d1fabb09068622a7
+ (\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..845d714 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
+ 600652583594e9f6195a6427d1fabb09068622a7
\ No newline at end of file
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/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/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/vendor.tar.zst b/vendor.tar.zst
index aa85a2a..3593a08 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:b62e771d020c3db7a001d0b6ffb643aed963f3902a68456d506dcb43ce41c59e
+size 82388436
diff --git a/wezterm-20230712.072601.f4abf8fd+git210.tar.zst b/wezterm-20230712.072601.f4abf8fd+git210.tar.zst
new file mode 100644
index 0000000..f2765db
--- /dev/null
+++ b/wezterm-20230712.072601.f4abf8fd+git210.tar.zst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fdfb2f8480b6e35970efb8eeed94974ccd498779560c5565cb848aee50d7d726
+size 100711676
diff --git a/wezterm-20230712.072601.f4abf8fd.tar.gz b/wezterm-20230712.072601.f4abf8fd.tar.gz
deleted file mode 100644
index 30f8d33..0000000
--- a/wezterm-20230712.072601.f4abf8fd.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.changes b/wezterm.changes
index 25f6b40..2b3c193 100644
--- a/wezterm.changes
+++ b/wezterm.changes
@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+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
+
+- 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
+
+- 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
+
+- 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
+
+- 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
diff --git a/wezterm.obsinfo b/wezterm.obsinfo
index 9769196..39a8c41 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+git210
+mtime: 1700259065
+commit: 600652583594e9f6195a6427d1fabb09068622a7
diff --git a/wezterm.spec b/wezterm.spec
index 823bd2f..064434c 100644
--- a/wezterm.spec
+++ b/wezterm.spec
@@ -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