From df3e1f14dbc141e617c90f12bcd589f7497a618ae2c13794b5a8d5bf243fc022 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela <socvirnyl.estela@gmail.com> Date: Sat, 9 Sep 2023 13:34:04 +0000 Subject: [PATCH 1/2] - Update to version 0.38.1: * refactor(server): remove unnecessary mut * fix(status-bar): add break tab hints * fix(reconnect): glitches on windows terminal * fix(grid): memory leak with unfocused tabs * fix(input): enforce ordering of actions after opening a new pane - Remove zellij-fix-theme-dir.patch OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=70 --- _service | 2 +- cargo_config | 2 +- vendor.tar.zst | 4 ++-- zellij-0.37.2.tar.gz | 3 --- zellij-0.38.1.tar.gz | 3 +++ zellij-fix-theme-dir.patch | 24 ------------------------ zellij.changes | 15 +++++++++++++++ zellij.spec | 3 +-- 8 files changed, 23 insertions(+), 33 deletions(-) delete mode 100644 zellij-0.37.2.tar.gz create mode 100644 zellij-0.38.1.tar.gz delete mode 100644 zellij-fix-theme-dir.patch diff --git a/_service b/_service index 1262f09..60cdea3 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ <services> <service name="download_files" mode="manual" /> <service name="cargo_vendor" mode="manual"> - <param name="srctar">zellij-0.37.2.tar.gz</param> + <param name="srctar">zellij-0.38.1.tar.gz</param> <param name="compression">zst</param> <param name="update">true</param> </service> diff --git a/cargo_config b/cargo_config index 6fb4ff4..97852b5 100644 --- a/cargo_config +++ b/cargo_config @@ -2,4 +2,4 @@ replace-with = "vendored-sources" [source.vendored-sources] -directory = "vendor" \ No newline at end of file +directory = "vendor" diff --git a/vendor.tar.zst b/vendor.tar.zst index 3729549..5057015 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bb0d2aa2232e6df1795d5ed3ee5092774e22aae9321ebfd9437fdbf7090928c -size 55266505 +oid sha256:878f20d71d62c1e555cb86a9d3e34e7b333ba9a2d2b28ec8099290517622ea42 +size 44580236 diff --git a/zellij-0.37.2.tar.gz b/zellij-0.37.2.tar.gz deleted file mode 100644 index 906a701..0000000 --- a/zellij-0.37.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f22223f251dbd352479d4671c0c742ffa225420667e20711d5515be2eb2a256 -size 7623408 diff --git a/zellij-0.38.1.tar.gz b/zellij-0.38.1.tar.gz new file mode 100644 index 0000000..f6ba544 --- /dev/null +++ b/zellij-0.38.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff15b85f0413fdf8c7f3c67b89c1662b2772b84e9f17af9a3e937469af272a56 +size 8688271 diff --git a/zellij-fix-theme-dir.patch b/zellij-fix-theme-dir.patch deleted file mode 100644 index abca6de..0000000 --- a/zellij-fix-theme-dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: zellij-0.35.1/zellij-utils/src/setup.rs -=================================================================== ---- zellij-0.35.1.orig/zellij-utils/src/setup.rs 2023-03-13 07:49:12.945032655 +0100 -+++ zellij-0.35.1/zellij-utils/src/setup.rs 2023-03-13 15:15:59.796892796 +0100 -@@ -85,8 +85,18 @@ pub fn get_layout_dir(config_dir: Option - } - - pub fn get_theme_dir(config_dir: Option<PathBuf>) -> Option<PathBuf> { -- config_dir.map(|dir| dir.join("themes")) -+ const THEME_DIR: &str = "themes"; -+ -+ [ -+ config_dir, -+ Some(get_default_data_dir()) -+ ] -+ .into_iter() -+ .filter(|p| p.is_some()) -+ .find(|dir| dir.clone().unwrap().join(THEME_DIR).exists()) -+ .map(|dir| dir.clone().unwrap().join(THEME_DIR)) - } -+ - pub fn dump_asset(asset: &[u8]) -> std::io::Result<()> { - std::io::stdout().write_all(asset)?; - Ok(()) diff --git a/zellij.changes b/zellij.changes index 8142cd8..525db60 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Sep 9 13:21:11 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com> + +- Update to version 0.38.1: + * refactor(server): remove unnecessary mut + * fix(status-bar): add break tab hints + * fix(reconnect): glitches on windows terminal + * fix(grid): memory leak with unfocused tabs + * fix(input): enforce ordering of actions after opening a new pane + +------------------------------------------------------------------- +Sat Sep 9 13:15:26 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com> + +- Remove zellij-fix-theme-dir.patch + ------------------------------------------------------------------- Sun Aug 13 13:26:55 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com> diff --git a/zellij.spec b/zellij.spec index 389d6e4..704b5fd 100644 --- a/zellij.spec +++ b/zellij.spec @@ -22,7 +22,7 @@ %bcond_with test Name: zellij -Version: 0.37.2 +Version: 0.38.1 Release: 0 Summary: Terminal workspace with batteries included License: MIT @@ -31,7 +31,6 @@ Source0: https://github.com/zellij-org/zellij/archive/refs/tags/v%{versio Source1: vendor.tar.zst Source2: cargo_config Source3: README.suse-maint.md -Patch0: zellij-fix-theme-dir.patch BuildRequires: cargo-packaging BuildRequires: rust+cargo BuildRequires: zstd From 86cebd11c7ae94d4a4846dfa609f6cd713bb9d4a667fe9ec87c8dd1d9b8468f2 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela <socvirnyl.estela@gmail.com> Date: Sat, 9 Sep 2023 14:04:24 +0000 Subject: [PATCH 2/2] - Add session-manager and fixture-tests plugins. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=71 --- vendor.tar.zst | 4 ++-- zellij.changes | 5 +++++ zellij.spec | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/vendor.tar.zst b/vendor.tar.zst index 5057015..cbfebc6 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:878f20d71d62c1e555cb86a9d3e34e7b333ba9a2d2b28ec8099290517622ea42 -size 44580236 +oid sha256:865912a6c0b34de6438d14d2537338438a1896ae83a7cb002e21a033f39385e3 +size 44579181 diff --git a/zellij.changes b/zellij.changes index 525db60..7f6660d 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 9 13:59:14 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com> + +- Add session-manager and fixture-tests plugins. + ------------------------------------------------------------------- Sat Sep 9 13:21:11 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com> diff --git a/zellij.spec b/zellij.spec index 704b5fd..c26b36a 100644 --- a/zellij.spec +++ b/zellij.spec @@ -103,6 +103,12 @@ popd pushd default-plugins/strider cargo --offline build --release --target=wasm32-wasi popd +pushd default-plugins/session-manager +cargo --offline build --release --target=wasm32-wasi +popd +pushd default-plugins/fixture-plugin-for-tests +cargo --offline build --release --target=wasm32-wasi +popd # Move the results to the place they are expected mv -v target/wasm32-wasi/release/*.wasm zellij-utils/assets/plugins/