From b3f9ac8978b29921455812943f8e19aeb501e490 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 16 Jun 2024 12:01:00 +0200
Subject: [PATCH] mingw-w64: Update to 12.0.0.r81.g90abf784a

* 0001-Allow-to-use-bessel-and-complex-functions-without-un.patch:
  fixed upstream in https://github.com/mingw-w64/mingw-w64/commit/74875157b0387c71eac09327d021f599a9be193a
* Remove touch calls, they were added in c4564334eb13c624b32388eda599fc696a8bf5ec and not sure why
* Add a link to the upstream issue for the remaining headers-git patch
---
 ...sel-and-complex-functions-without-un.patch | 26 -------------------
 mingw-w64-crt-git/PKGBUILD                    | 16 +++---------
 ...sel-and-complex-functions-without-un.patch | 26 -------------------
 mingw-w64-headers-git/PKGBUILD                | 13 +++-------
 mingw-w64-libmangle-git/PKGBUILD              |  6 ++---
 mingw-w64-tools-git/PKGBUILD                  |  6 ++---
 mingw-w64-winpthreads-git/PKGBUILD            |  6 ++---
 mingw-w64-winstorecompat-git/PKGBUILD         |  6 ++---
 8 files changed, 20 insertions(+), 85 deletions(-)
 delete mode 100644 mingw-w64-crt-git/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch
 delete mode 100644 mingw-w64-headers-git/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch

diff --git a/mingw-w64-crt-git/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch b/mingw-w64-crt-git/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch
deleted file mode 100644
index ad533db76884d..0000000000000
--- a/mingw-w64-crt-git/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 58ff03526ba9a0e5ebe2e318b54fdbe993d5abbd Mon Sep 17 00:00:00 2001
-From: Alexey Pavlov <alexpux@gmail.com>
-Date: Thu, 14 Sep 2017 11:13:45 +0300
-Subject: [PATCH 1/3] Allow to use bessel and complex functions without
- undefining
-
----
- mingw-w64-headers/crt/math.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h
-index 658abc80..7d5a26da 100644
---- a/mingw-w64-headers/crt/math.h
-+++ b/mingw-w64-headers/crt/math.h
-@@ -263,7 +263,7 @@ extern "C" {
- #define EDOM 33
- #define ERANGE 34
- 
--#ifndef __STRICT_ANSI__
-+#if !defined(__STRICT_ANSI__) || defined(_POSIX_C_SOURCE) || defined(_POSIX_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
- 
- #ifndef _COMPLEX_DEFINED
- #define _COMPLEX_DEFINED
--- 
-2.14.1
-
diff --git a/mingw-w64-crt-git/PKGBUILD b/mingw-w64-crt-git/PKGBUILD
index c90a9c739d1ad..32b10a3ca6835 100644
--- a/mingw-w64-crt-git/PKGBUILD
+++ b/mingw-w64-crt-git/PKGBUILD
@@ -3,9 +3,9 @@
 _realname=crt
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=12.0.0.r32.gf977e1c38
+pkgver=12.0.0.r81.g90abf784a
 pkgrel=1
-_commit='f977e1c38299fd204b733650cba3726a244face6'
+_commit='90abf784ac344fe558e7e22cb5411d807862888d'
 pkgdesc='MinGW-w64 CRT for Windows (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -21,22 +21,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 options=('!strip' '!buildflags' '!emptydirs')
-source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit"
-        0001-Allow-to-use-bessel-and-complex-functions-without-un.patch)
-sha256sums=('f471fcbf7750dc5cd4f324e6662dc780fd51fff878d00363120ad646663c729b'
-            'd641257f7e1469aff89adc33e57702b75fe9667ca035978f890eae1020b6814c')
+source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
+sha256sums=('6823f6166c6858a603d1ceda016f3fc0cf5318e48705fa1064277a0269640899')
 
 pkgver() {
   cd "${srcdir}/mingw-w64"
   git describe --long ${_commit} | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
 }
 
-prepare() {
-  cd ${srcdir}/mingw-w64
-
-  git apply "${srcdir}/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch"
-}
-
 build() {
   declare -a _extra_config
   case "$CARCH" in
diff --git a/mingw-w64-headers-git/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch b/mingw-w64-headers-git/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch
deleted file mode 100644
index ad533db76884d..0000000000000
--- a/mingw-w64-headers-git/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 58ff03526ba9a0e5ebe2e318b54fdbe993d5abbd Mon Sep 17 00:00:00 2001
-From: Alexey Pavlov <alexpux@gmail.com>
-Date: Thu, 14 Sep 2017 11:13:45 +0300
-Subject: [PATCH 1/3] Allow to use bessel and complex functions without
- undefining
-
----
- mingw-w64-headers/crt/math.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h
-index 658abc80..7d5a26da 100644
---- a/mingw-w64-headers/crt/math.h
-+++ b/mingw-w64-headers/crt/math.h
-@@ -263,7 +263,7 @@ extern "C" {
- #define EDOM 33
- #define ERANGE 34
- 
--#ifndef __STRICT_ANSI__
-+#if !defined(__STRICT_ANSI__) || defined(_POSIX_C_SOURCE) || defined(_POSIX_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
- 
- #ifndef _COMPLEX_DEFINED
- #define _COMPLEX_DEFINED
--- 
-2.14.1
-
diff --git a/mingw-w64-headers-git/PKGBUILD b/mingw-w64-headers-git/PKGBUILD
index 38c2a14f55679..b4d4b967cdf53 100644
--- a/mingw-w64-headers-git/PKGBUILD
+++ b/mingw-w64-headers-git/PKGBUILD
@@ -4,9 +4,9 @@ _realname=headers
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 pkgdesc="MinGW-w64 headers for Windows (mingw-w64)"
-pkgver=12.0.0.r32.gf977e1c38
+pkgver=12.0.0.r81.g90abf784a
 pkgrel=1
-_commit='f977e1c38299fd204b733650cba3726a244face6'
+_commit='90abf784ac344fe558e7e22cb5411d807862888d'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.mingw-w64.org/"
@@ -20,10 +20,8 @@ provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 options=('!strip' '!emptydirs')
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit"
-        0001-Allow-to-use-bessel-and-complex-functions-without-un.patch
         0002-heades-add-full-name-winrt.patch)
-sha256sums=('f471fcbf7750dc5cd4f324e6662dc780fd51fff878d00363120ad646663c729b'
-            'd641257f7e1469aff89adc33e57702b75fe9667ca035978f890eae1020b6814c'
+sha256sums=('6823f6166c6858a603d1ceda016f3fc0cf5318e48705fa1064277a0269640899'
             '69be8e262986ee9e666f0da4ca390c3d791d70883ef8690c5311aea2a40bb23f')
 
 pkgver() {
@@ -34,11 +32,8 @@ pkgver() {
 prepare() {
   cd ${srcdir}/mingw-w64
 
-  git apply "${srcdir}/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch"
+  # https://bugs.winehq.org/show_bug.cgi?id=55347
   git apply "${srcdir}/0002-heades-add-full-name-winrt.patch"
-
-  cd ${srcdir}/mingw-w64/mingw-w64-headers
-  touch include/windows.*.h include/wincrypt.h include/prsht.h
 }
 
 build() {
diff --git a/mingw-w64-libmangle-git/PKGBUILD b/mingw-w64-libmangle-git/PKGBUILD
index 7738c374f025c..5f80d89e68df3 100644
--- a/mingw-w64-libmangle-git/PKGBUILD
+++ b/mingw-w64-libmangle-git/PKGBUILD
@@ -5,9 +5,9 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=12.0.0.r32.gf977e1c38
+pkgver=12.0.0.r81.g90abf784a
 pkgrel=1
-_commit='f977e1c38299fd204b733650cba3726a244face6'
+_commit='90abf784ac344fe558e7e22cb5411d807862888d'
 pkgdesc="MinGW-w64 libmangle (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -23,7 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "git")
 options=('!emptydirs')
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
-sha256sums=('f471fcbf7750dc5cd4f324e6662dc780fd51fff878d00363120ad646663c729b')
+sha256sums=('6823f6166c6858a603d1ceda016f3fc0cf5318e48705fa1064277a0269640899')
 
 pkgver() {
   cd "${srcdir}/mingw-w64"
diff --git a/mingw-w64-tools-git/PKGBUILD b/mingw-w64-tools-git/PKGBUILD
index 6ffcc65514955..ceeae917481a0 100644
--- a/mingw-w64-tools-git/PKGBUILD
+++ b/mingw-w64-tools-git/PKGBUILD
@@ -6,9 +6,9 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=12.0.0.r32.gf977e1c38
+pkgver=12.0.0.r81.g90abf784a
 pkgrel=1
-_commit='f977e1c38299fd204b733650cba3726a244face6'
+_commit='90abf784ac344fe558e7e22cb5411d807862888d'
 pkgdesc="MinGW-w64 tools (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -23,7 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 options=('!emptydirs')
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
-sha256sums=('f471fcbf7750dc5cd4f324e6662dc780fd51fff878d00363120ad646663c729b')
+sha256sums=('6823f6166c6858a603d1ceda016f3fc0cf5318e48705fa1064277a0269640899')
 _tools="gendef genidl genpeimg widl" # genstubdll
 
 pkgver() {
diff --git a/mingw-w64-winpthreads-git/PKGBUILD b/mingw-w64-winpthreads-git/PKGBUILD
index e9e7d38123f80..944bdfcf002cc 100644
--- a/mingw-w64-winpthreads-git/PKGBUILD
+++ b/mingw-w64-winpthreads-git/PKGBUILD
@@ -5,9 +5,9 @@
 _realname=winpthreads
 pkgbase=mingw-w64-${_realname}-git
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
-pkgver=12.0.0.r32.gf977e1c38
+pkgver=12.0.0.r81.g90abf784a
 pkgrel=1
-_commit='f977e1c38299fd204b733650cba3726a244face6'
+_commit='90abf784ac344fe558e7e22cb5411d807862888d'
 pkgdesc="MinGW-w64 winpthreads library (mingw-w64)"
 url="https://www.mingw-w64.org/"
 msys2_repository_url="https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-libraries/winpthreads"
@@ -27,7 +27,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
 options=('!emptydirs')
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit"
         "0001-Define-__-de-register_frame_info-in-fake-libgcc_s.patch")
-sha256sums=('f471fcbf7750dc5cd4f324e6662dc780fd51fff878d00363120ad646663c729b'
+sha256sums=('6823f6166c6858a603d1ceda016f3fc0cf5318e48705fa1064277a0269640899'
             '2e779bcc60a1422b23e0cfdb5c0f6851f2382592bb4675d08a6bdef78d5e5c10')
 
 pkgver() {
diff --git a/mingw-w64-winstorecompat-git/PKGBUILD b/mingw-w64-winstorecompat-git/PKGBUILD
index 92d1bae66d121..5dd65cca540e2 100644
--- a/mingw-w64-winstorecompat-git/PKGBUILD
+++ b/mingw-w64-winstorecompat-git/PKGBUILD
@@ -3,9 +3,9 @@
 _realname=winstorecompat
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=12.0.0.r32.gf977e1c38
+pkgver=12.0.0.r81.g90abf784a
 pkgrel=1
-_commit='f977e1c38299fd204b733650cba3726a244face6'
+_commit='90abf784ac344fe558e7e22cb5411d807862888d'
 pkgdesc="MinGW-w64 winRT compat library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -21,7 +21,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "git")
 options=('!buildflags' '!emptydirs')
 source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit")
-sha256sums=('f471fcbf7750dc5cd4f324e6662dc780fd51fff878d00363120ad646663c729b')
+sha256sums=('6823f6166c6858a603d1ceda016f3fc0cf5318e48705fa1064277a0269640899')
 
 pkgver() {
   cd "${srcdir}/mingw-w64"