From 054d70fdfbac292c0e1eb3c3ad6083280c68498c Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 10 Jan 2025 10:33:13 +0100
Subject: [PATCH] Rebase to Fedora Rawhide (For RHEL 9.6)

Update to 12.0.0

last_sync: 0b5ec6cd6c318d63d79cd5745fba5df739a3c6c9
resolves: RHEL-73325
side-tag: c9s-build-side-3708-stack-gate
---
 .gitignore                  |  1 +
 mingw-headers-no-widl.patch | 18 +++++++++---------
 mingw-headers.spec          | 15 +++++++++++++--
 sources                     |  2 +-
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5dbd0bc..53fd95b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,4 @@
 /mingw-w64-v10.0.0.tar.bz2
 /mingw-w64-v11.0.0.tar.bz2
 /mingw-w64-v11.0.1.tar.bz2
+/mingw-w64-v12.0.0.tar.bz2
diff --git a/mingw-headers-no-widl.patch b/mingw-headers-no-widl.patch
index 7f5d836..cc1c4a3 100644
--- a/mingw-headers-no-widl.patch
+++ b/mingw-headers-no-widl.patch
@@ -1,18 +1,18 @@
-diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-headers/configure mingw-w64-v11.0.1-new/mingw-w64-headers/configure
---- mingw-w64-v11.0.1/mingw-w64-headers/configure	2023-04-29 11:15:30.000000000 +0200
-+++ mingw-w64-v11.0.1-new/mingw-w64-headers/configure	2023-08-17 11:45:03.828431349 +0200
-@@ -2751,7 +2751,7 @@ printf "%s\n" "$with_widl" >&6; }
+diff -rupN mingw-w64-v12.0.0/mingw-w64-headers/configure mingw-w64-v12.0.0-new/mingw-w64-headers/configure
+--- mingw-w64-v12.0.0/mingw-w64-headers/configure	2024-05-22 09:07:14.000000000 +0200
++++ mingw-w64-v12.0.0-new/mingw-w64-headers/configure	2024-07-16 11:38:30.243909103 +0200
+@@ -2756,7 +2756,7 @@ printf "%s\n" "$with_widl" >&6; }
  
  if test "x$with_widl" = xno
  then :
 -
 +unset WIDL
- else $as_nop
- 
+ else case e in #(
+   e)
    if test "x$srcdir" = x.
-diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-headers/configure.ac mingw-w64-v11.0.1-new/mingw-w64-headers/configure.ac
---- mingw-w64-v11.0.1/mingw-w64-headers/configure.ac	2023-04-29 11:15:30.000000000 +0200
-+++ mingw-w64-v11.0.1-new/mingw-w64-headers/configure.ac	2023-08-17 11:45:03.828431349 +0200
+diff -rupN mingw-w64-v12.0.0/mingw-w64-headers/configure.ac mingw-w64-v12.0.0-new/mingw-w64-headers/configure.ac
+--- mingw-w64-v12.0.0/mingw-w64-headers/configure.ac	2024-05-22 09:07:14.000000000 +0200
++++ mingw-w64-v12.0.0-new/mingw-w64-headers/configure.ac	2024-07-16 11:35:58.632319451 +0200
 @@ -27,7 +27,7 @@ AC_ARG_WITH([widl],
    [AS_VAR_SET([with_widl],[no])])
  AC_MSG_RESULT([$with_widl])
diff --git a/mingw-headers.spec b/mingw-headers.spec
index 7b3b9ad..d03a588 100644
--- a/mingw-headers.spec
+++ b/mingw-headers.spec
@@ -9,11 +9,11 @@
 %global bundle_dummy_pthread_headers 0
 
 Name:           mingw-headers
-Version:        11.0.1
+Version:        12.0.0
 Release:        3%{?dist}
 Summary:        Win32/Win64 header files
 
-License:        Public Domain and LGPLv2+ and ZPLv2.1
+License:        BSD-3-Clause AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later AND ZPL-2.1 AND MIT-Khronos-old AND LicenseRef-Fedora-Public-Domain
 URL:            http://mingw-w64.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}%{?pre:-%{pre}}.tar.bz2
 
@@ -71,6 +71,8 @@ MinGW Windows cross-compiler Win64 header files.
 
 
 %build
+export MINGW32_CONFIGURE_ARGS="--with-default-msvcrt=msvcrt"
+export MINGW64_CONFIGURE_ARGS="--with-default-msvcrt=msvcrt"
 export UCRT64_CONFIGURE_ARGS="--with-default-msvcrt=ucrt"
 
 pushd mingw-w64-headers
@@ -111,6 +113,15 @@ rm -f %{buildroot}%{ucrt64_includedir}/pthread_unistd.h
 
 
 %changelog
+* Tue Sep 24 2024 Sandro Mani <manisandro@gmail.com> - 12.0.0-3
+- Pass --with-default-msvcrt=msvcrt when building mingw32/64-headers
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jul 16 2024 Sandro Mani <manisandro@gmail.com> - 12.0.0-1
+- Update to 12.0.0
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 9af20eb..2d0feb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mingw-w64-v11.0.1.tar.bz2) = 568702100bbbb11f7f9c9596dd70df3fb2577492459cf55da38691af1504b91127cb5f3eff268850dcbaa461fdc72e4e2379f7a576fd4a0e537ee1fe42531c01
+SHA512 (mingw-w64-v12.0.0.tar.bz2) = 949b2bfab8763ab10ec4e9fdfdaf5361517a4ab787fb98ab419b38d02694061c2e821ebbf6e2e4b39d92bdf17419d116daa8e63afd9e01d11592f39df4da69d7