diff --git a/mingw-w64-cmake/0012-fix-find-glew.patch b/mingw-w64-cmake/0012-fix-find-glew.patch
deleted file mode 100644
index 9812115300..0000000000
--- a/mingw-w64-cmake/0012-fix-find-glew.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6c8789af757e295bd1a42e6eb44260c1f79b8382 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
-Date: Sun, 26 Jun 2022 10:38:11 +0200
-Subject: [PATCH] FindGLEW: select_library_configuration might be used before
- it is defined
-
-Fixes a regression from a31b27078595fce911b2469937ac12934555644a
----
- Modules/FindGLEW.cmake | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Modules/FindGLEW.cmake b/Modules/FindGLEW.cmake
-index a0fda1fba8..bfde40b3db 100644
---- a/Modules/FindGLEW.cmake
-+++ b/Modules/FindGLEW.cmake
-@@ -63,6 +63,7 @@ This module defines the following variables:
- #]=======================================================================]
- 
- include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-+include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
- 
- find_package(GLEW CONFIG QUIET)
- 
-@@ -195,8 +196,6 @@ find_library(GLEW_STATIC_LIBRARY_DEBUG
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${__GLEW_CURRENT_FIND_LIBRARY_SUFFIXES})
- unset(__GLEW_CURRENT_FIND_LIBRARY_SUFFIXES)
- 
--include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
--
- select_library_configurations(GLEW_SHARED)
- select_library_configurations(GLEW_STATIC)
- 
--- 
-2.35.3.windows.1
-
diff --git a/mingw-w64-cmake/PKGBUILD b/mingw-w64-cmake/PKGBUILD
index 7f46180fcf..1c3c48378d 100644
--- a/mingw-w64-cmake/PKGBUILD
+++ b/mingw-w64-cmake/PKGBUILD
@@ -6,7 +6,7 @@ _bootstrap=0
 _realname=cmake
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.24.3
+pkgver=3.25.0
 pkgrel=1
 pkgdesc="A cross-platform open-source make system (mingw-w64)"
 arch=('any')
@@ -21,9 +21,9 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-bzip2"
              "${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-qt6-base"
              $( (( _bootstrap )) || echo "${MINGW_PACKAGE_PREFIX}-cmake")
-             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo \
-               "${MINGW_PACKAGE_PREFIX}-gcc-fortran" \
-               "${MINGW_PACKAGE_PREFIX}-emacs"))
+             $([[ ${MSYSTEM} == CLANGARM64 ]] || echo "${MINGW_PACKAGE_PREFIX}-emacs")
+             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* && ${MSYSTEM} != CLANG64 ]] || echo \
+               "${MINGW_PACKAGE_PREFIX}-fc"))
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-pkgconf"
          "${MINGW_PACKAGE_PREFIX}-curl"
@@ -41,16 +41,12 @@ source=("https://github.com/Kitware/CMake/releases/download/v${pkgver}/${_realna
         "0001-Disable-response-files-for-MSYS-Generator.patch"
         "0002-Do-not-install-Qt-bundle-in-cmake-gui.patch"
         "0004-Output-line-numbers-in-callstacks.patch"
-        "0005-Default-to-ninja-generator.patch"
-        "0009-fix-find-glew.patch"::https://gitlab.kitware.com/cmake/cmake/-/commit/a31b27078595fce911b2469937ac12934555644a.patch
-        "0012-fix-find-glew.patch")
-sha256sums=('b53aa10fa82bff84ccdb59065927b72d3bee49f4d86261249fc0984b3b367291'
+        "0005-Default-to-ninja-generator.patch")
+sha256sums=('306463f541555da0942e6f5a0736560f70c487178b9d94a5ae7f34d0538cdd48'
             '25793edcbac05bb6d17fa9947b52ace4a6b5ccccf7758e22ae9ae022ed089061'
             'f6cf6a6f2729db2b9427679acd09520af2cd79fc26900b19a49cead05a55cd1a'
             '15fdf3fb1a0f1c153c8cfbdd2b5c64035b7a04de618bfe61d7d74ced0d6a5c4b'
-            '426818278090704d2a12f62ef3dfd94c47b11fa2784bb842989b7f6a09ee7aa2'
-            '7b46eb236916a65522d59f9d72f86726485a6f97056740e64f3c9a01eec05cf0'
-            'b6089d2d303ab0faa0134b8c56940008746faeae452a8a8296ec6f9fb2d16b9f')
+            '426818278090704d2a12f62ef3dfd94c47b11fa2784bb842989b7f6a09ee7aa2')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -77,9 +73,7 @@ prepare() {
   apply_patch_with_msg \
     0001-Disable-response-files-for-MSYS-Generator.patch \
     0002-Do-not-install-Qt-bundle-in-cmake-gui.patch \
-    0004-Output-line-numbers-in-callstacks.patch \
-    0009-fix-find-glew.patch \
-    0012-fix-find-glew.patch
+    0004-Output-line-numbers-in-callstacks.patch
 
   # We want cmake to default to something useful and not MSVC
   apply_patch_with_msg \
@@ -154,7 +148,7 @@ package() {
     DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
   fi
 
-  if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]]; then
+  if [[ ${MSYSTEM} != CLANGARM64 ]]; then
     install -d "${pkgdir}${MINGW_PREFIX}"/share/emacs/site-lisp/
     ${MINGW_PREFIX}/bin/emacs -batch -f batch-byte-compile \
       "${pkgdir}${MINGW_PREFIX}"/share/emacs/site-lisp/cmake-mode.el