From 104db01667ba34d20a7f4f01393727ec5b58f10c Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 19 Jan 2021 23:49:02 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/mingw-w64-tools.git#6de568ee46d7f3d739780914d4d9f6b71d5e16d1 --- .gitignore | 1 + mingw-w64-tools-aarch64.patch | 8 +++---- mingw-w64-tools-ppc64le.patch | 12 ----------- mingw-w64-tools-s390.patch | 40 +++++++++++++++++------------------ mingw-w64-tools.spec | 11 +++++----- sources | 2 +- 6 files changed, 31 insertions(+), 43 deletions(-) delete mode 100644 mingw-w64-tools-ppc64le.patch diff --git a/.gitignore b/.gitignore index 170722c..e683cbc 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /mingw-w64-v5.0.4.tar.bz2 /mingw-w64-v6.0.0.tar.bz2 /mingw-w64-v7.0.0.tar.bz2 +/mingw-w64-v8.0.0.tar.bz2 diff --git a/mingw-w64-tools-aarch64.patch b/mingw-w64-tools-aarch64.patch index 3148e81..a30c375 100644 --- a/mingw-w64-tools-aarch64.patch +++ b/mingw-w64-tools-aarch64.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference mingw-w64-v7.0.0/mingw-w64-tools/widl/include/windef.h mingw-w64-v7.0.0-new/mingw-w64-tools/widl/include/windef.h ---- mingw-w64-v7.0.0/mingw-w64-tools/widl/include/windef.h 2019-11-09 06:33:24.000000000 +0100 -+++ mingw-w64-v7.0.0-new/mingw-w64-tools/widl/include/windef.h 2020-06-20 01:18:23.248691595 +0200 -@@ -111,7 +111,7 @@ extern "C" { +diff -rupN --no-dereference mingw-w64-v8.0.0/mingw-w64-tools/widl/include/windef.h mingw-w64-v8.0.0-new/mingw-w64-tools/widl/include/windef.h +--- mingw-w64-v8.0.0/mingw-w64-tools/widl/include/windef.h 2020-09-17 04:20:15.000000000 +0200 ++++ mingw-w64-v8.0.0-new/mingw-w64-tools/widl/include/windef.h 2021-01-16 00:00:46.860772591 +0100 +@@ -107,7 +107,7 @@ extern "C" { #endif #ifndef __ms_va_list diff --git a/mingw-w64-tools-ppc64le.patch b/mingw-w64-tools-ppc64le.patch deleted file mode 100644 index 48a5f53..0000000 --- a/mingw-w64-tools-ppc64le.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN --no-dereference mingw-w64-v7.0.0/mingw-w64-tools/widl/include/winnt.h mingw-w64-v7.0.0-new/mingw-w64-tools/widl/include/winnt.h ---- mingw-w64-v7.0.0/mingw-w64-tools/widl/include/winnt.h 2020-06-20 01:18:23.245691600 +0200 -+++ mingw-w64-v7.0.0-new/mingw-w64-tools/widl/include/winnt.h 2020-06-20 01:18:23.536691074 +0200 -@@ -2225,7 +2225,7 @@ typedef struct - DWORD Dr5; - DWORD Dr6; - DWORD Dr7; --} CONTEXT; -+} CONTEXT, *PCONTEXT; - - typedef struct _STACK_FRAME_HEADER - { diff --git a/mingw-w64-tools-s390.patch b/mingw-w64-tools-s390.patch index 8060f85..9ea78b0 100644 --- a/mingw-w64-tools-s390.patch +++ b/mingw-w64-tools-s390.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference mingw-w64-v7.0.0/mingw-w64-tools/widl/include/basetsd.h mingw-w64-v7.0.0-new/mingw-w64-tools/widl/include/basetsd.h ---- mingw-w64-v7.0.0/mingw-w64-tools/widl/include/basetsd.h 2019-11-09 06:33:24.000000000 +0100 -+++ mingw-w64-v7.0.0-new/mingw-w64-tools/widl/include/basetsd.h 2020-06-20 01:18:22.981692078 +0200 +diff -rupN --no-dereference mingw-w64-v8.0.0/mingw-w64-tools/widl/include/basetsd.h mingw-w64-v8.0.0-new/mingw-w64-tools/widl/include/basetsd.h +--- mingw-w64-v8.0.0/mingw-w64-tools/widl/include/basetsd.h 2020-09-17 04:20:15.000000000 +0200 ++++ mingw-w64-v8.0.0-new/mingw-w64-tools/widl/include/basetsd.h 2021-01-16 00:00:46.594772874 +0100 @@ -36,7 +36,7 @@ extern "C" { * 64-bit. */ @@ -10,21 +10,19 @@ diff -rupN --no-dereference mingw-w64-v7.0.0/mingw-w64-tools/widl/include/basets #define _WIN64 #endif -@@ -309,6 +309,10 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY +@@ -289,6 +289,8 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY + # define WORDS_BIGENDIAN + #elif defined(__MIPSEL__) # undef WORDS_BIGENDIAN - # undef BITFIELDS_BIGENDIAN - # undef ALLOW_UNALIGNED_ACCESS +#elif defined(__s390__) +# define WORDS_BIGENDIAN -+# define BITFIELDS_BIGENDIAN -+# define ALLOW_UNALIGNED_ACCESS #elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl) # error Unknown CPU architecture! #endif -diff -rupN --no-dereference mingw-w64-v7.0.0/mingw-w64-tools/widl/include/winnt.h mingw-w64-v7.0.0-new/mingw-w64-tools/widl/include/winnt.h ---- mingw-w64-v7.0.0/mingw-w64-tools/widl/include/winnt.h 2019-11-09 06:33:24.000000000 +0100 -+++ mingw-w64-v7.0.0-new/mingw-w64-tools/widl/include/winnt.h 2020-06-20 01:18:22.982692077 +0200 -@@ -2248,6 +2248,36 @@ typedef struct _STACK_FRAME_HEADER +diff -rupN --no-dereference mingw-w64-v8.0.0/mingw-w64-tools/widl/include/winnt.h mingw-w64-v8.0.0-new/mingw-w64-tools/widl/include/winnt.h +--- mingw-w64-v8.0.0/mingw-w64-tools/widl/include/winnt.h 2020-09-17 04:20:15.000000000 +0200 ++++ mingw-w64-v8.0.0-new/mingw-w64-tools/widl/include/winnt.h 2021-01-16 00:00:46.595772873 +0100 +@@ -2335,6 +2335,36 @@ typedef struct _STACK_FRAME_HEADER #endif /* __powerpc__ */ @@ -61,10 +59,10 @@ diff -rupN --no-dereference mingw-w64-v7.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-v7.0.0/mingw-w64-tools/widl/src/widl.c mingw-w64-v7.0.0-new/mingw-w64-tools/widl/src/widl.c ---- mingw-w64-v7.0.0/mingw-w64-tools/widl/src/widl.c 2019-11-09 06:33:24.000000000 +0100 -+++ mingw-w64-v7.0.0-new/mingw-w64-tools/widl/src/widl.c 2020-06-20 01:18:22.982692077 +0200 -@@ -102,6 +102,8 @@ enum target_cpu target_cpu = CPU_POWERPC +diff -rupN --no-dereference mingw-w64-v8.0.0/mingw-w64-tools/widl/src/widl.c mingw-w64-v8.0.0-new/mingw-w64-tools/widl/src/widl.c +--- mingw-w64-v8.0.0/mingw-w64-tools/widl/src/widl.c 2020-09-17 04:20:15.000000000 +0200 ++++ mingw-w64-v8.0.0-new/mingw-w64-tools/widl/src/widl.c 2021-01-16 00:00:46.595772873 +0100 +@@ -104,6 +104,8 @@ enum target_cpu target_cpu = CPU_POWERPC enum target_cpu target_cpu = CPU_ARM; #elif defined(__aarch64__) enum target_cpu target_cpu = CPU_ARM64; @@ -73,7 +71,7 @@ diff -rupN --no-dereference mingw-w64-v7.0.0/mingw-w64-tools/widl/src/widl.c min #else #error Unsupported CPU #endif -@@ -294,6 +296,7 @@ static void set_target( const char *targ +@@ -302,6 +304,7 @@ static void set_target( const char *targ { "armv7a", CPU_ARM }, { "arm64", CPU_ARM64 }, { "aarch64", CPU_ARM64 }, @@ -81,7 +79,7 @@ diff -rupN --no-dereference mingw-w64-v7.0.0/mingw-w64-tools/widl/src/widl.c min }; unsigned int i; -@@ -755,6 +758,7 @@ int main(int argc,char *argv[]) +@@ -788,6 +791,7 @@ int main(int argc,char *argv[]) else pointer_size = 4; break; case CPU_x86_64: @@ -89,9 +87,9 @@ diff -rupN --no-dereference mingw-w64-v7.0.0/mingw-w64-tools/widl/src/widl.c min if (pointer_size == 4) target_cpu = CPU_x86; else pointer_size = 8; break; -diff -rupN --no-dereference mingw-w64-v7.0.0/mingw-w64-tools/widl/src/widl.h mingw-w64-v7.0.0-new/mingw-w64-tools/widl/src/widl.h ---- mingw-w64-v7.0.0/mingw-w64-tools/widl/src/widl.h 2019-11-09 06:33:24.000000000 +0100 -+++ mingw-w64-v7.0.0-new/mingw-w64-tools/widl/src/widl.h 2020-06-20 01:18:22.982692077 +0200 +diff -rupN --no-dereference mingw-w64-v8.0.0/mingw-w64-tools/widl/src/widl.h mingw-w64-v8.0.0-new/mingw-w64-tools/widl/src/widl.h +--- mingw-w64-v8.0.0/mingw-w64-tools/widl/src/widl.h 2020-09-17 04:20:15.000000000 +0200 ++++ mingw-w64-v8.0.0-new/mingw-w64-tools/widl/src/widl.h 2021-01-16 00:00:46.596772872 +0100 @@ -76,7 +76,7 @@ extern int char_number; enum target_cpu diff --git a/mingw-w64-tools.spec b/mingw-w64-tools.spec index cc2c7f4..a29ba0d 100644 --- a/mingw-w64-tools.spec +++ b/mingw-w64-tools.spec @@ -4,8 +4,8 @@ #%%global branch trunk Name: mingw-w64-tools -Version: 7.0.0 -Release: 2%{?dist} +Version: 8.0.0 +Release: 1%{?dist} Summary: Supplementary tools which are part of the mingw-w64 toolchain # http://sourceforge.net/mailarchive/forum.php?thread_name=5157C0FC.1010309%40users.sourceforge.net&forum_name=mingw-w64-public @@ -29,9 +29,7 @@ Patch0: mingw-w64-tools-s390.patch # aarch64 does not seem to know about __builtin_ms_va_list Patch1: mingw-w64-tools-aarch64.patch -# fix ppc64le build -Patch2: mingw-w64-tools-ppc64le.patch - +BuildRequires: make BuildRequires: gcc BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw64-filesystem >= 95 @@ -103,6 +101,9 @@ popd %changelog +* Fri Jan 15 2021 Sandro Mani - 8.0.0-1 +- Update to 8.0.0 + * Tue Jul 28 2020 Fedora Release Engineering - 7.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index c5b67c8..f23dda6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mingw-w64-v7.0.0.tar.bz2) = 30e5b2824a24eeb99ab519e3fc134cc9a7f04ee8b853bc8d66a13d1ab74144bf78b93e162bfe6de2a5e61f63c0e620a933b260b02d019cd68cc4b78bd36c67fd +SHA512 (mingw-w64-v8.0.0.tar.bz2) = cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e