From b45d140fdb654aeba7d5eaabe470acf0f51f8e38da1c584ddb095cf93a9b14ca Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Fri, 16 Dec 2022 13:44:48 +0000 Subject: [PATCH 1/7] - Update to version 20221119.145034.49b9839f+g21: * Update of vendored dependencies OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=53 --- _service | 6 ++---- _servicedata | 2 +- vendor.tar.gz | 4 ++-- wezterm-20221119.145034.49b9839f+g16.obscpio | 3 --- wezterm-20221119.145034.49b9839f+g16.tar.gz | 3 --- wezterm-20221119.145034.49b9839f+g21.obscpio | 3 +++ wezterm-20221119.145034.49b9839f+g21.tar.gz | 3 +++ wezterm.changes | 6 ++++++ wezterm.obsinfo | 6 +++--- wezterm.spec | 2 +- 10 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 wezterm-20221119.145034.49b9839f+g16.obscpio delete mode 100644 wezterm-20221119.145034.49b9839f+g16.tar.gz create mode 100644 wezterm-20221119.145034.49b9839f+g21.obscpio create mode 100644 wezterm-20221119.145034.49b9839f+g21.tar.gz diff --git a/_service b/_service index b369624..44e2db8 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/wez/wezterm.git @PARENT_TAG@+g@TAG_OFFSET@ git - af9d0efa178cbc70373995ee99af71b9f392942d + 91ea1095c9e532070cef29f4e56a64345b9cf704 * (\d+)-(\d+)-(\w+) \1.\2.\3 @@ -21,8 +21,6 @@ gz true - - wezterm - + diff --git a/_servicedata b/_servicedata index b182914..62dcce5 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/wez/wezterm.git - af9d0efa178cbc70373995ee99af71b9f392942d \ No newline at end of file + 91ea1095c9e532070cef29f4e56a64345b9cf704 \ No newline at end of file diff --git a/vendor.tar.gz b/vendor.tar.gz index 1bc339f..9ccc858 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f990add7ad5325c8bef51dd4616b84a964663b2d7e1a85e4ee46dd99a811f5fb -size 104297818 +oid sha256:c450f622d593a5ae3f016f32fd10283e6b8034165028340ced5add9568a6c928 +size 104350487 diff --git a/wezterm-20221119.145034.49b9839f+g16.obscpio b/wezterm-20221119.145034.49b9839f+g16.obscpio deleted file mode 100644 index f2bca09..0000000 --- a/wezterm-20221119.145034.49b9839f+g16.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d1ed7aa05081b0f8299b6097ad27d89fe4be7270d4fee38e228f9be09ab0909 -size 265207310 diff --git a/wezterm-20221119.145034.49b9839f+g16.tar.gz b/wezterm-20221119.145034.49b9839f+g16.tar.gz deleted file mode 100644 index 7c22e92..0000000 --- a/wezterm-20221119.145034.49b9839f+g16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47760c13d1f90e59a6b32809910866fa66faa1c324ae18d65b322d0f12dbb91e -size 124937294 diff --git a/wezterm-20221119.145034.49b9839f+g21.obscpio b/wezterm-20221119.145034.49b9839f+g21.obscpio new file mode 100644 index 0000000..0abfda7 --- /dev/null +++ b/wezterm-20221119.145034.49b9839f+g21.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2483303866f12efa4bc239d6d00051fc265a5f1abc292761a44dcca9b830cb9 +size 265210382 diff --git a/wezterm-20221119.145034.49b9839f+g21.tar.gz b/wezterm-20221119.145034.49b9839f+g21.tar.gz new file mode 100644 index 0000000..2330b4b --- /dev/null +++ b/wezterm-20221119.145034.49b9839f+g21.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f75c2614eb98e4c18b848a956e0c9eb2d6a8507201b197f8a05a2f7cc4db55ae +size 124937662 diff --git a/wezterm.changes b/wezterm.changes index b2b254b..c2f4805 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 16 13:17:45 UTC 2022 - socvirnyl.estela@gmail.com + +- Update to version 20221119.145034.49b9839f+g21: + * Update of vendored dependencies + ------------------------------------------------------------------- Mon Dec 05 22:40:02 UTC 2022 - socvirnyl.estela@gmail.com diff --git a/wezterm.obsinfo b/wezterm.obsinfo index 4a20f36..7e666aa 100644 --- a/wezterm.obsinfo +++ b/wezterm.obsinfo @@ -1,4 +1,4 @@ name: wezterm -version: 20221119.145034.49b9839f+g16 -mtime: 1670208053 -commit: af9d0efa178cbc70373995ee99af71b9f392942d +version: 20221119.145034.49b9839f+g21 +mtime: 1670861709 +commit: 91ea1095c9e532070cef29f4e56a64345b9cf704 diff --git a/wezterm.spec b/wezterm.spec index 83b71ee..0d99c27 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -19,7 +19,7 @@ %global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 Name: wezterm -Version: 20221119.145034.49b9839f+g16 +Version: 20221119.145034.49b9839f+g21 Release: 0 Summary: GPU-accelerated cross-platform terminal emulator and multiplexer URL: https://github.com/wez/wezterm From 96351b1909844de8dbebf54df501d89a15ab23756f0d1a4213e2f80316d7de27 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Fri, 16 Dec 2022 15:51:43 +0000 Subject: [PATCH 2/7] - Separate the multiplexer server from wezterm-gui: Reason -> https://github.com/wez/wezterm/blob/main/README-DISTRO-MAINTAINER.md#binaries OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=54 --- wezterm.changes | 6 ++++++ wezterm.spec | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/wezterm.changes b/wezterm.changes index c2f4805..8f60e24 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 16 15:49:36 UTC 2022 - Soc Virnyl Estela + +- Separate the multiplexer server from wezterm-gui: + Reason -> https://github.com/wez/wezterm/blob/main/README-DISTRO-MAINTAINER.md#binaries + ------------------------------------------------------------------- Fri Dec 16 13:17:45 UTC 2022 - socvirnyl.estela@gmail.com diff --git a/wezterm.spec b/wezterm.spec index 0d99c27..ad2f87d 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -57,12 +57,19 @@ BuildRequires: pkgconfig(libssh2) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(tic) BuildRequires: pkgconfig(xcb) +Recommends: %{name}-mux-server %description Wezterm is a GPU-accelerated terminal emulator written in Rust. It supports ligatures, font fallback and true color. It features dynamic color schemes, hyperlinks, and multiplex terminal panes. +%package mux-server +Summary: Multiplexer server for %{name} + +%description mux-server +Multiplexer server for wezterm for running on a headless system. + %prep %autosetup -a1 mkdir -p .cargo @@ -75,7 +82,7 @@ tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo %else export CARGO_FEATURE_VENDORED=1 export RUSTFLAGS='%{rustflags}' -cargo build --offline --release --all-features -j$(nproc) +cargo build --offline --release --all-features %endif %install @@ -108,7 +115,6 @@ install -D -m 0644 assets/shell-completion/fish %{buildroot}%{_datadir}/fish/ven %doc README.md CONTRIBUTING.md %{_bindir}/wezterm %{_bindir}/wezterm-gui -%{_bindir}/wezterm-mux-server %{_bindir}/strip-ansi-escapes %{_datadir}/terminfo/w/wezterm %{_datadir}/applications/org.wezfurlong.wezterm.desktop @@ -127,7 +133,15 @@ install -D -m 0644 assets/shell-completion/fish %{buildroot}%{_datadir}/fish/ven %dir %{_datadir}/fish/vendor_completions.d %{_datadir}/fish/vendor_completions.d/wezterm.fish %{_datadir}/fish/vendor_completions.d/wezterm-gui.fish +%config %{_sysconfdir}/profile.d/wezterm.sh +%files mux-server +%license LICENSE.md +%doc README.md CONTRIBUTING.md +%{_bindir}/wezterm-mux-server +%{_bindir}/wezterm +%{_bindir}/strip-ansi-escapes +%{_datadir}/terminfo/w/wezterm %config %{_sysconfdir}/profile.d/wezterm.sh %changelog From 99065d289100fe78df1e986431ed3355a3434a45f714e3b02edd444bfe877870 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Fri, 16 Dec 2022 16:06:36 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=55 --- wezterm.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/wezterm.spec b/wezterm.spec index ad2f87d..7fedbc5 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -57,7 +57,6 @@ BuildRequires: pkgconfig(libssh2) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(tic) BuildRequires: pkgconfig(xcb) -Recommends: %{name}-mux-server %description Wezterm is a GPU-accelerated terminal emulator written in Rust. It supports @@ -66,6 +65,7 @@ and multiplex terminal panes. %package mux-server Summary: Multiplexer server for %{name} +Recommends: %{name} = %{version} %description mux-server Multiplexer server for wezterm for running on a headless system. @@ -139,9 +139,5 @@ install -D -m 0644 assets/shell-completion/fish %{buildroot}%{_datadir}/fish/ven %license LICENSE.md %doc README.md CONTRIBUTING.md %{_bindir}/wezterm-mux-server -%{_bindir}/wezterm -%{_bindir}/strip-ansi-escapes -%{_datadir}/terminfo/w/wezterm -%config %{_sysconfdir}/profile.d/wezterm.sh %changelog From b22c0c2b9c9385a9c8bca33652151a4f9b1af5919c68f3f365f2146dbfe55f3e Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 21 Dec 2022 12:50:32 +0000 Subject: [PATCH 4/7] - Add shell completions for bash, zsh, and fish. - Print version to `.tag` file to let `wezterm -V` or `wezterm --version` command show the version. OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=56 --- wezterm.changes | 7 +++++++ wezterm.spec | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/wezterm.changes b/wezterm.changes index 8f60e24..36470d9 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 21 12:49:12 UTC 2022 - Soc Virnyl Estela + +- Add shell completions for bash, zsh, and fish. +- Print version to `.tag` file to let `wezterm -V` or `wezterm --version` + command show the version. + ------------------------------------------------------------------- Fri Dec 16 15:49:36 UTC 2022 - Soc Virnyl Estela diff --git a/wezterm.spec b/wezterm.spec index 7fedbc5..07ba898 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -70,11 +70,37 @@ Recommends: %{name} = %{version} %description mux-server Multiplexer server for wezterm for running on a headless system. +%package bash-completion +Summary: Bash Completion for %{name} +Requires: bash-completion +Supplements: (%{name} and bash-completion) +BuildArch: noarch + +%description bash-completion +Bash completion support for %{name}. + +%package fish-completion +Summary: Fish Completion for %{name} +Supplements: (%{name} and fish) +BuildArch: noarch + +%description fish-completion +Fish completion script for %{name}. + +%package zsh-completion +Summary: ZSH Completion for %{name} +Supplements: (%{name} and zsh) +BuildArch: noarch + +%description zsh-completion +Zsh completion script for %{name}. + %prep %autosetup -a1 mkdir -p .cargo -cp %{SOURCE2} .cargo/config +cp %{SOURCE2} .cargo/config.toml tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo +printf "%{version}" > .tag %build %if 0%{?suse_version} > 1500 @@ -140,4 +166,16 @@ install -D -m 0644 assets/shell-completion/fish %{buildroot}%{_datadir}/fish/ven %doc README.md CONTRIBUTING.md %{_bindir}/wezterm-mux-server +%files bash-completion +%{_datadir}/bash-completion/completions/wezterm +%{_datadir}/bash-completion/completions/wezterm-gui + +%files fish-completion +%{_datadir}/fish/vendor_completions.d/wezterm.fish +%{_datadir}/fish/vendor_completions.d/wezterm-gui.fish + +%files zsh-completion +%{_datadir}/zsh/site-functions/_wezterm +%{_datadir}/zsh/site-functions/_wezterm-gui + %changelog From ea6b7d32a0804746ade90e3e271a04ae9aed09d22ec54b8c98f732c59bb62648 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 21 Dec 2022 12:54:38 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=57 --- wezterm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wezterm.spec b/wezterm.spec index 07ba898..3dd4328 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -98,7 +98,7 @@ Zsh completion script for %{name}. %prep %autosetup -a1 mkdir -p .cargo -cp %{SOURCE2} .cargo/config.toml +cp %{SOURCE2} .cargo/config tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo printf "%{version}" > .tag From e4daa57d6db7b0762676ba7d89988504ae2a0a64b25984f17a79c898362b44f9 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 21 Dec 2022 13:07:17 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=58 --- wezterm.spec | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/wezterm.spec b/wezterm.spec index 3dd4328..218a004 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -147,18 +147,6 @@ 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 -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/wezterm -%{_datadir}/bash-completion/completions/wezterm-gui -%dir %{_datadir}/zsh -%dir %{_datadir}/zsh/site-functions -%{_datadir}/zsh/site-functions/_wezterm -%{_datadir}/zsh/site-functions/_wezterm-gui -%dir %{_datadir}/fish -%dir %{_datadir}/fish/vendor_completions.d -%{_datadir}/fish/vendor_completions.d/wezterm.fish -%{_datadir}/fish/vendor_completions.d/wezterm-gui.fish %config %{_sysconfdir}/profile.d/wezterm.sh %files mux-server From e153bb8dfb040339b1d91015e3c355a8baea3f15d62e031927971a61d1d7b665 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 21 Dec 2022 13:18:38 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=59 --- wezterm.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wezterm.spec b/wezterm.spec index 218a004..0801556 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -155,14 +155,20 @@ install -D -m 0644 assets/shell-completion/fish %{buildroot}%{_datadir}/fish/ven %{_bindir}/wezterm-mux-server %files bash-completion +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/wezterm %{_datadir}/bash-completion/completions/wezterm-gui %files fish-completion +%dir %{_datadir}/fish +%dir %{_datadir}/fish/vendor_completions.d %{_datadir}/fish/vendor_completions.d/wezterm.fish %{_datadir}/fish/vendor_completions.d/wezterm-gui.fish %files zsh-completion +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_wezterm %{_datadir}/zsh/site-functions/_wezterm-gui