From b8ab179c256a7a4a781f6eec7fee0a07abf556b7 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Tue, 6 Feb 2024 12:58:22 +0100 Subject: [PATCH] Rebase to Fedora Rawhide --- .gitignore | 1 + .mingw-w64-tools.metadata | 1 + mingw-w64-tools-riscv64-on-s390x-ppc66le.patch | 18 +++++++++--------- mingw-w64-tools-s390x-ppc66le.patch | 18 +++++++++--------- mingw-w64-tools.spec | 13 +++++++++++-- sources | 2 +- 6 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 .mingw-w64-tools.metadata diff --git a/.gitignore b/.gitignore index b63a415..3e5ef40 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /mingw-w64-v9.0.0.tar.bz2 /mingw-w64-v10.0.0.tar.bz2 /mingw-w64-v11.0.0.tar.bz2 +/mingw-w64-v11.0.1.tar.bz2 diff --git a/.mingw-w64-tools.metadata b/.mingw-w64-tools.metadata new file mode 100644 index 0000000..5384b35 --- /dev/null +++ b/.mingw-w64-tools.metadata @@ -0,0 +1 @@ +ab23c9af10fb38388ac75145dd9ffed3c64d1eeb mingw-w64-v11.0.1.tar.bz2 diff --git a/mingw-w64-tools-riscv64-on-s390x-ppc66le.patch b/mingw-w64-tools-riscv64-on-s390x-ppc66le.patch index 8537e95..a761cee 100644 --- a/mingw-w64-tools-riscv64-on-s390x-ppc66le.patch +++ b/mingw-w64-tools-riscv64-on-s390x-ppc66le.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference mingw-w64-v11.0.0/mingw-w64-tools/widl/include/basetsd.h mingw-w64-v11.0.0-new/mingw-w64-tools/widl/include/basetsd.h ---- mingw-w64-v11.0.0/mingw-w64-tools/widl/include/basetsd.h 2023-04-30 18:49:11.973859774 +0200 -+++ mingw-w64-v11.0.0-new/mingw-w64-tools/widl/include/basetsd.h 2023-04-30 18:49:11.979859770 +0200 +diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-tools/widl/include/basetsd.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/basetsd.h +--- mingw-w64-v11.0.1/mingw-w64-tools/widl/include/basetsd.h 2023-08-17 12:36:09.565149909 +0200 ++++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/basetsd.h 2023-08-17 12:36:09.572149926 +0200 @@ -36,7 +36,7 @@ extern "C" { * 64-bit. */ @@ -19,9 +19,9 @@ diff -rupN --no-dereference mingw-w64-v11.0.0/mingw-w64-tools/widl/include/baset #elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl) # error Unknown CPU architecture! #endif -diff -rupN --no-dereference mingw-w64-v11.0.0/mingw-w64-tools/widl/include/winnt.h mingw-w64-v11.0.0-new/mingw-w64-tools/widl/include/winnt.h ---- mingw-w64-v11.0.0/mingw-w64-tools/widl/include/winnt.h 2023-04-30 18:49:11.974859773 +0200 -+++ mingw-w64-v11.0.0-new/mingw-w64-tools/widl/include/winnt.h 2023-04-30 18:49:11.981859769 +0200 +diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-tools/widl/include/winnt.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/winnt.h +--- mingw-w64-v11.0.1/mingw-w64-tools/widl/include/winnt.h 2023-08-17 12:36:09.567149914 +0200 ++++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/winnt.h 2023-08-17 12:36:09.574149930 +0200 @@ -1809,6 +1809,36 @@ typedef struct _CONTEXT #endif /* __PPC64__ */ @@ -59,9 +59,9 @@ diff -rupN --no-dereference mingw-w64-v11.0.0/mingw-w64-tools/widl/include/winnt #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED) #error You need to define a CONTEXT for your CPU #endif -diff -rupN --no-dereference mingw-w64-v11.0.0/mingw-w64-tools/widl/tools.h mingw-w64-v11.0.0-new/mingw-w64-tools/widl/tools.h ---- mingw-w64-v11.0.0/mingw-w64-tools/widl/tools.h 2023-04-30 18:49:11.975859773 +0200 -+++ mingw-w64-v11.0.0-new/mingw-w64-tools/widl/tools.h 2023-04-30 18:49:11.981859769 +0200 +diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-tools/widl/tools.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/tools.h +--- mingw-w64-v11.0.1/mingw-w64-tools/widl/tools.h 2023-08-17 12:36:09.568149916 +0200 ++++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/tools.h 2023-08-17 12:36:09.574149930 +0200 @@ -88,7 +88,7 @@ struct target diff --git a/mingw-w64-tools-s390x-ppc66le.patch b/mingw-w64-tools-s390x-ppc66le.patch index 715bac7..91910db 100644 --- a/mingw-w64-tools-s390x-ppc66le.patch +++ b/mingw-w64-tools-s390x-ppc66le.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference mingw-w64-v11.0.0/mingw-w64-tools/widl/include/basetsd.h mingw-w64-v11.0.0-new/mingw-w64-tools/widl/include/basetsd.h ---- mingw-w64-v11.0.0/mingw-w64-tools/widl/include/basetsd.h 2023-04-27 17:12:39.000000000 +0200 -+++ mingw-w64-v11.0.0-new/mingw-w64-tools/widl/include/basetsd.h 2023-04-30 18:49:11.600860037 +0200 +diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-tools/widl/include/basetsd.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/basetsd.h +--- mingw-w64-v11.0.1/mingw-w64-tools/widl/include/basetsd.h 2023-04-29 11:15:30.000000000 +0200 ++++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/basetsd.h 2023-08-17 12:36:09.203149051 +0200 @@ -36,7 +36,7 @@ extern "C" { * 64-bit. */ @@ -19,9 +19,9 @@ diff -rupN --no-dereference mingw-w64-v11.0.0/mingw-w64-tools/widl/include/baset #elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl) # error Unknown CPU architecture! #endif -diff -rupN --no-dereference mingw-w64-v11.0.0/mingw-w64-tools/widl/include/winnt.h mingw-w64-v11.0.0-new/mingw-w64-tools/widl/include/winnt.h ---- mingw-w64-v11.0.0/mingw-w64-tools/widl/include/winnt.h 2023-04-27 17:12:39.000000000 +0200 -+++ mingw-w64-v11.0.0-new/mingw-w64-tools/widl/include/winnt.h 2023-04-30 18:49:11.601860036 +0200 +diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-tools/widl/include/winnt.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/winnt.h +--- mingw-w64-v11.0.1/mingw-w64-tools/widl/include/winnt.h 2023-04-29 11:15:30.000000000 +0200 ++++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/winnt.h 2023-08-17 12:36:09.204149054 +0200 @@ -1749,6 +1749,66 @@ typedef struct _KNONVOLATILE_CONTEXT_POI #endif /* __aarch64__ */ @@ -89,9 +89,9 @@ diff -rupN --no-dereference mingw-w64-v11.0.0/mingw-w64-tools/widl/include/winnt #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED) #error You need to define a CONTEXT for your CPU #endif -diff -rupN --no-dereference mingw-w64-v11.0.0/mingw-w64-tools/widl/tools.h mingw-w64-v11.0.0-new/mingw-w64-tools/widl/tools.h ---- mingw-w64-v11.0.0/mingw-w64-tools/widl/tools.h 2023-04-27 17:12:39.000000000 +0200 -+++ mingw-w64-v11.0.0-new/mingw-w64-tools/widl/tools.h 2023-04-30 18:49:11.601860036 +0200 +diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-tools/widl/tools.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/tools.h +--- mingw-w64-v11.0.1/mingw-w64-tools/widl/tools.h 2023-04-29 11:15:30.000000000 +0200 ++++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/tools.h 2023-08-17 12:36:09.204149054 +0200 @@ -88,7 +88,7 @@ struct target diff --git a/mingw-w64-tools.spec b/mingw-w64-tools.spec index db44945..327a2a6 100644 --- a/mingw-w64-tools.spec +++ b/mingw-w64-tools.spec @@ -4,8 +4,8 @@ #%%global branch trunk Name: mingw-w64-tools -Version: 11.0.0 -Release: 2%{?dist} +Version: 11.0.1 +Release: 3%{?dist} Summary: Supplementary tools which are part of the mingw-w64 toolchain # Fix build on s390x and ppc64le Patch0: mingw-w64-tools-s390x-ppc66le.patch @@ -108,6 +108,15 @@ popd %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 11.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 11.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Aug 17 2023 Sandro Mani - 11.0.1-1 +- Update to 11.0.1 + * Mon Aug 7 2023 Konstantin Kostiuk - 11.0.0-2 - Update license to SPDX format - Resolves: RHEL-1045 diff --git a/sources b/sources index e22b889..9af20eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mingw-w64-v11.0.0.tar.bz2) = bc1c9fd9d8593ead9375fcbe40950f06cf7616b94dc676db2793ac9b496fe3a6cc94b5793effda3b752942be0d7d01a1c37a8f221aaf178df0d4eeb0aa6d1f8d +SHA512 (mingw-w64-v11.0.1.tar.bz2) = 568702100bbbb11f7f9c9596dd70df3fb2577492459cf55da38691af1504b91127cb5f3eff268850dcbaa461fdc72e4e2379f7a576fd4a0e537ee1fe42531c01