diff --git a/mingw-w64-meson/0003-windows_proof_rmtree-Also-retry-os.chmod-part.patch b/mingw-w64-meson/0003-windows_proof_rmtree-Also-retry-os.chmod-part.patch
deleted file mode 100644
index e3eec367b1..0000000000
--- a/mingw-w64-meson/0003-windows_proof_rmtree-Also-retry-os.chmod-part.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 64775c0fd335c53604a295426d9d6ab4aae24cf8 Mon Sep 17 00:00:00 2001
-From: Xavier Claessens <xavier.claessens@collabora.com>
-Date: Thu, 25 Mar 2021 11:25:37 -0400
-Subject: [PATCH 2/2] windows_proof_rmtree: Also retry os.chmod() part
-
-It looks like when Windows media scanner holds files we can't change
-their permission neither.
----
- mesonbuild/mesonlib/universal.py | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py
-index b0b987e3f..45c3e5c0c 100644
---- a/mesonbuild/mesonlib/universal.py
-+++ b/mesonbuild/mesonlib/universal.py
-@@ -1530,9 +1530,16 @@ def windows_proof_rmtree(f: str) -> None:
-     # be scanning files you are trying to delete. The only
-     # way to fix this is to try again and again.
-     delays = [0.1, 0.1, 0.2, 0.2, 0.2, 0.5, 0.5, 1, 1, 1, 1, 2]
--    # Start by making the tree wriable.
--    _make_tree_writable(f)
-+    writable = False
-     for d in delays:
-+        try:
-+            # Start by making the tree writable.
-+            if not writable:
-+                _make_tree_writable(f)
-+                writable = True
-+        except PermissionError:
-+            time.sleep(d)
-+            continue
-         try:
-             shutil.rmtree(f)
-             return
--- 
-2.31.1
-
diff --git a/mingw-w64-meson/PKGBUILD b/mingw-w64-meson/PKGBUILD
index 1c338dc03c..c1fa2c963e 100644
--- a/mingw-w64-meson/PKGBUILD
+++ b/mingw-w64-meson/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=meson
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.57.2
-pkgrel=2
+pkgver=0.58.0
+pkgrel=1
 pkgdesc="High-productivity build system (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -18,14 +18,12 @@ source=("https://github.com/mesonbuild/${_realname}/releases/download/${pkgver}/
         'color-term.patch'
         '0002-Default-to-sys.prefix-as-the-default-prefix.patch'
         '0004-fix-gtk-doc.patch'
-        'install-man.patch'
-        '0003-windows_proof_rmtree-Also-retry-os.chmod-part.patch')
-sha256sums=('3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5'
+        'install-man.patch')
+sha256sums=('f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd'
             '5805aed0a117536eb16dd8eef978c6be57c2471b655ede63e25517c28b4f4cf0'
             '675e79a0fc78b4236f5b803ffd2e745cb2ff125c9b4a03657773915183a4e19a'
             '0f9177102976bbcbdf50c1da49842783a0c77be939e839f1bf91dcaba6a5cdee'
-            '0682a36cb75e545a78b81293303835a16171f25baf949905dc08029436efff84'
-            '9cb31b97a22251f98a2ff80fd5cbea6a62a65a03b8ebae1c827496e68cbe7b20')
+            '0682a36cb75e545a78b81293303835a16171f25baf949905dc08029436efff84')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -34,8 +32,6 @@ prepare() {
   patch -Np1 -i "${srcdir}"/0002-Default-to-sys.prefix-as-the-default-prefix.patch
   patch -Np1 -i "${srcdir}"/0004-fix-gtk-doc.patch
   patch -Np1 -i "${srcdir}"/install-man.patch
-  # https://github.com/mesonbuild/meson/pull/8576
-  patch -Np1 -i "${srcdir}"/0003-windows_proof_rmtree-Also-retry-os.chmod-part.patch
 }
 
 build() {