Date: Tue, 13 Jan 2026 09:29:20 +0000 From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: -k <slowdive@me.com> Subject: git: 825fb205fa88 - main - x11/ghostty: Remove bogus patches Message-ID: <69661070.ee24.5fb1c0c9@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=825fb205fa888084918aea959f08f54b99809696 commit 825fb205fa888084918aea959f08f54b99809696 Author: -k <slowdive@me.com> AuthorDate: 2026-01-12 19:16:39 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-01-13 09:28:58 +0000 x11/ghostty: Remove bogus patches PR: 287642 --- x11/ghostty/Makefile | 10 +-- .../files/patch-src_build_GhosttyResources.zig | 89 ---------------------- x11/ghostty/files/patch-src_build_SharedDeps.zig | 11 --- x11/ghostty/pkg-plist | 20 +---- 4 files changed, 6 insertions(+), 124 deletions(-) diff --git a/x11/ghostty/Makefile b/x11/ghostty/Makefile index 35cf6b544df5..01b54c00ac59 100644 --- a/x11/ghostty/Makefile +++ b/x11/ghostty/Makefile @@ -1,6 +1,7 @@ PORTNAME= ghostty DISTVERSIONPREFIX= v DISTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= x11 wayland DIST_SUBDIR= ${PORTNAME} @@ -22,13 +23,10 @@ GH_ACCOUNT= ghostty-org USE_GNOME= glib20 gtk40 libadwaita libxml2 -ZIG_ARGS= -Dapp-runtime=gtk \ - -Dgtk-wayland=true \ - -Dgtk-x11=true \ - -fsys=simdutf \ - -fno-sys=spirv-cross +ZIG_ARGS= -Dapp-runtime=gtk -Dgtk-wayland=true -Dgtk-x11=true \ + -fsys=simdutf -fno-sys=spirv-cross -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= pandoc:textproc/hs-pandoc DOCS_ZIG_BOOL= emit-docs diff --git a/x11/ghostty/files/patch-src_build_GhosttyResources.zig b/x11/ghostty/files/patch-src_build_GhosttyResources.zig deleted file mode 100644 index f9a119deb75e..000000000000 --- a/x11/ghostty/files/patch-src_build_GhosttyResources.zig +++ /dev/null @@ -1,89 +0,0 @@ ---- src/build/GhosttyResources.zig.orig 2025-06-28 02:43:12 UTC -+++ src/build/GhosttyResources.zig -@@ -19,10 +19,7 @@ pub fn init(b: *std.Build, cfg: *const Config) !Ghostt - // Terminfo - terminfo: { - const os_tag = cfg.target.result.os.tag; -- const terminfo_share_dir = if (os_tag == .freebsd) -- "site-terminfo" -- else -- "terminfo"; -+ const terminfo_share_dir = "terminfo"; - - // Encode our terminfo - var str = std.ArrayList(u8).init(b.allocator); -@@ -34,13 +31,7 @@ pub fn init(b: *std.Build, cfg: *const Config) !Ghostt - const source = wf.add("ghostty.terminfo", str.items); - - if (cfg.emit_terminfo) { -- const source_install = b.addInstallFile( -- source, -- if (os_tag == .freebsd) -- "share/site-terminfo/ghostty.terminfo" -- else -- "share/terminfo/ghostty.terminfo", -- ); -+ const source_install = b.addInstallFile(source, "share/ghostty/terminfo/ghostty.terminfo"); - - try steps.append(&source_install.step); - } -@@ -58,13 +49,7 @@ pub fn init(b: *std.Build, cfg: *const Config) !Ghostt - const out_source = run_step.captureStdOut(); - _ = run_step.captureStdErr(); // so we don't see stderr - -- const cap_install = b.addInstallFile( -- out_source, -- if (os_tag == .freebsd) -- "share/site-terminfo/ghostty.termcap" -- else -- "share/terminfo/ghostty.termcap", -- ); -+ const cap_install = b.addInstallFile(out_source, "share/ghostty/terminfo/ghostty.termcap"); - - try steps.append(&cap_install.step); - } -@@ -80,7 +65,7 @@ pub fn init(b: *std.Build, cfg: *const Config) !Ghostt - - // Ensure that `share/terminfo` is a directory, otherwise the `cp - // -R` will create a file named `share/terminfo` -- const mkdir_step = RunStep.create(b, "make share/terminfo directory"); -+ const mkdir_step = RunStep.create(b, "make share/ghostty/terminfo directory"); - switch (cfg.target.result.os.tag) { - // windows mkdir shouldn't need "-p" - .windows => mkdir_step.addArgs(&.{"mkdir"}), -@@ -88,7 +73,7 @@ pub fn init(b: *std.Build, cfg: *const Config) !Ghostt - } - - mkdir_step.addArg(b.fmt( -- "{s}/share/{s}", -+ "{s}/share/ghostty/{s}", - .{ b.install_path, terminfo_share_dir }, - )); - -@@ -100,7 +85,7 @@ pub fn init(b: *std.Build, cfg: *const Config) !Ghostt - const copy_step = RunStep.create(b, "copy terminfo db"); - copy_step.addArgs(&.{ "cp", "-R" }); - copy_step.addFileArg(path); -- copy_step.addArg(b.fmt("{s}/share", .{b.install_path})); -+ copy_step.addArg(b.fmt("{s}/share/ghostty", .{b.install_path})); - copy_step.step.dependOn(&mkdir_step.step); - try steps.append(©_step.step); - } -@@ -221,7 +206,7 @@ pub fn init(b: *std.Build, cfg: *const Config) !Ghostt - } - - // App (Linux) -- if (cfg.target.result.os.tag == .linux) try addLinuxAppResources( -+ if (cfg.target.result.os.tag == .freebsd) try addLinuxAppResources( - b, - cfg, - &steps, -@@ -237,7 +222,7 @@ fn addLinuxAppResources( - cfg: *const Config, - steps: *std.ArrayList(*std.Build.Step), - ) !void { -- assert(cfg.target.result.os.tag == .linux); -+ assert(cfg.target.result.os.tag == .freebsd); - - // Background: - // https://developer.gnome.org/documentation/guidelines/maintainer/integrating.html diff --git a/x11/ghostty/files/patch-src_build_SharedDeps.zig b/x11/ghostty/files/patch-src_build_SharedDeps.zig deleted file mode 100644 index 9f337e0ad5ce..000000000000 --- a/x11/ghostty/files/patch-src_build_SharedDeps.zig +++ /dev/null @@ -1,11 +0,0 @@ ---- src/build/SharedDeps.zig.orig 2025-06-28 02:43:12 UTC -+++ src/build/SharedDeps.zig -@@ -122,7 +122,7 @@ pub fn add( - ); - - if (b.systemIntegrationOption("freetype", .{})) { -- step.linkSystemLibrary2("bzip2", dynamic_link_opts); -+ step.linkSystemLibrary2("bz2", dynamic_link_opts); - step.linkSystemLibrary2("freetype2", dynamic_link_opts); - } else { - step.linkLibrary(freetype_dep.artifact("freetype")); diff --git a/x11/ghostty/pkg-plist b/x11/ghostty/pkg-plist index 9fbb55b2acf6..fe3816e58464 100644 --- a/x11/ghostty/pkg-plist +++ b/x11/ghostty/pkg-plist @@ -1,9 +1,6 @@ bin/ghostty -@comment lib/systemd/user/app-com.mitchellh.ghostty.service -share/applications/com.mitchellh.ghostty.desktop share/bash-completion/completions/ghostty.bash share/bat/syntaxes/ghostty.sublime-syntax -share/dbus-1/services/com.mitchellh.ghostty.service share/fish/vendor_completions.d/ghostty.fish %%PORTDOCS%%%%DATADIR%%/doc/ghostty.1.html %%PORTDOCS%%%%DATADIR%%/doc/ghostty.1.md @@ -15,8 +12,6 @@ share/fish/vendor_completions.d/ghostty.fish %%DATADIR%%/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish %%DATADIR%%/shell-integration/zsh/.zshenv %%DATADIR%%/shell-integration/zsh/ghostty-integration -%%DATADIR%%/terminfo/g/ghostty -%%DATADIR%%/terminfo/x/xterm-ghostty %%DATADIR%%/themes/0x96f %%DATADIR%%/themes/12-bit Rainbow %%DATADIR%%/themes/3024 Day @@ -447,25 +442,14 @@ share/fish/vendor_completions.d/ghostty.fish %%DATADIR%%/themes/iTerm2 Solarized Light %%DATADIR%%/themes/iTerm2 Tango Dark %%DATADIR%%/themes/iTerm2 Tango Light -share/icons/hicolor/1024x1024/apps/com.mitchellh.ghostty.png -share/icons/hicolor/128x128/apps/com.mitchellh.ghostty.png -share/icons/hicolor/128x128@2/apps/com.mitchellh.ghostty.png -share/icons/hicolor/16x16/apps/com.mitchellh.ghostty.png -share/icons/hicolor/16x16@2/apps/com.mitchellh.ghostty.png -share/icons/hicolor/256x256/apps/com.mitchellh.ghostty.png -share/icons/hicolor/256x256@2/apps/com.mitchellh.ghostty.png -share/icons/hicolor/32x32/apps/com.mitchellh.ghostty.png -share/icons/hicolor/32x32@2/apps/com.mitchellh.ghostty.png -share/icons/hicolor/512x512/apps/com.mitchellh.ghostty.png -share/kio/servicemenus/com.mitchellh.ghostty.desktop %%PORTDOCS%%share/man/man1/ghostty.1.gz %%PORTDOCS%%share/man/man5/ghostty.5.gz -share/metainfo/com.mitchellh.ghostty.metainfo.xml -share/nautilus-python/extensions/ghostty.py share/nvim/site/compiler/ghostty.vim share/nvim/site/ftdetect/ghostty.vim share/nvim/site/ftplugin/ghostty.vim share/nvim/site/syntax/ghostty.vim +share/site-terminfo/g/ghostty +share/site-terminfo/x/xterm-ghostty share/vim/vimfiles/compiler/ghostty.vim share/vim/vimfiles/ftdetect/ghostty.vim share/vim/vimfiles/ftplugin/ghostty.vimhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69661070.ee24.5fb1c0c9>