From cca10f3ca8b701c9c34bbcd1fc918e0de3e004e9 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 10 Dec 2025 20:17:25 -0800
Subject: [PATCH] Revert GTK UI changes, apple-sdk build stuff

---
 pkg/apple-sdk/build.zig         | 27 ---------------------------
 src/apprt/gtk/ui/1.5/window.blp | 30 ------------------------------
 src/input/command.zig           |  2 +-
 3 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/pkg/apple-sdk/build.zig b/pkg/apple-sdk/build.zig
index 32cb726fd..c573c3910 100644
--- a/pkg/apple-sdk/build.zig
+++ b/pkg/apple-sdk/build.zig
@@ -30,7 +30,6 @@ pub fn addPaths(
             framework: []const u8,
             system_include: []const u8,
             library: []const u8,
-            cxx_include: []const u8,
         }) = .{};
     };
 
@@ -83,36 +82,11 @@ pub fn addPaths(
             });
         };
 
-        const cxx_include_path = cxx: {
-            const preferred = try std.fs.path.join(b.allocator, &.{
-                libc.sys_include_dir.?,
-                "c++",
-                "v1",
-            });
-            if (std.fs.accessAbsolute(preferred, .{})) |_| {
-                break :cxx preferred;
-            } else |_| {}
-
-            const sdk_root = std.fs.path.dirname(libc.sys_include_dir.?).?;
-            const fallback = try std.fs.path.join(b.allocator, &.{
-                sdk_root,
-                "include",
-                "c++",
-                "v1",
-            });
-            if (std.fs.accessAbsolute(fallback, .{})) |_| {
-                break :cxx fallback;
-            } else |_| {}
-
-            break :cxx preferred;
-        };
-
         gop.value_ptr.* = .{
             .libc = path,
             .framework = framework_path,
             .system_include = libc.sys_include_dir.?,
             .library = library_path,
-            .cxx_include = cxx_include_path,
         };
     }
 
@@ -133,6 +107,5 @@ pub fn addPaths(
     // https://github.com/ziglang/zig/issues/24024
     step.root_module.addSystemFrameworkPath(.{ .cwd_relative = value.framework });
     step.root_module.addSystemIncludePath(.{ .cwd_relative = value.system_include });
-    step.root_module.addSystemIncludePath(.{ .cwd_relative = value.cxx_include });
     step.root_module.addLibraryPath(.{ .cwd_relative = value.library });
 }
diff --git a/src/apprt/gtk/ui/1.5/window.blp b/src/apprt/gtk/ui/1.5/window.blp
index de06b04da..8c0a7bedb 100644
--- a/src/apprt/gtk/ui/1.5/window.blp
+++ b/src/apprt/gtk/ui/1.5/window.blp
@@ -162,7 +162,6 @@ template $GhosttyWindow: Adw.ApplicationWindow {
             page-attached => $page_attached();
             page-detached => $page_detached();
             create-window => $tab_create_window();
-            menu-model: tab_context_menu;
             shortcuts: none;
           }
         }
@@ -193,35 +192,6 @@ menu split_menu {
   }
 }
 
-menu tab_context_menu {
-  section {
-    item {
-      label: _("New Tab");
-      action: "win.new-tab";
-    }
-  }
-
-  section {
-    item {
-      label: _("Close Tab");
-      action: "tab.close";
-      target: "this";
-    }
-
-    item {
-      label: _("Close Other Tabs");
-      action: "tab.close";
-      target: "other";
-    }
-
-    item {
-      label: _("Close Tabs on the Right");
-      action: "tab.close";
-      target: "right";
-    }
-  }
-}
-
 menu main_menu {
   section {
     item {
diff --git a/src/input/command.zig b/src/input/command.zig
index 6baeca23b..4cbe9ffc4 100644
--- a/src/input/command.zig
+++ b/src/input/command.zig
@@ -540,7 +540,7 @@ fn actionCommands(action: Action.Key) []const Command {
             },
             .{
                 .action = .{ .close_tab = .right },
-                .title = "Close Tabs on the Right",
+                .title = "Close Tabs to the Right",
                 .description = "Close every tab to the right of the current one.",
             },
         },