From 177f8890fca1ab114235fea198b55a901b336b4cd3dd84470080dea993e45492 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sat, 21 May 2022 11:58:51 +0000 Subject: [PATCH] Accepting request 978406 from home:uncomfyhalomacro:branches:X11:terminals - Update to version 20220408.101518.b908e2dd~232: * dynamic: allow defaulting to None for enum struct fields * quickselect: allow multiline matches * wayland: fix weirdness with recent mutter and display scaling * wayland: avoid noisy panic-within-panic on shutdown * config: fix specifying numeric font weights * quickselect: avoid jumping to bottom of viewport when activated * mux: match workspace to local window when syncing panes * ssh: avoid busy loop when all channels are closed on the session * fix typo * fixup win32 build OBS-URL: https://build.opensuse.org/request/show/978406 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=3 --- _service | 2 +- cargo_config | 17 ++++++++++++++++- vendor.tar.xz | 4 ++-- wezterm-20220408.101518.b908e2dd~150.tar.xz | 3 --- wezterm-20220408.101518.b908e2dd~232.tar.xz | 3 +++ wezterm.changes | 15 +++++++++++++++ wezterm.spec | 10 ++++++---- 7 files changed, 43 insertions(+), 11 deletions(-) delete mode 100644 wezterm-20220408.101518.b908e2dd~150.tar.xz create mode 100644 wezterm-20220408.101518.b908e2dd~232.tar.xz diff --git a/_service b/_service index 315b4fd..f14e858 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/wez/wezterm @PARENT_TAG@~@TAG_OFFSET@ git - 94bb4ad09d9f61d897c1bb73e62cc3985c372653 + 94039c473bebbf35d4994863965ebd58c3647218 * (\d+)-(\d+)-(\w+) \1.\2.\3 diff --git a/cargo_config b/cargo_config index bb7e4a2..253238c 100644 --- a/cargo_config +++ b/cargo_config @@ -1,13 +1,28 @@ [source.crates-io] replace-with = "vendored-sources" +[source."https://github.com/khvzak/mlua"] +git = "https://github.com/khvzak/mlua" +branch = "master" +replace-with = "vendored-sources" + [source."https://github.com/wez/libssh-rs.git"] git = "https://github.com/wez/libssh-rs.git" replace-with = "vendored-sources" +[source."https://github.com/wez/rust-xcb"] +git = "https://github.com/wez/rust-xcb" +branch = "ffi" +replace-with = "vendored-sources" + +[source."https://github.com/wez/xcb-imdkit-rs.git"] +git = "https://github.com/wez/xcb-imdkit-rs.git" +rev = "ede7c71b85fe2537efef6cf999a45690316211cf" +replace-with = "vendored-sources" + [source."https://github.com/wez/xkbcommon-rs.git"] git = "https://github.com/wez/xkbcommon-rs.git" -rev = "5cc8f233ac2b8bfa0d7a26fd981b77e68c3f2219" +branch = "key-by-name" replace-with = "vendored-sources" [source.vendored-sources] diff --git a/vendor.tar.xz b/vendor.tar.xz index 22546d8..5ac46a6 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a9a04f5f1edce8811aaa2258aa20d7147faa54d1a389f15cb0efff7a18be428 -size 48334144 +oid sha256:1287f301e5ac35b9beff510219a7081fb78056b6f7bcc7a8f02eff2a7fd09c00 +size 51864960 diff --git a/wezterm-20220408.101518.b908e2dd~150.tar.xz b/wezterm-20220408.101518.b908e2dd~150.tar.xz deleted file mode 100644 index 2d94845..0000000 --- a/wezterm-20220408.101518.b908e2dd~150.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2faab943693d1522bf8449d553cdab327689a91c94f056abffdba00c99e59770 -size 96661964 diff --git a/wezterm-20220408.101518.b908e2dd~232.tar.xz b/wezterm-20220408.101518.b908e2dd~232.tar.xz new file mode 100644 index 0000000..c225bd0 --- /dev/null +++ b/wezterm-20220408.101518.b908e2dd~232.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff49991589feab7dd59da4f10ff8704ad8cc9aecc9f220643ba81508b347cfd6 +size 96692324 diff --git a/wezterm.changes b/wezterm.changes index f3002ef..813ec8e 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat May 21 04:07:29 UTC 2022 - socvirnyl.estela@gmail.com + +- Update to version 20220408.101518.b908e2dd~232: + * dynamic: allow defaulting to None for enum struct fields + * quickselect: allow multiline matches + * wayland: fix weirdness with recent mutter and display scaling + * wayland: avoid noisy panic-within-panic on shutdown + * config: fix specifying numeric font weights + * quickselect: avoid jumping to bottom of viewport when activated + * mux: match workspace to local window when syncing panes + * ssh: avoid busy loop when all channels are closed on the session + * fix typo + * fixup win32 build + ------------------------------------------------------------------- Thu May 5 10:36:05 UTC 2022 - Soc Virnyl Estela diff --git a/wezterm.spec b/wezterm.spec index 5a98f0c..9e496af 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -17,17 +17,20 @@ Name: wezterm -Version: 20220408.101518.b908e2dd~150 +Version: 20220408.101518.b908e2dd~232 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 (MIT OR Apache-2.0 OR BSD-2-Clause) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 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 +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.xz Source1: vendor.tar.xz Source2: cargo_config Requires: terminfo BuildRequires: Mesa-libEGL-devel BuildRequires: cargo-packaging +BuildRequires: rust >= 1.46 +ExclusiveArch: %{rust_arches} + BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ @@ -45,9 +48,9 @@ BuildRequires: xcb-util-image-devel BuildRequires: xcb-util-keysyms-devel BuildRequires: xcb-util-wm-devel BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(tic) BuildRequires: pkgconfig(libssh2) BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(tic) BuildRequires: pkgconfig(xcb) %description @@ -77,7 +80,6 @@ install -Dm 0644 assets/%{name}.appdata.xml %{buildroot}%{_datadir}/metainfo/org install -Dm 0644 assets/shell-integration/* -t %{buildroot}%{_sysconfdir}/profile.d install -Dm 0644 assets/%{name}-nautilus.py %{buildroot}%{_datadir}/nautilus-python/extensions/%{name}-nautilus.py - %files %license LICENSE.md %doc README.md CONTRIBUTING.md