From c8236b569217744394d5da7380103a8663cc6784 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Thu, 7 May 2026 11:43:15 +0700
Subject: [PATCH 1/2] Update and fix cmake

---
 config/x86_64/ci.toml         |  4 ++--
 recipes/dev/cmake/recipe.toml | 41 ++++++++++++-----------------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml
index 0f2c29eb..daddb29b 100644
--- a/config/x86_64/ci.toml
+++ b/config/x86_64/ci.toml
@@ -40,6 +40,7 @@ ca-certificates = {}
 cairo = {}
 cbindgen = {}
 cleye = {}
+cmake = {}
 composer = {}
 contain = {}
 coreutils = {}
@@ -90,6 +91,7 @@ ion = {}
 kernel = {}
 kibi = {}
 lci = {}
+libarchive = {}
 libavif = {}
 libc-bench = {}
 libedit = {}
@@ -236,7 +238,6 @@ zstd = {}
 #book = {}
 #cairo-demo = {} # linking errors
 #classicube = {}
-#cmake = {}
 #cmatrix = {} # needs ncursesw now
 #cookbook = {}
 #cosmic-reader = {}
@@ -265,7 +266,6 @@ zstd = {}
 #iced = {}
 #jansson = {} # needs config.sub update
 #jq = {}
-#libarchive = {}
 #libatomic = {}
 #libcosmic = {}
 #libflac = {}
diff --git a/recipes/dev/cmake/recipe.toml b/recipes/dev/cmake/recipe.toml
index 12d2da48..a18e143e 100644
--- a/recipes/dev/cmake/recipe.toml
+++ b/recipes/dev/cmake/recipe.toml
@@ -1,10 +1,10 @@
 [source]
-tar = "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3.tar.gz"
+tar = "https://github.com/Kitware/CMake/releases/download/v4.3.2/cmake-4.3.2.tar.gz"
+blake3 = "cbd0121189df1502f61e8f12f044b4a901b1ea16c74c016b85714e4661b8537f"
 
 [build]
-template = "custom"
+template = "cmake"
 dependencies = [
-    "bzip2",
     # "cppdap",
     "curl",
     "expat",
@@ -14,30 +14,17 @@ dependencies = [
     # "liblzma",
     # "librhash",
     "libuv",
-    "nghttp2",
-    "openssl3",
     "zlib",
     "zstd",
 ]
-script = """
-DYNAMIC_INIT
-
-COOKBOOK_CMAKE_FLAGS+=(
-    -DBUILD_TESTING=Off
-    -DCMAKE_USE_SYSTEM_BZIP2=On
-    -DCMAKE_USE_SYSTEM_CURL=On
-    -DCMAKE_USE_SYSTEM_EXPAT=On
-    -DCMAKE_USE_SYSTEM_LIBARCHIVE=On
-    -DCMAKE_USE_SYSTEM_LIBUV=On
-    -DCMAKE_USE_SYSTEM_NGHTTP2=On
-    -DCMAKE_USE_SYSTEM_ZLIB=On
-    -DCMAKE_USE_SYSTEM_ZSTD=On
-)
-cookbook_cmake
-set -x
-mv -vT "${COOKBOOK_STAGE}"/usr/bin "${COOKBOOK_STAGE}/bin"
-mv -vT "${COOKBOOK_STAGE}"/usr/share "${COOKBOOK_STAGE}/share"
-rm -rf "${COOKBOOK_STAGE}"/usr/doc
-rmdir -v "${COOKBOOK_STAGE}"/usr
-set +x
-"""
+cmakeflags = [
+    "-DBUILD_TESTING=Off",
+    "-DCMAKE_USE_SYSTEM_BZIP2=On",
+    "-DCMAKE_USE_SYSTEM_CURL=On",
+    "-DCMAKE_USE_SYSTEM_EXPAT=On",
+    "-DCMAKE_USE_SYSTEM_LIBARCHIVE=On",
+    "-DCMAKE_USE_SYSTEM_LIBUV=On",
+    "-DCMAKE_USE_SYSTEM_NGHTTP2=On",
+    "-DCMAKE_USE_SYSTEM_ZLIB=On",
+    "-DCMAKE_USE_SYSTEM_ZSTD=On",
+]

From 950459dcc6d5b779de32a38e1dd162e498cdc480 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Thu, 7 May 2026 11:49:37 +0700
Subject: [PATCH 2/2] Add cmake to dev-essential

---
 recipes/groups/dev-essential/recipe.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/groups/dev-essential/recipe.toml b/recipes/groups/dev-essential/recipe.toml
index c1102583..4ed25c77 100644
--- a/recipes/groups/dev-essential/recipe.toml
+++ b/recipes/groups/dev-essential/recipe.toml
@@ -1,6 +1,7 @@
 [package]
 dependencies = [
     "autotools",
+    "cmake",
     "gcc13",
     "gcc13.cxx",
     "gnu-binutils",