From nobody Tue Jan 13 09:29:20 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dr3q46gxyz6NgNl for ; Tue, 13 Jan 2026 09:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dr3q466cjz3ZvH for ; Tue, 13 Jan 2026 09:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768296560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u54hz4tIETj9tW5pf1HkpFtXWHtHQDg7cIck0OTjyBg=; b=oRufUGSFrFHnQyqRpP1fH6Bp/oXO3Cbht1j6WUG+3Pm5cGrV6ua7vyuOPEjmsVCnw9f9LK gbK3B7Aq1NOxL2b4AXwJv3mrIqKZtACch/jMK5RJbtg3Su8qcnkqx2towFtWgSaorV2kDS oY+o8J8L14P6YQf3nP1bPUJx/Lie0gZujFpfVyEBgiEG3GXDbzXCPF3Eh0GDf4RiPjlj0f 4n+47KUOr/VxEChYOLSCl+Air8Zdw7sI7gK0CCm5Glh5MUcJjj7lINjgjmDHsIjFPG6xAV +Ya9ZrW5EOegB4G+PSs4SJ7N/MCqFij1+UEPsgTG73FjRy0FJOYBpIF2qjVySA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768296560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u54hz4tIETj9tW5pf1HkpFtXWHtHQDg7cIck0OTjyBg=; b=oD0xWziNExk7rsApqU3mDeM7TreHXPgIkCg/k1Z6iZlBqF8aGy7JeMmzAYROhK21JLsmUB dpG456I06G81E2qQsw8BLQ8iYgiD/W4BeFJCn40w9VupV+ZqkKvRFWe/RW2Dtc1DWjCwcF cSMeRxhEGQp3sKxuIwJrN2IlLjV1StSzaf31ejmA6wsu2DQ4vq586hKmeZmprNPlfYk8q9 B9Y9hf2RzvMBfJ1NdlrqxBJthBEGDKN1CjP4sZ6sY1OHCOnd5EuBUNfktO/R1zVZ8rUMnM iroSMa9T5g6K3odN48QJs9hbTVkZrDOxPfEalB1kmCNsf8GdcJI5CmdihxnEbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768296560; a=rsa-sha256; cv=none; b=BqheN8ijc3xRmORbVSQgd6QG4Hvbo7plgBn1HEu+IZqjM/zBGeiLBAOKQaT4thjEqwLQKT 5vaYjEB5p7YnBEUubbr0acUllFSOzbOhS5me5j4tnjl+bI5DalQE8TCtwLAC/1auiKWafX 61gGJ22lBEmNvglHI9NSQ40bq1WSO1At8e7z4o2mK6StnPV9exR/2FoT5gAPtGVU/29UgU PqCwGofEcFLw7QIip3TibUrZjkRvFBN8NPkfUJavPocf4fFMysXOeibxnCaqizKgdhGzsw B7uhlTT/8hCAC6zaOtsQv5qr49d629r678xpUJ77Qr0XnFFXWlJcRJZE+Togag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dr3q44rjmz15wd for ; Tue, 13 Jan 2026 09:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ee24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 09:29:20 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: -k From: Gleb Popov Subject: git: 825fb205fa88 - main - x11/ghostty: Remove bogus patches List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 825fb205fa888084918aea959f08f54b99809696 Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 09:29:20 +0000 Message-Id: <69661070.ee24.5fb1c0c9@gitrepo.freebsd.org> The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=825fb205fa888084918aea959f08f54b99809696 commit 825fb205fa888084918aea959f08f54b99809696 Author: -k AuthorDate: 2026-01-12 19:16:39 +0000 Commit: Gleb Popov 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.vim