diff --git a/testing/ghostty/0001-ReleaseSafe-is-not-debug.patch b/testing/ghostty/0001-ReleaseSafe-is-not-debug.patch index 88298348fee..899fcea2f51 100644 --- a/testing/ghostty/0001-ReleaseSafe-is-not-debug.patch +++ b/testing/ghostty/0001-ReleaseSafe-is-not-debug.patch @@ -11,12 +11,12 @@ diff --git a/src/apprt/gtk/Window.zig b/src/apprt/gtk/Window.zig index 48e88e49..918b7284 100644 --- a/src/apprt/gtk/Window.zig +++ b/src/apprt/gtk/Window.zig -@@ -213,7 +213,7 @@ pub fn init(self: *Window, app: *App) !void { +@@ -290,7 +290,7 @@ // In debug we show a warning and apply the 'devel' class to the window. // This is a really common issue where people build from source in debug and performance is really bad. - if (comptime std.debug.runtime_safety) { + if (builtin.mode == .Debug) { - const warning_box = c.gtk_box_new(c.GTK_ORIENTATION_VERTICAL, 0); - const warning_text = "⚠️ You're running a debug build of Ghostty! Performance will be degraded."; - if ((comptime adwaita.versionAtLeast(1, 3, 0)) and + const warning_box = gtk.Box.new(.vertical, 0); + const warning_text = i18n._("⚠️ You're running a debug build of Ghostty! Performance will be degraded."); + if (adw_version.supportsBanner()) { diff --git a/testing/ghostty/APKBUILD b/testing/ghostty/APKBUILD index bfe75b62f12..e577f9eca41 100644 --- a/testing/ghostty/APKBUILD +++ b/testing/ghostty/APKBUILD @@ -1,7 +1,7 @@ # Contributor: lauren n. liberda maintainer="lauren n. liberda " pkgname=ghostty -pkgver=1.1.2_git20250311 +pkgver=1.1.2_git20250320 pkgrel=0 pkgdesc="Fast, feature-rich, and cross-platform terminal emulator" url="https://ghostty.org/" @@ -36,29 +36,13 @@ subpackages=" $pkgname-zsh-completion $pkgname-fish-completion " -_commit=ce7846860f5f74b65142fc2af6ed883a178249f8 +_commit=141b697f9d04bd1fec695477b5c2160d81e087f3 builddir="$srcdir/ghostty-$_commit" source=" https://github.com/ghostty-org/ghostty/archive/$_commit/ghostty-$_commit.tar.gz 0001-ReleaseSafe-is-not-debug.patch - zig-0.14.patch " -prepare() { - default_prepare - - # These are unused in our builds, but if already downloaded into cache, they can cause errors - rm -rf ~/.cache/zig/p/12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc - rm -rf ~/.cache/zig/p/12206ed982e709e565d536ce930701a8c07edfd2cfdce428683f3f2a601d37696a62 - rm -rf ~/.cache/zig/p/1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634 - rm -rf ~/.cache/zig/p/12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc - rm -rf ~/.cache/zig/p/12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25 - rm -rf ~/.cache/zig/p/12202cdac858abc52413a6c6711d5026d2d3c8e13f95ca2c327eade0736298bb021f - rm -rf ~/.cache/zig/p/12201a57c6ce0001aa034fa80fba3e1cd2253c560a45748f4f4dd21ff23b491cddef - rm -rf ~/.cache/zig/p/12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566 - rm -rf ~/.cache/zig/p/122071ad56fd984afb4f94d441b6ea3e21f1741a0e026b02860d9a46110fac2cd109 -} - build() { zig build \ --release=safe \ @@ -83,7 +67,6 @@ package() { } sha512sums=" -467b9f85b46557532e3c63780cabbfe827228f43370627354d9af4909086e49331f6028ff5181b4ffbf12daf101503e11d8cd3c1c582a23b50fd2b214cd0d499 ghostty-ce7846860f5f74b65142fc2af6ed883a178249f8.tar.gz -946fba6145cfcafe7ffdce908eb02fb84c0f235efe74e23feb17fa32dfa88255ab3370730c053b126da6a7469cc6be95b338732dfeb4ecfbdbed9517187c3428 0001-ReleaseSafe-is-not-debug.patch -86f989ab63e5d6319737571473b1e74a4eeb2dbf72d0bc51fc4cdf3a76abf1f4dc51b559cc26bcf26bb96e61a479bb70b26288d889b51fcfbfc37d6730ddfec5 zig-0.14.patch +8a30cf74ed93c9b47c6f66853e2eb667249967e4cb6fd6dd2475f418be5bd9605b7c800ce1b579da7ef4404297844626a4ee9b4188aec0b718ded807b39718a0 ghostty-141b697f9d04bd1fec695477b5c2160d81e087f3.tar.gz +004678683aa2161eb1d3e75118d5487c0dca10b18a69d9335df785abbe3d7fda665e2e58e76b7525a29a5fdecdffb4d2abab53d2116959d74c873cb8a8118cde 0001-ReleaseSafe-is-not-debug.patch " diff --git a/testing/ghostty/zig-0.14.patch b/testing/ghostty/zig-0.14.patch deleted file mode 100644 index 9eccaf385b6..00000000000 --- a/testing/ghostty/zig-0.14.patch +++ /dev/null @@ -1,30 +0,0 @@ -Patch-Source: https://github.com/ghostty-org/ghostty/commit/99bde549af7a6ea9fbfe47ca16f6ec50bd10ab80 -(with unrelated diffs removed) ---- -From 99bde549af7a6ea9fbfe47ca16f6ec50bd10ab80 Mon Sep 17 00:00:00 2001 -From: Mitchell Hashimoto -Date: Wed, 12 Mar 2025 13:53:28 -0700 -Subject: [PATCH] fix /usr/lib issues - ---- - src/build/GhosttyExe.zig | 2 +- - src/build/SharedDeps.zig | 5 ++++- - src/os/wasm.zig | 2 +- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig -index 18f43b3876..ae9f09afe2 100644 ---- a/src/build/SharedDeps.zig -+++ b/src/build/SharedDeps.zig -@@ -277,7 +277,10 @@ pub fn add( - // on x86_64. - if (step.rootModuleTarget().os.tag == .linux) { - const triple = try step.rootModuleTarget().linuxTriple(b.allocator); -- step.addLibraryPath(.{ .cwd_relative = b.fmt("/usr/lib/{s}", .{triple}) }); -+ const path = b.fmt("/usr/lib/{s}", .{triple}); -+ if (std.fs.accessAbsolute(path, .{})) { -+ step.addLibraryPath(.{ .cwd_relative = path }); -+ } else |_| {} - } - - // C files