diff --git a/dev-build/cmake/cmake-3.31.5.recipe b/dev-build/cmake/cmake-3.31.5.recipe
index 329b580b1..e5aec3e47 100644
--- a/dev-build/cmake/cmake-3.31.5.recipe
+++ b/dev-build/cmake/cmake-3.31.5.recipe
@@ -12,8 +12,8 @@ SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz
 CHECKSUM_SHA256="66fb53a145648be56b46fa9e8ccade3a4d0dfc92e401e52ce76bdad1fea43d27"
 PATCHES="cmake-$portVersion.patchset"
 
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="?all !x86_gcc2"
+SECONDARY_ARCHITECTURES="?x86"
 
 portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
 
diff --git a/dev-build/cmake/cmake4-4.1.0~rc1.recipe b/dev-build/cmake/cmake-4.0.3.recipe
similarity index 59%
rename from dev-build/cmake/cmake4-4.1.0~rc1.recipe
rename to dev-build/cmake/cmake-4.0.3.recipe
index 5622a0f0c..04cb8ef5e 100644
--- a/dev-build/cmake/cmake4-4.1.0~rc1.recipe
+++ b/dev-build/cmake/cmake-4.0.3.recipe
@@ -8,18 +8,17 @@ HOMEPAGE="https://cmake.org/"
 COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium"
 LICENSE="CMake"
 REVISION="1"
-SOURCE_URI="https://github.com/Kitware/CMake/releases/download/v4.1.0-rc1/cmake-4.1.0-rc1.tar.gz"
-CHECKSUM_SHA256="dfe019949335b80d258d4b4f24d6cbf9d730b396ecdefc033d955641ff056ab1"
-SOURCE_DIR="cmake-4.1.0-rc1"
+SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
+CHECKSUM_SHA256="8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb"
 PATCHES="cmake-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
 
 PROVIDES="
-	cmake4$secondaryArchSuffix = $portVersionCompat
+	cmake$secondaryArchSuffix = $portVersionCompat
 	cmd:ccmake = $portVersionCompat
 	cmd:cmake = $portVersionCompat
 	cmd:cpack = $portVersionCompat
@@ -27,8 +26,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libarchive$secondaryArchSuffix
-#	lib:libcppdap$secondaryArchSuffix # use the embedded copy to avoid circular deps.
+#	lib:libarchive$secondaryArchSuffix
+#	lib:libcppdap$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	lib:libjsoncpp$secondaryArchSuffix
@@ -44,13 +43,10 @@ REQUIRES="
 #	lib:libnghttp2$secondaryArchSuffix
 #	lib:libzstd$secondaryArchSuffix
 	"
-CONFLICTS="
-	cmake$secondaryArchSuffix
-	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libarchive$secondaryArchSuffix
+#	devel:libarchive$secondaryArchSuffix # use the embedded copy to avoid circular deps.
 #	devel:libcppdap$secondaryArchSuffix # use the embedded copy to avoid circular deps.
 	devel:libcurl$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
@@ -59,7 +55,7 @@ BUILD_REQUIRES="
 	devel:librhash$secondaryArchSuffix
 	devel:libuv$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:nlohmann_json
+#	devel:nlohmann_json
 	# The following do not appear to be used, nor with --system-libs, nor by enabling them
 	# individually. Leaving them here just because they are mentioned in ./configure --help
 	# and during the build process' output.
@@ -79,7 +75,7 @@ BUILD_PREREQUIRES="
 	cmd:which
 	"
 
-defineDebugInfoPackage cmake4$secondaryArchSuffix \
+defineDebugInfoPackage cmake$secondaryArchSuffix \
 	$prefix/bin/ccmake \
 	$prefix/bin/cmake \
 	$prefix/bin/cpack \
@@ -100,7 +96,6 @@ BUILD()
 		--system-curl \
 		--system-expat \
 		--system-jsoncpp \
-		--system-libarchive \
 		--system-librhash \
 		--system-libuv \
 		--system-zlib \
@@ -123,44 +118,38 @@ INSTALL()
 # x86_32 (for a build with cmake-gui). Took around 140 minutes.
 # 72% tests passed, 189 tests failed out of 676
 #
-# version 4.1.0-rc1: x86_64.
-# 95% tests passed, 31 tests failed out of 628
+# version 4.0.3: x86_64.
+# 96% tests passed, 25 tests failed out of 644
 # The following tests FAILED:
-#          5 - kwsys.testSystemTools (Failed)
-#         24 - FindPackageCMakeTest (Failed)
-#         25 - FindPackageCpsTest (Failed)
-#         57 - ExportImport (Failed)                             CUDA
-#         66 - StagingPrefix (Failed)
-#         80 - Module.ExternalData (Failed)
-#        137 - ExternalProjectLocal (Failed)
-#        140 - InstallMode-COPY (Failed)
-#        141 - InstallMode-REL_SYMLINK (Failed)
-#        142 - InstallMode-REL_SYMLINK_OR_COPY (Failed)
-#        143 - InstallMode-ABS_SYMLINK (Failed)
-#        144 - InstallMode-ABS_SYMLINK_OR_COPY (Failed)
-#        145 - InstallMode-SYMLINK (Failed)
-#        146 - InstallMode-SYMLINK_OR_COPY (Failed)
-#        179 - CTestCoverageCollectGCOV (Failed)
-#        221 - CTestTestTimeout (Failed)
-#        259 - CMakeLib.testUVProcessChain (Failed)
-#        409 - RunCMake.ParseImplicitLinkInfo (Failed)
-#        420 - RunCMake.find_dependency (Failed)
-#        469 - RunCMake.file (Failed)
-#        471 - RunCMake.file-DOWNLOAD (Failed)
-#        476 - RunCMake.find_library (Failed)
-#        477 - RunCMake.find_package (Failed)
-#        516 - RunCMake.no_install_prefix (Failed)
-#        518 - RunCMake.CTestTimeout (Failed)
-#        524 - RunCMake.FindPkgConfig (Failed)
-#        527 - RunCMake.File_Archive (Failed)
-#        546 - RunCMake.target_sources (Failed)
-#        552 - RunCMake.CommandLine (Failed)
-#        553 - RunCMake.CommandLineTar (Failed)
-#        554 - RunCMake.install (Failed)                         ISPC
+#          6 - kwsys.testSystemTools (Failed)
+#         26 - FindPackageCMakeTest (Failed)
+#         27 - FindPackageCpsTest (Failed)
+#         59 - ExportImport (Failed)                             CUDA
+#         68 - StagingPrefix (Failed)
+#         82 - Module.ExternalData (Failed)
+#        142 - InstallMode-COPY (Failed)
+#        143 - InstallMode-REL_SYMLINK (Failed)
+#        144 - InstallMode-REL_SYMLINK_OR_COPY (Failed)
+#        145 - InstallMode-ABS_SYMLINK (Failed)
+#        146 - InstallMode-ABS_SYMLINK_OR_COPY (Failed)
+#        147 - InstallMode-SYMLINK (Failed)
+#        148 - InstallMode-SYMLINK_OR_COPY (Failed)
+#        246 - CTestTestTimeout (Failed)
+#        430 - RunCMake.ParseImplicitLinkInfo (Failed)
+#        439 - RunCMake.find_dependency (Failed)
+#        486 - RunCMake.file (Failed)
+#        493 - RunCMake.find_library (Failed)
+#        494 - RunCMake.find_package (Failed)
+#        533 - RunCMake.no_install_prefix (Failed)
+#        535 - RunCMake.CTestTimeout (Failed)
+#        541 - RunCMake.FindPkgConfig (Failed)
+#        563 - RunCMake.target_sources (Failed)
+#        569 - RunCMake.CommandLine (Failed)
+#        571 - RunCMake.install (Failed)                         ISPC
 TEST()
 {
-	# 2 tests crash (1 test case has 5 crashes, but passes the test?), exclude with -E
+#	2 tests crash (1 test case has 5 crashes, but passes the test?), exclude with -E
 	./bin/ctest --output-on-failure -E "(CMakeLib.testUVProcessChain|RunCMake.execute_process)"
-	# run individual failing test(s) with -R
-#	./bin/ctest -R "(kwsys.testSystemTools|FindPackageCMakeTest)" --output-on-failure
+#	run individual crashing test(s) with -R
+#	./bin/ctest -R "(CMakeLib.testUVProcessChain|RunCMake.execute_process)" --output-on-failure
 }
diff --git a/dev-build/cmake/cmake_gui-3.31.5.recipe b/dev-build/cmake/cmake_gui-3.31.5.recipe
index 95e0f909f..de9845d74 100644
--- a/dev-build/cmake/cmake_gui-3.31.5.recipe
+++ b/dev-build/cmake/cmake_gui-3.31.5.recipe
@@ -17,8 +17,8 @@ SOURCE_DIR="cmake-$portVersion"
 PATCHES="cmake-$portVersion.patchset"
 ADDITIONAL_FILES="cmake.rdef.in"
 
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="?all !x86_gcc2"
+SECONDARY_ARCHITECTURES="?x86"
 
 portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
 
diff --git a/dev-build/cmake/cmake4_gui-4.1.0~rc1.recipe b/dev-build/cmake/cmake_gui-4.0.3.recipe
similarity index 88%
rename from dev-build/cmake/cmake4_gui-4.1.0~rc1.recipe
rename to dev-build/cmake/cmake_gui-4.0.3.recipe
index a5eb4afdd..c58c17473 100644
--- a/dev-build/cmake/cmake4_gui-4.1.0~rc1.recipe
+++ b/dev-build/cmake/cmake_gui-4.0.3.recipe
@@ -11,24 +11,24 @@ HOMEPAGE="https://cmake.org/"
 COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium"
 LICENSE="CMake"
 REVISION="1"
-SOURCE_URI="https://github.com/Kitware/CMake/releases/download/v4.1.0-rc1/cmake-4.1.0-rc1.tar.gz"
-CHECKSUM_SHA256="dfe019949335b80d258d4b4f24d6cbf9d730b396ecdefc033d955641ff056ab1"
-SOURCE_DIR="cmake-4.1.0-rc1"
+SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
+CHECKSUM_SHA256="8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb"
+SOURCE_DIR="cmake-$portVersion"
 PATCHES="cmake-$portVersion.patchset"
 ADDITIONAL_FILES="cmake.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
 
 PROVIDES="
-	cmake4_gui$secondaryArchSuffix = $portVersion
+	cmake_gui$secondaryArchSuffix = $portVersion
 	cmd:cmake_gui = $portVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	cmake4$secondaryArchSuffix
+	cmake$secondaryArchSuffix
 	lib:libarchive$secondaryArchSuffix
 	lib:libcppdap$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
@@ -66,7 +66,7 @@ BUILD_REQUIRES="
 	devel:nlohmann_json
 	"
 BUILD_PREREQUIRES="
-	cmake4$secondaryArchSuffix == $portVersion
+	cmake$secondaryArchSuffix == $portVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
@@ -75,7 +75,7 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-defineDebugInfoPackage cmake4_gui$secondaryArchSuffix \
+defineDebugInfoPackage cmake_gui$secondaryArchSuffix \
 	$prefix/bin/cmake-gui
 
 BUILD()
@@ -116,7 +116,7 @@ INSTALL()
 
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
 	local APP_NAME="CMake-GUI"
 	local LONG_INFO="$SUMMARY"
 	local APP_SIGNATURE="application/x-vnd.cmake-gui"
diff --git a/dev-build/cmake/patches/cmake-4.1.0~rc1.patchset b/dev-build/cmake/patches/cmake-4.0.3.patchset
similarity index 87%
rename from dev-build/cmake/patches/cmake-4.1.0~rc1.patchset
rename to dev-build/cmake/patches/cmake-4.0.3.patchset
index 2a643eb81..92e78ecde 100644
--- a/dev-build/cmake/patches/cmake-4.1.0~rc1.patchset
+++ b/dev-build/cmake/patches/cmake-4.0.3.patchset
@@ -1,14 +1,14 @@
-From e02bb888e518ca5961c8a7d2f10d9903469c19fb Mon Sep 17 00:00:00 2001
+From b6a2cbf344d23178edf6c025a05e0eeda31a9779 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 7 Sep 2019 17:29:56 +0200
 Subject: links against libnetwork
 
 
 diff --git a/bootstrap b/bootstrap
-index 2ec6aac..bcdc2e2 100755
+index eb8a0ac..fceed48 100755
 --- a/bootstrap
 +++ b/bootstrap
-@@ -1792,6 +1792,9 @@ else
+@@ -1799,6 +1799,9 @@ else
        uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE=700"
        libs="${libs} -lsocket"
        ;;
@@ -22,7 +22,7 @@ index 2ec6aac..bcdc2e2 100755
 2.48.1
 
 
-From 4d0b6bcc23d37a10be5eb29e72ec6833c2f5c9e8 Mon Sep 17 00:00:00 2001
+From acd121c02fa89bd9e3ed470443606dd15d3f5119 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 7 Sep 2019 23:46:47 +0200
 Subject: bootstrap uses cmlibuv
@@ -57,7 +57,7 @@ index 83e8b61..314f239 100644
 2.48.1
 
 
-From 5db1afb3792bb3a9c13ba535ee62a41bb6c0a3e5 Mon Sep 17 00:00:00 2001
+From 68cf4d619b6c751aaac0019feed5259a5ab9e3f7 Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Fri, 21 Feb 2020 15:38:39 -0500
 Subject: Modules/Haiku: Set CMAKE_SYSTEM_FRAMEWORK_PATH.
@@ -81,7 +81,7 @@ index 3610389..9ba64b0 100644
 2.48.1
 
 
-From 209801edd862e01620a2ed121b616ab010ca8ada Mon Sep 17 00:00:00 2001
+From 92e031ad15039ab18e3a31b74b264c3df573966b Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Thu, 15 Apr 2021 21:09:12 +0200
 Subject: disable dependency tracking for older GNU compilers
@@ -106,7 +106,7 @@ index 141838e..1c90942 100644
 2.48.1
 
 
-From a24ea705e2a097f25488f3cd15ef7bcbcd82589d Mon Sep 17 00:00:00 2001
+From db5153802103c7c43f29f886f77ed86d9ecbc43f Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 20 Oct 2021 14:28:22 +0200
 Subject: Haiku: fix install dirs, let FindPackage search in data/
@@ -131,10 +131,10 @@ index e82bec3..0f8a620 100644
    set(CMAKE_BIN_DIR_DEFAULT "bin") # CYGWIN
    set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION}") # CYGWIN
 diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
-index 6201894..c06e7ad 100644
+index bae7d38..0e1df33 100644
 --- a/Source/cmFindPackageCommand.cxx
 +++ b/Source/cmFindPackageCommand.cxx
-@@ -3294,7 +3294,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix)
+@@ -3142,7 +3142,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix)
      common.emplace_back("libx32"_s);
    }
    common.emplace_back("lib"_s);
@@ -150,7 +150,7 @@ index 6201894..c06e7ad 100644
 2.48.1
 
 
-From 5d46410ddf9bead94fda9a725930e49f9e41192f Mon Sep 17 00:00:00 2001
+From 015fda3da31fb2aab872b93205080cc29e48b05e Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 23 Feb 2022 13:44:06 +0100
 Subject: Disable weak symbols; they do not seem to behave correctly.
@@ -173,17 +173,17 @@ index da20534..97bcdc2 100644
 2.48.1
 
 
-From d586aef6bed89544e4446d6fe24c809b7ce64244 Mon Sep 17 00:00:00 2001
+From 58512ff36cfe1bf0ff72f4a28580e2c3cb9361fe Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Fri, 9 Feb 2024 13:48:22 +0100
 Subject: Haiku: enable debugger
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cab0fcb..919c3cc 100644
+index 907c344..5a5a431 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -140,7 +140,7 @@ option(CMake_BUILD_PCH "Compile CMake with precompiled headers" OFF)
+@@ -137,7 +137,7 @@ option(CMake_BUILD_PCH "Compile CMake with precompiled headers" OFF)
  if(NOT CMake_TEST_EXTERNAL_CMAKE)
    if(NOT DEFINED CMake_ENABLE_DEBUGGER)
      # The debugger uses cppdap, which does not compile everywhere.
@@ -193,10 +193,10 @@ index cab0fcb..919c3cc 100644
          AND NOT (CMAKE_CXX_COMPILER_ID STREQUAL "XLClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.1)
          AND NOT (CMAKE_CXX_COMPILER_ID STREQUAL "LCC" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 1.23)
 diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
-index b1c8290..670fe25 100644
+index 1d078ee..57bc1be 100644
 --- a/Source/CMakeLists.txt
 +++ b/Source/CMakeLists.txt
-@@ -861,6 +861,9 @@ if(CMake_ENABLE_DEBUGGER)
+@@ -852,6 +852,9 @@ if(CMake_ENABLE_DEBUGGER)
      )
    endif()
    target_link_libraries(CMakeLib PUBLIC cppdap::cppdap)
@@ -210,17 +210,17 @@ index b1c8290..670fe25 100644
 2.48.1
 
 
-From 8d9c526763944fd45cb27ef6c4e770fa7bd53324 Mon Sep 17 00:00:00 2001
+From f9578bf744372427fb827c66d9dbe7af7a0903b3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
 Date: Sat, 31 Aug 2024 21:52:20 +0200
 Subject: Fix build for non-x86 arches
 
 
 diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
-index c65587e..35788be 100644
+index aca0324..3a24a7b 100644
 --- a/Source/kwsys/SystemInformation.cxx
 +++ b/Source/kwsys/SystemInformation.cxx
-@@ -4996,6 +4996,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
+@@ -4968,6 +4968,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
    this->TotalVirtualMemory = 0;
    this->AvailableVirtualMemory = 0;
  
@@ -228,7 +228,7 @@ index c65587e..35788be 100644
    // Retrieve cpuid_info union for cpu 0
    cpuid_info cpu_info;
    get_cpuid(&cpu_info, 0, 0);
-@@ -5031,6 +5032,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
+@@ -5003,6 +5004,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
  
    // Chip Extended Model
    this->ChipID.ExtendedModel = cpu_info.eax_1.extended_model;
@@ -240,7 +240,7 @@ index c65587e..35788be 100644
 2.48.1
 
 
-From 941be032b8e4ab52601a324561bd9560679e6326 Mon Sep 17 00:00:00 2001
+From 93dc3c3c84bb25372e76c33bc799369d3843792d Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 25 Sep 2024 09:11:06 +0200
 Subject: FindPython: when component Development is searched, also search
@@ -250,10 +250,10 @@ FindPython only uses the python config when an interpreter is found.
 The python config contains the right include paths on x86 for instance.
 
 diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
-index a944164..65fb255 100644
+index 3cd77e4..6f9481d 100644
 --- a/Modules/FindPython/Support.cmake
 +++ b/Modules/FindPython/Support.cmake
-@@ -1484,6 +1484,9 @@ if ("NumPy" IN_LIST ${_PYTHON_BASE}_FIND_COMPONENTS)
+@@ -1428,6 +1428,9 @@ if ("NumPy" IN_LIST ${_PYTHON_BASE}_FIND_COMPONENTS)
  endif()
  if ("Development" IN_LIST ${_PYTHON_BASE}_FIND_COMPONENTS)
    list (APPEND ${_PYTHON_BASE}_FIND_COMPONENTS "Development.Module" "Development.Embed")
@@ -267,7 +267,7 @@ index a944164..65fb255 100644
 2.48.1
 
 
-From ba75d29dbc172d1356ed79b705521a9d72e0825b Mon Sep 17 00:00:00 2001
+From cc435255fe990dceaf253f7c50695b42b332a8d8 Mon Sep 17 00:00:00 2001
 From: Oscar Lesta <oscar.lesta@gmail.com>
 Date: Mon, 23 Sep 2024 05:40:41 -0300
 Subject: Use 'headers' instead of 'include' as fallback.
@@ -279,10 +279,10 @@ Not strictly needed after korli's previous fix, but... doesn't hurts.
 Kudos to madmax for this early workaround!
 
 diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
-index 65fb255..e25be91 100644
+index 6f9481d..9dd58d0 100644
 --- a/Modules/FindPython/Support.cmake
 +++ b/Modules/FindPython/Support.cmake
-@@ -380,11 +380,11 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES)
+@@ -329,11 +329,11 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES)
            elseif (_PGPS_INCLUDE)
              set (suffixes "${abi}")
              if (suffixes)
@@ -301,7 +301,7 @@ index 65fb255..e25be91 100644
 2.48.1
 
 
-From 967f90fc0c3ea9d778e412f6c51489a3c51b1abd Mon Sep 17 00:00:00 2001
+From 19a3b4165ac03225c1116d284917b7365e5bd519 Mon Sep 17 00:00:00 2001
 From: Oscar Lesta <oscar.lesta@gmail.com>
 Date: Thu, 26 Sep 2024 15:16:36 -0300
 Subject: Avoid installing icons, .desktop, and mime files.
@@ -311,10 +311,10 @@ Those are intended for use on Linux and friends.
 Fix by Begasus. Thanks!
 
 diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
-index 7f9e7f0..2a70689 100644
+index 318849e..8871043 100644
 --- a/Source/QtDialog/CMakeLists.txt
 +++ b/Source/QtDialog/CMakeLists.txt
-@@ -329,7 +329,7 @@ install(TARGETS cmake-gui
+@@ -327,7 +327,7 @@ install(TARGETS cmake-gui
    RUNTIME DESTINATION bin ${COMPONENT}
    BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" ${COMPONENT})