Accepting request 1071167 from home:gladiac:branches:utilities

- Install the themes
- Allow to load themes from /usr/share/zellij/themes/
  * Added zellij-fix-theme-dir.patch

OBS-URL: https://build.opensuse.org/request/show/1071167
OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=58

zellij-fix-theme-dir.patch

@@ -0,0 +1,24 @@
+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(())

zellij.changes

@@ -6,6 +6,13 @@ Sun Mar 26 23:04:42 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>
   * fix(screen): hold and applylayout races
   * fix(ansi): pad line end when erasing characters
 
+-------------------------------------------------------------------
+Mon Mar 13 14:25:31 UTC 2023 - Andreas Schneider <asn@cryptomilk.org>
+
+- Install the themes
+- Allow to load themes from /usr/share/zellij/themes/
+  * Added zellij-fix-theme-dir.patch
+
 -------------------------------------------------------------------
 Sat Mar 11 08:13:55 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>
 

zellij.spec

@@ -16,6 +16,10 @@
 #
 
 
+%if "x%{?rust_tier1_arches}" == "x"
+%global rust_tier1_arches x86_64
+%endif
+
 %bcond_with     test
 Name:           zellij
 Version:        0.35.2
@@ -27,6 +31,7 @@ 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
@@ -78,7 +83,7 @@ BuildArch:      noarch
 Zsh command-line completion support for %{name}.
 
 %prep
-%autosetup -a1
+%autosetup -a1 -p1
 mkdir -p .cargo
 cp %{SOURCE2} .cargo/config
 # Remove prebuilt binaries
@@ -124,6 +129,10 @@ install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1
 %endif
 
 %{cargo_install} --features unstable
+
+install -d -m 0755 %{buildroot}%{_datadir}/%{name}
+cp -av example/themes %{buildroot}%{_datadir}/%{name}
+
 %if %{with test}
 %check
 %{cargo_test}
@@ -131,6 +140,8 @@ install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1
 
 %files
 %{_bindir}/zellij
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/themes
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*