cmake: add patch for 32-bit builds

Author: striezel

mingw-w64-cmake-bootstrap/0100-Restore-compilation-on-32-bit-MinGW.patch

@@ -0,0 +1,51 @@
+From c55dfbf6568d17643ddc34f5facf25e3a90acdc9 Mon Sep 17 00:00:00 2001
+From: Brad King <[email protected]>
+Date: Thu, 11 Dec 2025 10:48:00 -0500
+Subject: [PATCH] StdIo: Restore compilation on 32-bit MinGW
+
+In commit e419429616 (StdIo: Restore Windows Console I/O modes on
+Ctrl-C, 2025-11-26, v4.1.4~4^2) we relied on the compiler to generate a
+lambda with an `operator()` for each calling convention.  MSVC does
+this, but the GNU compiler for MinGW does not seem to.
+---
+ Source/cmStdIoInit.cxx | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/Source/cmStdIoInit.cxx b/Source/cmStdIoInit.cxx
+index a2fc50db7f3..49f31873bdc 100644
+--- a/Source/cmStdIoInit.cxx
++++ b/Source/cmStdIoInit.cxx
+@@ -93,19 +93,23 @@ public:
+ 
+   Globals();
+ 
++#ifdef _WIN32
++  static BOOL WINAPI CtrlHandler(DWORD /*dwCtrlType*/)
++  {
++    Get().StdErr.Destroy();
++    Get().StdOut.Destroy();
++    Get().StdIn.Destroy();
++    return FALSE;
++  }
++#endif
++
+   static Globals& Get();
+ };
+ 
+ #ifdef _WIN32
+ Globals::Globals()
+ {
+-  static auto const ctrlHandler = [](DWORD /*dwCtrlType*/) -> BOOL {
+-    Get().StdErr.Destroy();
+-    Get().StdOut.Destroy();
+-    Get().StdIn.Destroy();
+-    return FALSE;
+-  };
+-  SetConsoleCtrlHandler(ctrlHandler, TRUE);
++  SetConsoleCtrlHandler(CtrlHandler, TRUE);
+ }
+ #else
+ Globals::Globals() = default;
+-- 
+GitLab
+

mingw-w64-cmake-bootstrap/PKGBUILD

@@ -27,16 +27,19 @@ conflicts=(
 provides=("${MINGW_PACKAGE_PREFIX}-cmake=${pkgver}")
 source=("https://github.com/Kitware/CMake/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         "0003-fix-find-python-on-mingw-aarch64.patch"
-        "0005-Default-to-ninja-generator.patch")
+        "0005-Default-to-ninja-generator.patch"
+        "0100-Restore-compilation-on-32-bit-MinGW.patch")
 sha256sums=('414aacfac54ba0e78e64a018720b64ed6bfca14b587047b8b3489f407a14a070'
             '557b5cbc05d4d50b3a67a7892391fcaa5cd95c492cdb4338d86305d1f4a3b88a'
-            '426818278090704d2a12f62ef3dfd94c47b11fa2784bb842989b7f6a09ee7aa2')
+            '426818278090704d2a12f62ef3dfd94c47b11fa2784bb842989b7f6a09ee7aa2'
+            '2306d79614a10d51826c33e0dc5bc533ad06ee221a0d72ca9efb0a105574804d')
 
 prepare() {
   cd "${_realname}-${pkgver}"
 
   patch -Np1 -i "${srcdir}/0003-fix-find-python-on-mingw-aarch64.patch"
   patch -Np1 -i "${srcdir}/0005-Default-to-ninja-generator.patch"
+  patch -Np1 -i "${srcdir}/0100-Restore-compilation-on-32-bit-MinGW.patch"
 
   find . -name "*.orig" -exec rm -f {} \;
 }

mingw-w64-cmake/0100-Restore-compilation-on-32-bit-MinGW.patch

@@ -0,0 +1,51 @@
+From c55dfbf6568d17643ddc34f5facf25e3a90acdc9 Mon Sep 17 00:00:00 2001
+From: Brad King <[email protected]>
+Date: Thu, 11 Dec 2025 10:48:00 -0500
+Subject: [PATCH] StdIo: Restore compilation on 32-bit MinGW
+
+In commit e419429616 (StdIo: Restore Windows Console I/O modes on
+Ctrl-C, 2025-11-26, v4.1.4~4^2) we relied on the compiler to generate a
+lambda with an `operator()` for each calling convention.  MSVC does
+this, but the GNU compiler for MinGW does not seem to.
+---
+ Source/cmStdIoInit.cxx | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/Source/cmStdIoInit.cxx b/Source/cmStdIoInit.cxx
+index a2fc50db7f3..49f31873bdc 100644
+--- a/Source/cmStdIoInit.cxx
++++ b/Source/cmStdIoInit.cxx
+@@ -93,19 +93,23 @@ public:
+ 
+   Globals();
+ 
++#ifdef _WIN32
++  static BOOL WINAPI CtrlHandler(DWORD /*dwCtrlType*/)
++  {
++    Get().StdErr.Destroy();
++    Get().StdOut.Destroy();
++    Get().StdIn.Destroy();
++    return FALSE;
++  }
++#endif
++
+   static Globals& Get();
+ };
+ 
+ #ifdef _WIN32
+ Globals::Globals()
+ {
+-  static auto const ctrlHandler = [](DWORD /*dwCtrlType*/) -> BOOL {
+-    Get().StdErr.Destroy();
+-    Get().StdOut.Destroy();
+-    Get().StdIn.Destroy();
+-    return FALSE;
+-  };
+-  SetConsoleCtrlHandler(ctrlHandler, TRUE);
++  SetConsoleCtrlHandler(CtrlHandler, TRUE);
+ }
+ #else
+ Globals::Globals() = default;
+-- 
+GitLab
+

mingw-w64-cmake/PKGBUILD

@@ -51,12 +51,14 @@ source=("https://github.com/Kitware/CMake/releases/download/v${_pkgver}/${_realn
         "0001-Disable-response-files-for-MSYS-Generator.patch"
         "0002-Do-not-install-Qt-bundle-in-cmake-gui.patch"
         "0003-fix-find-python-on-mingw-aarch64.patch"
-        "0005-Default-to-ninja-generator.patch")
+        "0005-Default-to-ninja-generator.patch"
+        "0100-Restore-compilation-on-32-bit-MinGW.patch")
 sha256sums=('414aacfac54ba0e78e64a018720b64ed6bfca14b587047b8b3489f407a14a070'
             '25793edcbac05bb6d17fa9947b52ace4a6b5ccccf7758e22ae9ae022ed089061'
             'f6cf6a6f2729db2b9427679acd09520af2cd79fc26900b19a49cead05a55cd1a'
             '557b5cbc05d4d50b3a67a7892391fcaa5cd95c492cdb4338d86305d1f4a3b88a'
-            '426818278090704d2a12f62ef3dfd94c47b11fa2784bb842989b7f6a09ee7aa2')
+            '426818278090704d2a12f62ef3dfd94c47b11fa2784bb842989b7f6a09ee7aa2'
+            '2306d79614a10d51826c33e0dc5bc533ad06ee221a0d72ca9efb0a105574804d')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -88,6 +90,12 @@ prepare() {
   apply_patch_with_msg \
     0005-Default-to-ninja-generator.patch
 
+  # Taken from <https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11503>.
+  # See <https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11457#note_1743658>
+  # for more context.
+  apply_patch_with_msg \
+    0100-Restore-compilation-on-32-bit-MinGW.patch
+
   find . -name "*.orig" -exec rm -f {} \;
 }