.gitignore

@@ -1 +1,2 @@
-SOURCES/mingw-w64-v10.0.0.tar.bz2
+SOURCES/mingw-w64-v5.0.2.tar.bz2
+/mingw-w64-v5.0.2.tar.bz2

.mingw-headers.metadata

@@ -1 +0,0 @@
-56143558d81dae7628a232ca7582b947e65392b1 SOURCES/mingw-w64-v10.0.0.tar.bz2

SOURCES/mingw-headers-no-widl.patch

@@ -1,24 +0,0 @@
-diff -rupN --no-dereference mingw-w64-v10.0.0/mingw-w64-headers/configure mingw-w64-v10.0.0-new/mingw-w64-headers/configure
---- mingw-w64-v10.0.0/mingw-w64-headers/configure	2022-04-03 17:08:58.000000000 +0200
-+++ mingw-w64-v10.0.0-new/mingw-w64-headers/configure	2022-04-26 09:09:23.178755423 +0200
-@@ -2734,7 +2734,7 @@ printf "%s\n" "$with_widl" >&6; }
- 
- if test "x$with_widl" = xno
- then :
--
-+unset WIDL
- else $as_nop
- 
-   if test "x$srcdir" = x.
-diff -rupN --no-dereference mingw-w64-v10.0.0/mingw-w64-headers/configure.ac mingw-w64-v10.0.0-new/mingw-w64-headers/configure.ac
---- mingw-w64-v10.0.0/mingw-w64-headers/configure.ac	2022-04-03 17:08:58.000000000 +0200
-+++ mingw-w64-v10.0.0-new/mingw-w64-headers/configure.ac	2022-04-26 09:09:23.178755423 +0200
-@@ -27,7 +27,7 @@ AC_ARG_WITH([widl],
-   [AS_VAR_SET([with_widl],[no])])
- AC_MSG_RESULT([$with_widl])
- 
--AS_VAR_IF([with_widl],[no],[],[
-+AS_VAR_IF([with_widl],[no],[unset WIDL],[
-   AS_VAR_IF([srcdir],[.],[],
-     [AC_MSG_WARN([--with-widl used in out of the tree compilation.  Existing generated files will not be modified.])])
-   AC_PATH_PROGS([WIDL], [$host-widl widl], [], [$with_widl])

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

mingw-headers-no-widl.patch

@@ -0,0 +1,22 @@
+--- mingw-w64-headers/configure.ac.orig	2014-03-30 15:23:08.248186613 +0200
++++ mingw-w64-headers/configure.ac	2014-03-30 15:24:15.775316204 +0200
+@@ -27,7 +27,7 @@
+   [AS_VAR_SET([with_widl],[no])])
+ AC_MSG_RESULT([$with_widl])
+ 
+-AS_VAR_IF([with_widl],[no],[],[
++AS_VAR_IF([with_widl],[no],[unset WIDL],[
+   AS_VAR_IF([srcdir],[.],[],
+     [AC_MSG_WARN([--with-widl used in out of the tree compilation.  Existing generated files will not be modified.])])
+   AC_PATH_PROGS([WIDL], [$host-widl widl], [], [$with_widl])
+--- mingw-w64-headers/configure.orig	2014-03-30 15:24:23.969453233 +0200
++++ mingw-w64-headers/configure	2014-03-30 15:24:26.479495205 +0200
+@@ -2565,7 +2473,7 @@
+ $as_echo "$with_widl" >&6; }
+ 
+ if test "x$with_widl" = xno; then :
+-
++  unset WIDL
+ else
+ 
+   if test "x$srcdir" = x.; then :

mingw-headers.spec

@@ -1,21 +1,42 @@
-%global mingw_build_ucrt64 1
+#%%global snapshot_date 20160723
+#%%global snapshot_rev 65a0c3298db7cc5cbded63259663cb29e4780a56
+#%%global snapshot_rev_short %(echo %snapshot_rev | cut -c1-6)
+#%%global branch v5.x
+
+#%%global pre rc2
+
 # The mingw-w64-headers provide the headers pthread_time.h
 # and pthread_unistd.h by default and are dummy headers.
 # The real implementation for these headers is in a separate
 # library called winpthreads. As long as winpthreads isn't
-# build, the flag below needs to be set to 1. When winpthreads
+# available (and the old pthreads-w32 implementation is used)
-# is available then this flag needs to be set to 0 to avoid
+# the flag below needs to be set to 1. When winpthreads is
-# a file conflict with the winpthreads headers.
+# available then this flag needs to be set to 0 to avoid
+# a file conflict with the winpthreads headers
+# Winpthreads is available as of Fedora 20
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
+%global bundle_dummy_pthread_headers 0
+%else
 %global bundle_dummy_pthread_headers 1
+%endif
 
 Name:           mingw-headers
-Version:        10.0.0
+Version:        5.0.2
-Release:        3.1%{?dist}
+Release:        2%{?dist}
 Summary:        Win32/Win64 header files
 
 License:        Public Domain and LGPLv2+ and ZPLv2.1
 URL:            http://mingw-w64.sourceforge.net/
+%if 0%{?snapshot_date}
+# To regenerate a snapshot:
+# Use your regular webbrowser to open https://sourceforge.net/p/mingw-w64/mingw-w64/ci/%{snapshot_rev}/tarball
+# This triggers the SourceForge instructure to generate a snapshot
+# After that you can pull in the archive with:
+# spectool -g mingw-headers.spec
+Source0:        http://sourceforge.net/code-snapshots/git/m/mi/mingw-w64/mingw-w64.git/mingw-w64-mingw-w64-%{snapshot_rev}.zip
+%else
 Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}%{?pre:-%{pre}}.tar.bz2
+%endif
 
 # Our RPM macros automatically set the environment variable WIDL
 # This confuses the mingw-headers configure scripts and causes various
@@ -23,12 +44,13 @@ Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}
 # happening as the .idl files shouldn't be used by default
 Patch0:         mingw-headers-no-widl.patch
 
+# Backported patch needed by latest wine-gecko
+Patch1:         commit-7de6266
+
 BuildArch:      noarch
 
-BuildRequires: make
+BuildRequires:  mingw32-filesystem >= 95
-BuildRequires: mingw32-filesystem >= 133
+BuildRequires:  mingw64-filesystem >= 95
-BuildRequires: mingw64-filesystem >= 133
-BuildRequires: ucrt64-filesystem >= 133
 
 
 %description
@@ -42,6 +64,9 @@ Requires:       mingw32-filesystem >= 95
 Requires:       mingw32-winpthreads
 %endif
 
+Obsoletes:      mingw32-w32api < 3.17-3%{?dist}
+Provides:       mingw32-w32api = 3.17-3%{?dist}
+
 %description -n mingw32-headers
 MinGW Windows cross-compiler Win32 header files.
 
@@ -55,114 +80,54 @@ Requires:       mingw64-winpthreads
 %description -n mingw64-headers
 MinGW Windows cross-compiler Win64 header files.
 
-%package -n ucrt64-headers
-Summary:        MinGW Windows cross-compiler Win64 header files
-Requires:       ucrt64-filesystem >= 133
-%if 0%{bundle_dummy_pthread_headers} == 0
-Requires:       ucrt64-winpthreads
-%endif
-
-%description -n ucrt64-headers
-MinGW Windows cross-compiler Win64 header files.
-
 
 %prep
-%autosetup -p1 -n mingw-w64-v%{version}%{?pre:-%{pre}}
+%if 0%{?snapshot_date}
+rm -rf mingw-w64-v%{version}
+mkdir mingw-w64-v%{version}
+cd mingw-w64-v%{version}
+unzip %{S:0}
+%setup -q -D -T -n mingw-w64-v%{version}/mingw-w64-mingw-w64-%{snapshot_rev}
+%else
+%setup -q -n mingw-w64-v%{version}%{?pre:-%{pre}}
+%endif
+
+%patch0 -p0 -b .idl
+%patch1 -p1 -b .gecko
 
 
 %build
-export UCRT64_CONFIGURE_ARGS="--with-default-msvcrt=ucrt"
-
 pushd mingw-w64-headers
-    %mingw_configure --enable-sdk=all --enable-idl
+    %mingw_configure --enable-sdk=all --enable-secure-api
 popd
 
 
 %install
 pushd mingw-w64-headers
-    %mingw_make_install
+    %mingw_make_install DESTDIR=$RPM_BUILD_ROOT 
 popd
 
 # Drop the dummy pthread headers if necessary
 %if 0%{?bundle_dummy_pthread_headers} == 0
-rm -f %{buildroot}%{mingw32_includedir}/pthread_signal.h
+rm -f $RPM_BUILD_ROOT%{mingw32_includedir}/pthread_signal.h
-rm -f %{buildroot}%{mingw32_includedir}/pthread_time.h
+rm -f $RPM_BUILD_ROOT%{mingw32_includedir}/pthread_time.h
-rm -f %{buildroot}%{mingw32_includedir}/pthread_unistd.h
+rm -f $RPM_BUILD_ROOT%{mingw32_includedir}/pthread_unistd.h
-rm -f %{buildroot}%{mingw64_includedir}/pthread_signal.h
+rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_signal.h
-rm -f %{buildroot}%{mingw64_includedir}/pthread_time.h
+rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_time.h
-rm -f %{buildroot}%{mingw64_includedir}/pthread_unistd.h
+rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_unistd.h
-rm -f %{buildroot}%{ucrt64_includedir}/pthread_signal.h
-rm -f %{buildroot}%{ucrt64_includedir}/pthread_time.h
-rm -f %{buildroot}%{ucrt64_includedir}/pthread_unistd.h
 %endif
 
 
 %files -n mingw32-headers
-%license COPYING DISCLAIMER DISCLAIMER.PD
+%license COPYING DISCLAIMER DISCLAIMER.PD mingw-w64-headers/direct-x/COPYING.LIB
 %{mingw32_includedir}/*
 
 %files -n mingw64-headers
-%license COPYING DISCLAIMER DISCLAIMER.PD
+%license COPYING DISCLAIMER DISCLAIMER.PD mingw-w64-headers/direct-x/COPYING.LIB
 %{mingw64_includedir}/*
 
-%files -n ucrt64-headers
-%license COPYING DISCLAIMER DISCLAIMER.PD
-%{ucrt64_includedir}/*
-
 
 %changelog
-* Fri May 06 2022 Richard W.M. Jones <rjones@redhat.com> - 10.0.0-3.1
-- Rebase to Fedora Rawhide
-  resolves: rhbz#2079435
-
-* Mon Aug 23 2021 Richard W.M. Jones <rjones@redhat.com> - 9.0.0-2
-- Update to 9.0.0
-- Manually merge with fedora/rawhide
-  resolves: rhbz#1996743
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.0-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.0-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 15 2021 Sandro Mani <manisandro@gmail.com> - 8.0.0-1
-- Update to 8.0.0
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jun 20 2020 Sandro Mani <manisandro@gmail.com> - 7.0.0-1
-- Update to 7.0.0
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue May 07 2019 Sandro Mani <manisandro@gmail.com> - 6.0.0-1
-- Update to 6.0.0
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 09 2018 Kalev Lember <klember@redhat.com> - 5.0.4-1
-- Update to 5.0.4
-
-* Thu Jun 14 2018 Sandro Mani <manisandro@gmail.com> - 5.0.3-1
-- Update to 5.0.3
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

sources

@@ -0,0 +1 @@
+SHA512 (mingw-w64-v5.0.2.tar.bz2) = 430065a822afb9901219b1f86ea221ae70ef7820ea298f51828bf1689a014115dade967a806388b7ee3ed1ea1d6c53970514ec64d0185b5024523093d9e96060