From 1ca1e2930ec9e74274e8418ae5bd5493afc88d24 Mon Sep 17 00:00:00 2001
From: iliana etaoin <iliana@oxide.computer>
Date: Wed, 25 Feb 2026 14:09:22 -0800
Subject: [PATCH] CMake 4.x compatibility

Reverts #41.
---
 .github/workflows/macos-setup.sh | 13 -------------
 .gitmodules                      |  3 ++-
 c-deps/proj                      |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/macos-setup.sh b/.github/workflows/macos-setup.sh
index 4eb5f25fde..523c825664 100644
--- a/.github/workflows/macos-setup.sh
+++ b/.github/workflows/macos-setup.sh
@@ -1,19 +1,6 @@
 SOURCE_DIR=$PWD
 source .github/buildomat/versions.sh
 
-# Pin cmake to <4.0. This is staving off the eventual need to either patch,
-# update, or remove GEOS. https://github.com/oxidecomputer/cockroach/issues/18
-#
-# Method loosely based on https://github.com/actions/runner-images/pull/12791
-brew uninstall cmake
-cmake_commit="b4e46db74e74a8c1650b38b1da222284ce1ec5ce"
-tap_name="local/pinned"
-brew tap-new --no-git "$tap_name" >/dev/null
-cmake_formula_dir="$(brew --repo "$tap_name")/Formula"
-mkdir -p "$cmake_formula_dir"
-curl -fsSL "https://raw.githubusercontent.com/Homebrew/homebrew-core/$cmake_commit/Formula/c/cmake.rb" -o "$cmake_formula_dir/cmake.rb"
-brew install "$tap_name/cmake"
-
 brew install autoconf coreutils make
 
 mkdir "$HOME/toolchain"
diff --git a/.gitmodules b/.gitmodules
index eada5d2ee6..b244c9e749 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,4 +6,5 @@
 	url = https://github.com/cockroachdb/geos.git
 [submodule "c-deps/proj"]
 	path = c-deps/proj
-	url = https://github.com/cockroachdb/PROJ.git
+	url = https://github.com/oxidecomputer/PROJ.git
+	branch = 4.9.3-cockroach
diff --git a/c-deps/proj b/c-deps/proj
index c8ff95857b..47f32de4d4 160000
--- a/c-deps/proj
+++ b/c-deps/proj
@@ -1 +1 @@
-Subproject commit c8ff95857beb3027b5aa3d15726795570f38eccb
+Subproject commit 47f32de4d4b683af4891844d6a6aefce5801a082