diff --git a/mingw-w64-qgis/003-fix-build-qgis-qt6-on-mingw.patch b/mingw-w64-qgis/003-fix-build-qgis-qt6-on-mingw.patch
deleted file mode 100644
index 689a69803e28e..0000000000000
--- a/mingw-w64-qgis/003-fix-build-qgis-qt6-on-mingw.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/app/CMakeLists.txt
-+++ b/src/app/CMakeLists.txt
-@@ -514,9 +514,9 @@
- else()
-   add_executable(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 ${QGIS_APPMAIN_SRCS})
- 
--  if(MSVC AND BUILD_WITH_QT6)
-+  if(WIN32 AND BUILD_WITH_QT6)
-     qt_disable_unicode_defines(${QGIS_APP_NAME})
--  endif(MSVC AND BUILD_WITH_QT6)
-+  endif(WIN32 AND BUILD_WITH_QT6)
- 
-   # require c++17
-   target_compile_features(${QGIS_APP_NAME} PRIVATE cxx_std_17)
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -1664,6 +1664,11 @@
-     ${CMAKE_BINARY_DIR}/src/gui/qgis_gui_autogen/mocs_compilation.cpp
-     PROPERTIES COMPILE_FLAGS "/bigobj"
-   )
-+elseif(MINGW)
-+  set_source_files_properties(
-+    ${CMAKE_BINARY_DIR}/src/gui/qgis_gui_autogen/mocs_compilation.cpp
-+    PROPERTIES COMPILE_FLAGS "-Wa,-mbig-obj"
-+  )
- endif()
- 
- #############################################################
diff --git a/mingw-w64-qgis/005-fix-build-untwine-on-mingw.patch b/mingw-w64-qgis/005-fix-build-untwine-on-mingw.patch
deleted file mode 100644
index 412d7c6e14152..0000000000000
--- a/mingw-w64-qgis/005-fix-build-untwine-on-mingw.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/external/untwine/untwine/generic/dirlist.hpp
-+++ b/external/untwine/untwine/generic/dirlist.hpp
-@@ -24,7 +24,7 @@ inline std::vector<std::string> directoryList(const std::string& dir)
-         fs::directory_iterator end;
-         while (it != end)
-         {
--            files.push_back(fromNative(it->path()));
-+            files.push_back(fromNative(it->path().string()));
-             it++;
-         }
-     }
---- a/external/untwine/untwine/mingw/mapfile.hpp
-+++ b/external/untwine/untwine/mingw/mapfile.hpp
-@@ -1,6 +1,10 @@
- #pragma once
- 
-+#include <windows.h>
- #include <io.h>
-+#include <fcntl.h>
-+
-+#include <stringconv.hpp>
- 
- namespace untwine
- {
-@@ -30,7 +34,7 @@ struct MapContext
-     HANDLE m_handle;
- };
- 
--MapContext mapFile(const std::string& filename, bool readOnly, size_t pos, size_t size)
-+inline MapContext mapFile(const std::string& filename, bool readOnly, size_t pos, size_t size)
- {
-     MapContext ctx;
- 
-@@ -61,7 +65,7 @@ MapContext mapFile(const std::string& filename, bool readOnly, size_t pos, size_
-     return ctx;
- }
- 
--MapContext unmapFile(MapContext ctx)
-+inline MapContext unmapFile(MapContext ctx)
- {
-     if (UnmapViewOfFile(ctx.m_addr) == 0)
-         ctx.m_error = "Couldn't unmap file.";
diff --git a/mingw-w64-qgis/PKGBUILD b/mingw-w64-qgis/PKGBUILD
index 76fbbc627346b..67535288882d9 100644
--- a/mingw-w64-qgis/PKGBUILD
+++ b/mingw-w64-qgis/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=qgis
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.40.2
-pkgrel=2
+pkgver=3.42.0
+pkgrel=1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats (mingw-w64)'
 arch=('any')
 mingw_arch=('ucrt64' 'clang64' 'clangarm64')
@@ -39,6 +39,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-draco"
          "${MINGW_PACKAGE_PREFIX}-qt6-multimedia"
          "${MINGW_PACKAGE_PREFIX}-qt6-serialport"
          "${MINGW_PACKAGE_PREFIX}-qt6-svg"
+         "${MINGW_PACKAGE_PREFIX}-qt6-tools"
          "${MINGW_PACKAGE_PREFIX}-qtkeychain-qt6"
          "${MINGW_PACKAGE_PREFIX}-qscintilla-qt6"
          "${MINGW_PACKAGE_PREFIX}-qwt-qt6"
@@ -54,7 +55,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-sip"
              "${MINGW_PACKAGE_PREFIX}-pyqt-builder"
              "${MINGW_PACKAGE_PREFIX}-python"
-             "${MINGW_PACKAGE_PREFIX}-qt6-tools"
              "${MINGW_PACKAGE_PREFIX}-netcdf"
              "${MINGW_PACKAGE_PREFIX}-postgresql")
 #optdepends=("${MINGW_PACKAGE_PREFIX}-netcdf: mdal plugin"
@@ -62,15 +62,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
 source=("https://qgis.org/downloads/${_realname}-$pkgver.tar.bz2"
         "001-fix-building-with-mingw-w64-clang.patch"
         "002-fix-settingstree-init-order-clang.patch"
-        "003-fix-build-qgis-qt6-on-mingw.patch"
-        "004-fix-customwidgets-install.patch"
-        "005-fix-build-untwine-on-mingw.patch")
-sha256sums=('3eddc2cb93f339dabb4c90d94ea31d5d1845c21542e8317ec2cbe3e95d124b9a'
+        "004-fix-customwidgets-install.patch")
+sha256sums=('04b743397ee2375a1a0521578131fc514752f84db2f86225a9551d1f87e704e8'
             '82d8839992f08a26ea7caf5e908e5f4111806df211ae5cec91e2b86e49b43e75'
             '47e6471b92b85d97e58b617da326c15622c01786c19eb7d4d5814483becb75e4'
-            '78b67f0b50823e64333cd781c0d05bc748d352ffd29fe497b5b5f34b14896ea4'
-            '216dc67ef707f2e918afb7d190c9ea75c11065dea0d23d11b94cab5d8463bac3'
-            'd7e2a4883ef14140ea82ba519171d07ca62799f3a797230816ab37298bc0174b')
+            '216dc67ef707f2e918afb7d190c9ea75c11065dea0d23d11b94cab5d8463bac3')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -89,12 +85,7 @@ prepare() {
       002-fix-settingstree-init-order-clang.patch
   fi
   apply_patch_with_msg \
-    003-fix-build-qgis-qt6-on-mingw.patch \
     004-fix-customwidgets-install.patch
-
-  mv external/untwine/untwine/mingw/mapfile.{h,hpp}
-  apply_patch_with_msg \
-    005-fix-build-untwine-on-mingw.patch
 }
 
 build() {