From 17b1dfadf3fee0d4da49d282a1719b335dfa7578 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Thu, 16 Jan 2025 05:55:34 -0800 Subject: [PATCH] fix(ghostty): additional licenses, new upstream files (#2890) (#3020) * Fix: Ghostty pkgconfig, add licenses, minor cleanup * Fix/bump: Forgot to bump commit to trigger rebuild on Tip * Bump: Ghostty Nightly to resolve conflict Signed-off-by: Gil * Fix: Unpackaged files Upstream changes my beloved. Signed-off-by: Gil * Fix: New file Signed-off-by: Gil * Change (nightly): Build without wayland-protocols Signed-off-by: Gil * Change (stable): Build without wayland-protocols Signed-off-by: Gil --------- Signed-off-by: Gil (cherry picked from commit ba54a8b7c78e5ffc87a273cfbd179724951422f1) Co-authored-by: Gil --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 7 +++++-- anda/devs/ghostty/stable/ghostty.spec | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 2a12ccedd8..9174493f01 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -6,9 +6,9 @@ Name: ghostty-nightly Version: %{commit_date}.%{shortcommit} -Release: 1%?dist +Release: 2%{?dist} Summary: A fast, native terminal emulator written in Zig; this is the Tip (nightly) build. -License: MIT AND MPL-2.0 AND OFL-1.1 +License: MIT AND MPL-2.0 AND OFL-1.1 AND (WTFPL OR CC0-1.0) AND Apache-2.0 URL: https://ghostty.org/ Source0: https://github.com/ghostty-org/ghostty/archive/%{commit}/ghostty-%{commit}.tar.gz BuildRequires: gtk4-devel @@ -105,9 +105,12 @@ zig build \ %_datadir/bat/syntaxes/ghostty.sublime-syntax %_datadir/ghostty/ %_datadir/kio/servicemenus/com.mitchellh.ghostty.desktop +%_datadir/nautilus-python/extensions/com.mitchellh.ghostty.py +%_datadir/nvim/site/compiler/ghostty.vim %_datadir/nvim/site/ftdetect/ghostty.vim %_datadir/nvim/site/ftplugin/ghostty.vim %_datadir/nvim/site/syntax/ghostty.vim +%_datadir/vim/vimfiles/compiler/ghostty.vim %_datadir/vim/vimfiles/ftdetect/ghostty.vim %_datadir/vim/vimfiles/ftplugin/ghostty.vim %_datadir/vim/vimfiles/syntax/ghostty.vim diff --git a/anda/devs/ghostty/stable/ghostty.spec b/anda/devs/ghostty/stable/ghostty.spec index 5520262900..aefc0957a1 100644 --- a/anda/devs/ghostty/stable/ghostty.spec +++ b/anda/devs/ghostty/stable/ghostty.spec @@ -5,9 +5,9 @@ Name: ghostty Version: 1.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A fast, native terminal emulator written in Zig. -License: MIT AND MPL-2.0 AND OFL-1.1 +License: MIT AND MPL-2.0 AND OFL-1.1 AND (WTFPL OR CC0-1.0) AND Apache-2.0 URL: https://ghostty.org/ Source0: https://release.files.ghostty.org/%{version}/ghostty-%{version}.tar.gz Source1: https://release.files.ghostty.org/%{version}/ghostty-%{version}.tar.gz.minisig @@ -152,8 +152,8 @@ zig build \ %changelog * Tue Dec 31 2024 ShinyGil - Update to 1.0.1 - * High CVE-2003-0063: Allows execution of arbitrary commands - * Medium CVE-2003-0070: Allows execution of arbitrary commands + * High CVE-2003-0063: Allows execution of arbitrary commands + * Medium CVE-2003-0070: Allows execution of arbitrary commands * Thu Dec 26 2024 ShinyGil - Initial package