From 055bc447174680d2aa93d93f742fd6bcd4020d7b Mon Sep 17 00:00:00 2001 From: tigro Date: Wed, 25 Dec 2024 23:06:09 +0300 Subject: [PATCH] import mingw-headers-12.0.0-3.el10 --- .gitignore | 2 +- .mingw-headers.metadata | 2 +- SOURCES/mingw-headers-no-widl.patch | 18 +++++++++--------- SPECS/mingw-headers.spec | 18 ++++++++++++++++-- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 7cbb8cb..09f8c28 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mingw-w64-v11.0.1.tar.bz2 +SOURCES/mingw-w64-v12.0.0.tar.bz2 diff --git a/.mingw-headers.metadata b/.mingw-headers.metadata index 1a5eac6..cdecebe 100644 --- a/.mingw-headers.metadata +++ b/.mingw-headers.metadata @@ -1 +1 @@ -ab23c9af10fb38388ac75145dd9ffed3c64d1eeb SOURCES/mingw-w64-v11.0.1.tar.bz2 +8a725388147e7aa2b367c35e52e91a92713e1faf SOURCES/mingw-w64-v12.0.0.tar.bz2 diff --git a/SOURCES/mingw-headers-no-widl.patch b/SOURCES/mingw-headers-no-widl.patch index 7f5d836..cc1c4a3 100644 --- a/SOURCES/mingw-headers-no-widl.patch +++ b/SOURCES/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/SPECS/mingw-headers.spec b/SPECS/mingw-headers.spec index 7b3b9ad..4eff214 100644 --- a/SPECS/mingw-headers.spec +++ b/SPECS/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,18 @@ rm -f %{buildroot}%{ucrt64_includedir}/pthread_unistd.h %changelog +* Wed Dec 25 2024 Arkady L. Shane - 12.0.0-3 +- Rebuilt for MSVSphere 10 + +* Tue Sep 24 2024 Sandro Mani - 12.0.0-3 +- Pass --with-default-msvcrt=msvcrt when building mingw32/64-headers + +* Thu Jul 18 2024 Fedora Release Engineering - 12.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jul 16 2024 Sandro Mani - 12.0.0-1 +- Update to 12.0.0 + * Thu Jan 25 2024 Fedora Release Engineering - 11.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild