From 96e02fd481b077f2b29a7533f280f17856d536ecf813145a44aa58759fea96d1 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 7 Jun 2023 22:46:01 +0000 Subject: [PATCH 1/7] - Update vendored dependencies. OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=69 --- _service | 14 ++++++++++++++ vendor.tar.zst | 4 ++-- wezterm-20230408.112425.69ae8472.tar.zst | 4 ++-- wezterm.changes | 5 +++++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/_service b/_service index 7fe7058..565995e 100644 --- a/_service +++ b/_service @@ -20,6 +20,20 @@ wezterm zst true + wezterm/Cargo.toml + wezterm-blob-leases/Cargo.toml + wezterm-client/Cargo.toml + wezterm-dynamic/Cargo.toml + wezterm-dynamic/derive/Cargo.toml + wezterm-font/Cargo.toml + wezterm-gui/Cargo.toml + wezterm-gui-subcommands/Cargo.toml + wezterm-input-types/Cargo.toml + wezterm-mux-server/Cargo.toml + wezterm-mux-server-impl/Cargo.toml + wezterm-open-url/Cargo.toml + wezterm-ssh/Cargo.toml + wezterm-toast-notification/Cargo.toml wezterm diff --git a/vendor.tar.zst b/vendor.tar.zst index 0a7b7ba..7466124 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d55520e49e73dcfdc42f060c70fe8b1e97d978e9cf3792922d2ea12b8f2336fd -size 110399810 +oid sha256:cca49c4020717e5a454d9f44aaa415798558757e9ea86b7406763a2c6eb7cf55 +size 110557220 diff --git a/wezterm-20230408.112425.69ae8472.tar.zst b/wezterm-20230408.112425.69ae8472.tar.zst index 104d4fe..7ed3e9a 100644 --- a/wezterm-20230408.112425.69ae8472.tar.zst +++ b/wezterm-20230408.112425.69ae8472.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d96938ecfd9847f330a9b219f8f239cc25c10945e58301ca2844292ca45c0a6 -size 105690250 +oid sha256:8259974c96784eb1aa8d014e3f45bf4031c633be42f3218c77a19accb14de939 +size 105691139 diff --git a/wezterm.changes b/wezterm.changes index 182e3c5..f910cac 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 7 22:44:44 UTC 2023 - Soc Virnyl Estela + +- Update vendored dependencies. + ------------------------------------------------------------------- Fri Apr 14 13:41:36 UTC 2023 - Soc Virnyl Estela From dee18e660032fe16a1b5fbf0a284f3e0311bd9f957554fbb9c6c856d5e62264d Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 15 Jun 2023 13:15:10 +0000 Subject: [PATCH 2/7] - Use upstream tarball. - Add global dashed_version since upstream uses dashses instead of periods. - Update vendored dependencies. OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=70 --- _service | 24 +++--------------------- vendor.tar.zst | 4 ++-- wezterm-20230408.112425.69ae8472.tar.gz | 3 +++ wezterm-20230408.112425.69ae8472.tar.zst | 3 --- wezterm.changes | 7 +++++++ wezterm.spec | 5 +++-- 6 files changed, 18 insertions(+), 28 deletions(-) create mode 100644 wezterm-20230408.112425.69ae8472.tar.gz delete mode 100644 wezterm-20230408.112425.69ae8472.tar.zst diff --git a/_service b/_service index 565995e..b293c8a 100644 --- a/_service +++ b/_service @@ -1,23 +1,7 @@ - - https://github.com/wez/wezterm.git - @PARENT_TAG@ - git - 69ae847 - * - (\d+)-(\d+)-(\w+) - \1.\2.\3 - enable - socvirnyl.estela@gmail.com - - - - *.tar - zstd - - + - wezterm + wezterm-20230408.112425.69ae8472.tar.gz zst true wezterm/Cargo.toml @@ -35,8 +19,6 @@ wezterm-ssh/Cargo.toml wezterm-toast-notification/Cargo.toml - - wezterm - + diff --git a/vendor.tar.zst b/vendor.tar.zst index 7466124..0af6c8f 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cca49c4020717e5a454d9f44aaa415798558757e9ea86b7406763a2c6eb7cf55 -size 110557220 +oid sha256:640e6d607da311841d4b65b67a2aa09baa3a1d4bb5afe141ccab6a5ce07567f5 +size 110033666 diff --git a/wezterm-20230408.112425.69ae8472.tar.gz b/wezterm-20230408.112425.69ae8472.tar.gz new file mode 100644 index 0000000..4fceafa --- /dev/null +++ b/wezterm-20230408.112425.69ae8472.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52f457c32891cbd8258cb408b4db04f1de47ddf3872f448584375e8e8103d772 +size 86436383 diff --git a/wezterm-20230408.112425.69ae8472.tar.zst b/wezterm-20230408.112425.69ae8472.tar.zst deleted file mode 100644 index 7ed3e9a..0000000 --- a/wezterm-20230408.112425.69ae8472.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8259974c96784eb1aa8d014e3f45bf4031c633be42f3218c77a19accb14de939 -size 105691139 diff --git a/wezterm.changes b/wezterm.changes index f910cac..84d6d28 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 15 13:10:46 UTC 2023 - Soc Virnyl Estela + +- Use upstream tarball. +- Add global dashed_version since upstream uses dashses instead of periods. +- Update vendored dependencies. + ------------------------------------------------------------------- Wed Jun 7 22:44:44 UTC 2023 - Soc Virnyl Estela diff --git a/wezterm.spec b/wezterm.spec index 879526d..2b26313 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -17,6 +17,7 @@ %global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 +%global _dashed_version 20230408-112425-69ae8472 Name: wezterm Version: 20230408.112425.69ae8472 @@ -24,7 +25,7 @@ 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: %{name}-%{version}.tar.zst +Source0: https://github.com/wez/wezterm/archive/refs/tags/%{_dashed_version}tar.gz#/%{name}-%{version}.tar.gz Source1: vendor.tar.zst Source2: cargo_config Requires: terminfo @@ -96,7 +97,7 @@ BuildArch: noarch Zsh completion script for %{name}. %prep -%autosetup -a1 +%autosetup -a1 -n %{name}-%{_dashed_version} mkdir -p .cargo cp %{SOURCE2} .cargo/config tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo From 2d81cd5e65954000db49cd76204548d1d31f3ab515e8dbada7654e8d7ee144c8 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 15 Jun 2023 13:30:24 +0000 Subject: [PATCH 3/7] - Change and reupload source upstream tarball with already downloaded third-party deps. OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=71 --- wezterm-20230408.112425.69ae8472.tar.gz | 4 ++-- wezterm.changes | 5 +++++ wezterm.spec | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wezterm-20230408.112425.69ae8472.tar.gz b/wezterm-20230408.112425.69ae8472.tar.gz index 4fceafa..765fda9 100644 --- a/wezterm-20230408.112425.69ae8472.tar.gz +++ b/wezterm-20230408.112425.69ae8472.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52f457c32891cbd8258cb408b4db04f1de47ddf3872f448584375e8e8103d772 -size 86436383 +oid sha256:8f5c15db8341b0c067d7a5f6f06d4af17d5c24526e908eac4bd70156cd565800 +size 45617852 diff --git a/wezterm.changes b/wezterm.changes index 84d6d28..ce487a0 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 15 13:27:59 UTC 2023 - Soc Virnyl Estela + +- Change and reupload source upstream tarball with already downloaded third-party deps. + ------------------------------------------------------------------- Thu Jun 15 13:10:46 UTC 2023 - Soc Virnyl Estela diff --git a/wezterm.spec b/wezterm.spec index 2b26313..8aa18cc 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -25,7 +25,7 @@ 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/archive/refs/tags/%{_dashed_version}tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/wez/wezterm/releases/download/%{_dashed_version}/wezterm-%{_dashed_version}-src.tar.gz#/%{name}-%{version}.tar.gz Source1: vendor.tar.zst Source2: cargo_config Requires: terminfo From 0e27f0d18c4435f7865f195a7afce46d4fb9f586c2e128a8063a7cb338a11efa Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 15 Jun 2023 16:19:27 +0000 Subject: [PATCH 4/7] - Add %optflags - Fix install section. OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=72 --- wezterm.changes | 6 ++++++ wezterm.spec | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/wezterm.changes b/wezterm.changes index ce487a0..5fffc3d 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 15 16:18:52 UTC 2023 - Soc Virnyl Estela + +- Add %optflags +- Fix install section. + ------------------------------------------------------------------- Thu Jun 15 13:27:59 UTC 2023 - Soc Virnyl Estela diff --git a/wezterm.spec b/wezterm.spec index 8aa18cc..b6559e0 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -104,6 +104,8 @@ tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo printf "%{version}" > .tag %build +export CFLAGS="%optflags" +export CXXFLAGS="%optflags" %if 0%{?suse_version} > 1500 %{cargo_build} --all-features %else @@ -113,10 +115,10 @@ cargo build --offline --release --all-features %endif %install -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 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 0644 terminfo/w/wezterm %{buildroot}%{_datadir}/terminfo/w/wezterm install -Dm 0644 assets/%{name}.desktop %{buildroot}%{_datadir}/applications/org.wezfurlong.%{name}.desktop From 23293889dd11b5a5c5248a77805581a8807b357a6f7837a87600265863991af3 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 15 Jun 2023 16:36:09 +0000 Subject: [PATCH 5/7] - Add missing dependencies OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=73 --- wezterm.changes | 5 +++++ wezterm.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/wezterm.changes b/wezterm.changes index 5fffc3d..d5399ae 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 15 16:35:37 UTC 2023 - Soc Virnyl Estela + +- Add missing dependencies + ------------------------------------------------------------------- Thu Jun 15 16:18:52 UTC 2023 - Soc Virnyl Estela diff --git a/wezterm.spec b/wezterm.spec index b6559e0..b6f6fed 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -54,6 +54,8 @@ BuildRequires: xcb-util-image-devel BuildRequires: xcb-util-keysyms-devel BuildRequires: xcb-util-wm-devel BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(libgit2) BuildRequires: pkgconfig(libssh2) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(tic) From 355e3132a824de0186015af87863fc47a739be2c41bd8af21b6fc05657cb3400 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 15 Jun 2023 16:43:02 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=74 --- wezterm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wezterm.spec b/wezterm.spec index b6f6fed..86c2577 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -55,6 +55,7 @@ BuildRequires: xcb-util-keysyms-devel BuildRequires: xcb-util-wm-devel BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libgit2) BuildRequires: pkgconfig(libssh2) BuildRequires: pkgconfig(openssl) From 9741263a39abc9340cd6c11db7109018efa3d1a6b80f037cf109aecc1b63a5f6 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 15 Jun 2023 17:04:29 +0000 Subject: [PATCH 7/7] - Package is incompatible with native libraries. Disabling by commenting out CFLAGS and CXXFLAGS. OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=75 --- wezterm.changes | 6 ++++++ wezterm.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/wezterm.changes b/wezterm.changes index d5399ae..c2abaea 100644 --- a/wezterm.changes +++ b/wezterm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 15 17:03:30 UTC 2023 - Soc Virnyl Estela + +- Package is incompatible with native libraries. Disabling by commenting + out CFLAGS and CXXFLAGS. + ------------------------------------------------------------------- Thu Jun 15 16:35:37 UTC 2023 - Soc Virnyl Estela diff --git a/wezterm.spec b/wezterm.spec index 86c2577..9c6e0af 100644 --- a/wezterm.spec +++ b/wezterm.spec @@ -107,8 +107,8 @@ tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo printf "%{version}" > .tag %build -export CFLAGS="%optflags" -export CXXFLAGS="%optflags" +# export CFLAGS="%%optflags" +# export CXXFLAGS="%%optflags" %if 0%{?suse_version} > 1500 %{cargo_build} --all-features %else