Compare commits

...

No commits in common. "c8s" and "c9-beta" have entirely different histories.
c8s ... c9-beta

8 changed files with 166 additions and 4375 deletions

3
.gitignore vendored
View File

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

1
.mingw-headers.metadata Normal file
View File

@ -0,0 +1 @@
8a725388147e7aa2b367c35e52e91a92713e1faf SOURCES/mingw-w64-v12.0.0.tar.bz2

View File

@ -0,0 +1,24 @@
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 case e in #(
e)
if test "x$srcdir" = x.
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])
-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])

View File

@ -1,42 +1,21 @@
#%%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
%global mingw_build_ucrt64 1
# 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
# available (and the old pthreads-w32 implementation is used)
# the flag below needs to be set to 1. When winpthreads is
# 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
# build, the flag below needs to be set to 1. When winpthreads
# is available then this flag needs to be set to 0 to avoid
# a file conflict with the winpthreads headers.
%global bundle_dummy_pthread_headers 0
%else
%global bundle_dummy_pthread_headers 1
%endif
Name: mingw-headers
Version: 5.0.2
Release: 2%{?dist}
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/
%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
@ -44,13 +23,12 @@ 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: mingw32-filesystem >= 95
BuildRequires: mingw64-filesystem >= 95
BuildRequires: make
BuildRequires: mingw32-filesystem >= 133
BuildRequires: mingw64-filesystem >= 133
BuildRequires: ucrt64-filesystem >= 133
%description
@ -64,9 +42,6 @@ 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.
@ -80,54 +55,161 @@ Requires: mingw64-winpthreads
%description -n mingw64-headers
MinGW Windows cross-compiler Win64 header files.
%prep
%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}}
%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
%patch0 -p0 -b .idl
%patch1 -p1 -b .gecko
%description -n ucrt64-headers
MinGW Windows cross-compiler Win64 header files.
%prep
%autosetup -p1 -n mingw-w64-v%{version}%{?pre:-%{pre}}
%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
%mingw_configure --enable-sdk=all --enable-secure-api
%mingw_configure --enable-sdk=all --enable-idl
popd
%install
pushd mingw-w64-headers
%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
%mingw_make_install
popd
# Drop the dummy pthread headers if necessary
%if 0%{?bundle_dummy_pthread_headers} == 0
rm -f $RPM_BUILD_ROOT%{mingw32_includedir}/pthread_signal.h
rm -f $RPM_BUILD_ROOT%{mingw32_includedir}/pthread_time.h
rm -f $RPM_BUILD_ROOT%{mingw32_includedir}/pthread_unistd.h
rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_signal.h
rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_time.h
rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_unistd.h
rm -f %{buildroot}%{mingw32_includedir}/pthread_signal.h
rm -f %{buildroot}%{mingw32_includedir}/pthread_time.h
rm -f %{buildroot}%{mingw32_includedir}/pthread_unistd.h
rm -f %{buildroot}%{mingw64_includedir}/pthread_signal.h
rm -f %{buildroot}%{mingw64_includedir}/pthread_time.h
rm -f %{buildroot}%{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 mingw-w64-headers/direct-x/COPYING.LIB
%license COPYING DISCLAIMER DISCLAIMER.PD
%{mingw32_includedir}/*
%files -n mingw64-headers
%license COPYING DISCLAIMER DISCLAIMER.PD mingw-w64-headers/direct-x/COPYING.LIB
%license COPYING DISCLAIMER DISCLAIMER.PD
%{mingw64_includedir}/*
%files -n ucrt64-headers
%license COPYING DISCLAIMER DISCLAIMER.PD
%{ucrt64_includedir}/*
%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
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Aug 17 2023 Sandro Mani <manisandro@gmail.com> - 11.0.1-1
- Update to 11.0.1
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sun Apr 30 2023 Sandro Mani <manisandro@gmail.com> - 11.0.0-1
- Update to 11.0.0
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed May 04 2022 Sandro Mani <manisandro@gmail.com> - 10.0.0-3
- Rebuild (bundle_dummy_pthread_headers=0)
* Tue May 03 2022 Sandro Mani <manisandro@gmail.com> - 10.0.0-2
- Build with dummy pthread headers
- Spec cleanups
* Tue Apr 26 2022 Sandro Mani <manisandro@gmail.com> - 10.0.0-1
- Update to 10.0.0
* Wed Mar 02 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 9.0.0-6
- Add ucrt64 target (bundle_dummy_pthread_headers=0, +Requires: winpthread)
* Wed Feb 23 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 9.0.0-5
- Add ucrt64 target (bundle_dummy_pthread_headers=0, -Requires: winpthread)
* Wed Feb 23 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 9.0.0-4
- Add ucrt64 target (bundle_dummy_pthread_headers=1)
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jul 08 2021 Sandro Mani <manisandro@gmail.com> - 9.0.0-1
- Update to 9.0.0
* Mon May 17 2021 Sandro Mani <manisandro@gmail.com> - 8.0.2-1
- Update to 8.0.2
* 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

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -1,22 +0,0 @@
--- 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 :

View File

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