funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-05-31 09:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Several fixes and additions from now reverted PR (#2828) (#2832)

Browse Source 
(cherry picked from commit df802b1aa9)

# Conflicts:
#	anda/devs/ghostty/nightly/ghostty-nightly.spec

Co-authored-by: Gil <rockgrub@protonmail.com>
This commit is contained in:
lea
2024-12-31 13:49:53 -08:00
committed by GitHub
parent a589cf6f4f
commit b39a37baf8
6 changed files with 29 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anda/devs/ghostty/nightly/ghostty-nightly.spec
+16 -25
View File
@@ -1,31 +1,21 @@
%global commit 5293fc9c2f19b7e01472de8c2ef08bef603b754a
%global commit 3f7c3afaf947280bd2852626ff4599c02d9fb07e
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20241228
Name: ghostty-nightly
Version: %commit_date.%shortcommit
Release: 1%?dist
Summary: A fast, native terminal emulator written in Zig; this is the Tip (nightly) build
Version: %{commit_date}.%{shortcommit}
Release: 2%{?dist}
Summary: A fast, native terminal emulator written in Zig; this is the Tip (nightly) build.
License: MIT
URL: https://ghostty.org/
Source0: https://github.com/ghostty-org/ghostty/archive/%{commit}/ghostty-%{commit}.tar.gz
#Patch0: pkgconfig-libadwaita-1.diff
#Patch1: use-pkg-config.diff
Patch2: no-strip.diff
BuildRequires: zig
BuildRequires: gtk4-devel libadwaita-devel
Patch0: no-strip.diff
BuildRequires: gtk4-devel
BuildRequires: libadwaita-devel
BuildRequires: ncurses
BuildRequires: ncurses-devel
BuildRequires: pandoc-cli
#BuildRequires: pkg-config
#BuildRequires: pkgconfig(harfbuzz)
#BuildRequires: pkgconfig(fontconfig)
#BuildRequires: pkgconfig(libpng)
#BuildRequires: pkgconfig(zlib)
#BuildRequires: pkgconfig(oniguruma)
#BuildRequires: pkgconfig(glslang)
# Not in Fedora
#BuildRequires: pkgconfig(spirv-cross)
#BuildRequires: pkgconfig(simdutf)
#BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: zig
Requires: %{name}-terminfo = %{version}-%{release}
Requires: %{name}-shell-integration = %{version}-%{release}
Requires: fontconfig
@@ -47,7 +37,6 @@ Packager: ShinyGil <rockgrub@protonmail.com>
%package bash-completion
Summary: Ghostty Bash completion
Requires: %{name}
Requires: bash-completion
Supplements: (%{name} and bash-completion)
@@ -56,7 +45,6 @@ Supplements: (%{name} and bash-completion)
%package fish-completion
Summary: Ghostty Fish completion
Requires: %{name}
Requires: fish
Supplements: (%{name} and fish)
@@ -65,7 +53,6 @@ Supplements: (%{name} and fish)
%package zsh-completion
Summary: Ghostty Zsh completion
Requires: %{name}
Requires: zsh
Supplements: (%{name} and zsh)
@@ -74,7 +61,6 @@ Supplements: (%{name} and zsh)
%package shell-integration
Summary: Ghostty shell integration
Requires: %{name}
Supplements: %{name}
%description shell-integration
@@ -82,7 +68,6 @@ Supplements: %{name}
%package terminfo
Summary: Ghostty terminfo
Requires: %{name}
Supplements: %{name}
%description terminfo
@@ -98,6 +83,7 @@ zig build \
--summary all \
-Doptimize=ReleaseFast --release=fast \
--prefix %{buildroot}%{_prefix} --verbose \
-Dcpu=baseline \
-Dpie=true \
-Demit-docs
@@ -124,6 +110,7 @@ zig build \
%_iconsdir/hicolor/256x256/apps/com.mitchellh.ghostty.png
%_iconsdir/hicolor/256x256@2/apps/com.mitchellh.ghostty.png
%_iconsdir/hicolor/512x512/apps/com.mitchellh.ghostty.png
%_iconsdir/hicolor/1024x1024/apps/com.mitchellh.ghostty.png
%_mandir/man1/ghostty.1.gz
%_mandir/man5/ghostty.5.gz
@@ -153,3 +140,7 @@ zig build \
%changelog
* Thu Dec 26 2024 ShinyGil <rockgrub@protonmail.com>
- Initial package
* Tue Dec 31 2024 ShinyGil <rockgrub@protonmail.com>
- Update to 20241231.3f7c3af
* High CVE-2003-0063: Allows execution of arbitrary commands
* Medium CVE-2003-0070: Allows execution of arbitrary commands
anda/devs/ghostty/nightly/pkgconfig-libadwaita-1.diff
-13
View File
@@ -1,13 +0,0 @@
diff --git a/build.zig b/build.zig
index 0969c64..68e16cd 100644
--- a/build.zig
+++ b/build.zig
@@ -1374,7 +1374,7 @@ fn addDeps(
.gtk => {
step.linkSystemLibrary2("gtk4", dynamic_link_opts);
- if (config.adwaita) step.linkSystemLibrary2("adwaita-1", dynamic_link_opts);
+ if (config.adwaita) step.linkSystemLibrary2("libadwaita-1", dynamic_link_opts);
{
const gresource = @import("src/apprt/gtk/gresource.zig");
anda/devs/ghostty/nightly/use-pkg-config.diff
-12
View File
@@ -1,12 +0,0 @@
diff --git a/build.zig b/build.zig
index a0ecf25..0969c64 100644
--- a/build.zig
+++ b/build.zig
@@ -1047,6 +1047,7 @@ fn addDeps(
const dynamic_link_opts: std.Build.Module.LinkSystemLibraryOptions = .{
.preferred_link_mode = .dynamic,
.search_strategy = .mode_first,
+ .use_pkg_config = .force,
};
// Freetype
anda/devs/ghostty/stable/ghostty.spec
+13 -23
View File
@@ -1,27 +1,17 @@
Name: ghostty
Version: 1.0.1
Release: 1%?dist
Summary: A fast, native terminal emulator written in Zig
Release: 2%{?dist}
Summary: A fast, native terminal emulator written in Zig.
License: MIT
URL: https://ghostty.org/
Source0: https://release.files.ghostty.org/%{version}/ghostty-source.tar.gz
#Patch0: pkgconfig-libadwaita-1.diff
#Patch1: use-pkg-config.diff
Patch2: no-strip.diff
BuildRequires: zig
BuildRequires: gtk4-devel libadwaita-devel
Patch0: no-strip.diff
BuildRequires: gtk4-devel
BuildRequires: libadwaita-devel
BuildRequires: ncurses
BuildRequires: ncurses-devel
BuildRequires: pandoc-cli
#BuildRequires: pkg-config
#BuildRequires: pkgconfig(harfbuzz)
#BuildRequires: pkgconfig(fontconfig)
#BuildRequires: pkgconfig(libpng)
#BuildRequires: pkgconfig(zlib)
#BuildRequires: pkgconfig(oniguruma)
#BuildRequires: pkgconfig(glslang)
# Not in Fedora
#BuildRequires: pkgconfig(spirv-cross)
#BuildRequires: pkgconfig(simdutf)
#BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: zig
Requires: %{name}-terminfo = %{version}-%{release}
Requires: %{name}-shell-integration = %{version}-%{release}
Requires: fontconfig
@@ -42,7 +32,6 @@ Packager: ShinyGil <rockgrub@protonmail.com>
%package bash-completion
Summary: Ghostty Bash completion
Requires: %{name}
Requires: bash-completion
Supplements: (%{name} and bash-completion)
@@ -51,7 +40,6 @@ Supplements: (%{name} and bash-completion)
%package fish-completion
Summary: Ghostty Fish completion
Requires: %{name}
Requires: fish
Supplements: (%{name} and fish)
@@ -60,7 +48,6 @@ Supplements: (%{name} and fish)
%package zsh-completion
Summary: Ghostty Zsh completion
Requires: %{name}
Requires: zsh
Supplements: (%{name} and zsh)
@@ -69,7 +56,6 @@ Supplements: (%{name} and zsh)
%package shell-integration
Summary: Ghostty shell integration
Requires: %{name}
Supplements: %{name}
%description shell-integration
@@ -77,7 +63,6 @@ Supplements: %{name}
%package terminfo
Summary: Ghostty terminfo
Requires: %{name}
Supplements: %{name}
%description terminfo
@@ -120,6 +105,7 @@ zig build \
%_iconsdir/hicolor/256x256/apps/com.mitchellh.ghostty.png
%_iconsdir/hicolor/256x256@2/apps/com.mitchellh.ghostty.png
%_iconsdir/hicolor/512x512/apps/com.mitchellh.ghostty.png
%_iconsdir/hicolor/1024x1024/apps/com.mitchellh.ghostty.png
%_mandir/man1/ghostty.1.gz
%_mandir/man5/ghostty.5.gz
@@ -149,3 +135,7 @@ zig build \
%changelog
* Thu Dec 26 2024 ShinyGil <rockgrub@protonmail.com>
- Initial package
* Tue Dec 31 2024 ShinyGil <rockgrub@protonmail.com>
- Update to 1.0.1
* High CVE-2003-0063: Allows execution of arbitrary commands
* Medium CVE-2003-0070: Allows execution of arbitrary commands
anda/devs/ghostty/stable/pkgconfig-libadwaita-1.diff
-13
View File
@@ -1,13 +0,0 @@
diff --git a/build.zig b/build.zig
index 0969c64..68e16cd 100644
--- a/build.zig
+++ b/build.zig
@@ -1374,7 +1374,7 @@ fn addDeps(
.gtk => {
step.linkSystemLibrary2("gtk4", dynamic_link_opts);
- if (config.adwaita) step.linkSystemLibrary2("adwaita-1", dynamic_link_opts);
+ if (config.adwaita) step.linkSystemLibrary2("libadwaita-1", dynamic_link_opts);
{
const gresource = @import("src/apprt/gtk/gresource.zig");
anda/devs/ghostty/stable/use-pkg-config.diff
-12
View File
@@ -1,12 +0,0 @@
diff --git a/build.zig b/build.zig
index a0ecf25..0969c64 100644
--- a/build.zig
+++ b/build.zig
@@ -1047,6 +1047,7 @@ fn addDeps(
const dynamic_link_opts: std.Build.Module.LinkSystemLibraryOptions = .{
.preferred_link_mode = .dynamic,
.search_strategy = .mode_first,
+ .use_pkg_config = .force,
};
// Freetype