From 04eab395a5df315ecf9009e2e0e8a798af6fa435 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 21:03:25 +0000
Subject: [PATCH 01/90] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 394a351..983b6ee 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        101
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 Group:          Development/Libraries
@@ -309,6 +309,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Sun May  8 2016 Erik van Pienbroek <epienbro@fedoraproject.org> - 101-1
 - Update config.{guess,sub} in %%mingw_configure (#1288256)
 - Regenerated list of default win32 DLL's

From 3b7a52cee207434f3e2d727bc1c5e8d598c68d71 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 21:32:13 +0000
Subject: [PATCH 02/90] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 983b6ee..6d673c1 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        101
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 Group:          Development/Libraries
@@ -309,6 +309,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From c9e430bd5a2990cadc251646edf3916b6096c214 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sat, 9 Sep 2017 10:07:18 +0200
Subject: [PATCH 03/90] Also extract debuginfo data from pyd binaries

---
 mingw-filesystem.spec   | 7 +++++--
 mingw-find-debuginfo.sh | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 6d673c1..c9638b5 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        101
-Release:        3%{?dist}
+Version:        102
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 Group:          Development/Libraries
@@ -309,6 +309,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Sat Sep 09 2017 Sandro Mani <manisandro@gmail.com> - 102-1
+- Also extract debuginfo data from pyd binaries
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
index e47df65..de6dee1 100755
--- a/mingw-find-debuginfo.sh
+++ b/mingw-find-debuginfo.sh
@@ -10,7 +10,7 @@ fi
 BUILDDIR=$1
 shift
 
-for f in `find $RPM_BUILD_ROOT -type f -name "*.exe" -or -name "*.dll"`
+for f in `find $RPM_BUILD_ROOT -type f -name "*.exe" -or -name "*.dll" -or -name "*.pyd"`
 do
 	case $(mingw-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
 	    *debuglink*) continue ;;
@@ -34,6 +34,6 @@ for target in $@; do
 	if [ ! -d $RPM_BUILD_ROOT$prefix ] ; then
 		continue
 	fi
-	find $RPM_BUILD_ROOT$prefix -type f -name "*.exe.debug" -or -name "*.dll.debug" |
+	find $RPM_BUILD_ROOT$prefix -type f -name "*.exe.debug" -or -name "*.dll.debug" -or -name "*.pyd.debug" |
 		sed -n -e "s#^$RPM_BUILD_ROOT##p" > $BUILDDIR/${target}-debugfiles.list
 done

From 9a9de1654be17381e662733c6c6a25802e56b108 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sun, 10 Sep 2017 13:51:18 +0200
Subject: [PATCH 04/90] Add %mingw_nm macro

---
 macros.mingw            | 1 +
 mingw-filesystem.spec   | 5 ++++-
 mingw-find-debuginfo.sh | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/macros.mingw b/macros.mingw
index a0bd07f..9d1b869 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -7,6 +7,7 @@
 %mingw_strip                mingw-strip
 %mingw_objdump              mingw-objdump
 %mingw_objcopy              mingw-objcopy
+%mingw_nm                   mingw-nm
 
 %mingw_findprovides         %{_rpmconfigdir}/mingw-find-provides.sh %{mingw_build_targets}
 %mingw_findrequires         %{_rpmconfigdir}/mingw-find-requires.sh %{mingw_build_targets}
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index c9638b5..eee47d6 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        102
+Version:        103
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -309,6 +309,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Sun Sep 10 2017 Sandro Mani <manisandro@gmail.com> - 103-1
+- Add %%mingw_nm macro
+
 * Sat Sep 09 2017 Sandro Mani <manisandro@gmail.com> - 102-1
 - Also extract debuginfo data from pyd binaries
 
diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
index de6dee1..261385f 100755
--- a/mingw-find-debuginfo.sh
+++ b/mingw-find-debuginfo.sh
@@ -25,7 +25,10 @@ do
 	echo extracting debug info from $f
 	mingw-objcopy --only-keep-debug $f $f.debug || :
 	pushd `dirname $f`
-	mingw-objcopy --add-gnu-debuglink=`basename $f.debug` --strip-unneeded `basename $f` || :
+	keep_symbols=`mktemp`
+  mingw-nm $f.debug --format=sysv --defined-only | awk -F \| '{ if ($4 ~ "Function") print $1 }' | sort > "$keep_symbols"
+	mingw-objcopy --add-gnu-debuglink=`basename $f.debug` --strip-unneeded `basename $f` --keep-symbols="$keep_symbols" || :
+	rm -f "$keep_symbols"
 	popd
 done
 

From 7147464c6a82c9e5d2db4677ba0804a362fefe1c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 8 Feb 2018 02:03:26 +0000
Subject: [PATCH 05/90] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index eee47d6..6cd0219 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        103
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 Group:          Development/Libraries
@@ -309,6 +309,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Sun Sep 10 2017 Sandro Mani <manisandro@gmail.com> - 103-1
 - Add %%mingw_nm macro
 

From bd0be208c7f6eff6aca90d056b3da7737c9fd418 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 20 Apr 2018 03:37:41 -0400
Subject: [PATCH 06/90] Add macros and cross-file for meson and ninja.

---
 macros.mingw            | 30 ++++++++++++++++++++++++++++++
 macros.mingw32          | 25 +++++++++++++++++++++++++
 macros.mingw64          | 25 +++++++++++++++++++++++++
 mingw-filesystem.spec   | 19 +++++++++++++++----
 toolchain-mingw32.meson | 20 ++++++++++++++++++++
 toolchain-mingw64.meson | 20 ++++++++++++++++++++
 6 files changed, 135 insertions(+), 4 deletions(-)
 create mode 100644 toolchain-mingw32.meson
 create mode 100644 toolchain-mingw64.meson

diff --git a/macros.mingw b/macros.mingw
index 9d1b869..a30b141 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -142,5 +142,35 @@ popd                                                   \
 }                                                      \
 run_mingw_qmake_qt5
 
+%mingw_meson                                           \
+run_mingw_meson()                                      \
+{                                                      \
+%if 0%{?mingw_build_win32} == 1                        \
+mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
+pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
+    %{?mingw32_meson "$@"}                             \
+popd                                                   \
+%endif                                                 \
+%if 0%{?mingw_build_win64} == 1                        \
+mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
+pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
+    %{?mingw64_meson "$@"}                             \
+popd                                                   \
+%endif                                                 \
+}                                                      \
+run_mingw_meson
+
+%mingw_ninja                                                        \
+run_mingw_ninja()                                                   \
+{                                                                   \
+%if 0%{?mingw_build_win32} == 1                                     \
+ninja -C build_win32$MINGW_BUILDDIR_SUFFIX "$@" $MINGW32_NINJA_ARGS \
+%endif                                                              \
+%if 0%{?mingw_build_win64} == 1                                     \
+ninja -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_NINJA_ARGS \
+%endif                                                              \
+}                                                                   \
+run_mingw_ninja
+
 # Deprecated:
 %mingw_make_install         %mingw_make install
diff --git a/macros.mingw32 b/macros.mingw32
index a3662ca..1e7bd36 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -150,6 +150,31 @@
 %mingw32_qmake_qt4 /usr/bin/mingw32-qmake-qt4
 %mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
 
+%mingw32_meson %{mingw32_env} ; \
+  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\
+  export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_ldflags}"; \\\
+  if test -f meson.build; then __mingw32_topdir=.; \\\
+  elif test -f ../meson.build; then __mingw32_topdir=..; \\\
+  else __mingw32_topdir=""; fi; \\\
+  %__meson \\\
+        --cross-file /usr/share/mingw/toolchain-mingw32.meson \\\
+        --default-library shared \\\
+        --prefix %{mingw32_prefix} \\\
+        --bindir %{mingw32_bindir} \\\
+        --sbindir %{mingw32_sbindir} \\\
+        --sysconfdir %{mingw32_sysconfdir} \\\
+        --datadir %{mingw32_datadir} \\\
+        --includedir %{mingw32_includedir} \\\
+        --libdir %{mingw32_libdir} \\\
+        --libexecdir %{mingw32_libexecdir} \\\
+        --localstatedir %{mingw32_localstatedir} \\\
+        --sharedstatedir %{mingw32_sharedstatedir} \\\
+        --mandir %{mingw32_mandir} \\\
+        --infodir %{mingw32_infodir} \\\
+        ${MINGW_MESON_ARGS} \\\
+        ${MINGW32_MESON_ARGS} \\\
+        "$@" $__mingw32_topdir
+
 %mingw32_description This is the cross-compiled version of this library / tool.\
 You should only install this package if you want to cross-compile programs for \
 Win32 (32 bit Windows).
diff --git a/macros.mingw64 b/macros.mingw64
index 8db57f4..55857d6 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -150,6 +150,31 @@
 %mingw64_qmake_qt4 /usr/bin/mingw64-qmake-qt4
 %mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
 
+%mingw64_meson %{mingw64_env} ; \
+  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\
+  export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_ldflags}"; \\\
+  if test -f meson.build; then __mingw64_topdir=.; \\\
+  elif test -f ../meson.build; then __mingw64_topdir=..; \\\
+  else __mingw64_topdir=""; fi; \\\
+  %__meson \\\
+        --cross-file /usr/share/mingw/toolchain-mingw64.meson \\\
+        --default-library shared \\\
+        --prefix %{mingw64_prefix} \\\
+        --bindir %{mingw64_bindir} \\\
+        --sbindir %{mingw64_sbindir} \\\
+        --sysconfdir %{mingw64_sysconfdir} \\\
+        --datadir %{mingw64_datadir} \\\
+        --includedir %{mingw64_includedir} \\\
+        --libdir %{mingw64_libdir} \\\
+        --libexecdir %{mingw64_libexecdir} \\\
+        --localstatedir %{mingw64_localstatedir} \\\
+        --sharedstatedir %{mingw64_sharedstatedir} \\\
+        --mandir %{mingw64_mandir} \\\
+        --infodir %{mingw64_infodir} \\\
+        ${MINGW_MESON_ARGS} \\\
+        ${MINGW64_MESON_ARGS} \\\
+        "$@" $__mingw64_topdir
+
 %mingw64_description This is the cross-compiled version of this library / tool.\
 You should only install this package if you want to cross-compile programs for \
 Win64 (64 bit Windows).
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 6cd0219..d96cc48 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        103
-Release:        2%{?dist}
+Version:        104
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 Group:          Development/Libraries
@@ -36,6 +36,8 @@ Source15:       mingw64.attr
 Source16:       standard-dlls-mingw32
 # (rpm -ql mingw64-crt | grep '\.a$' | while read f ; do x86_64-w64-mingw32-dlltool -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-mingw64
 Source17:       standard-dlls-mingw64
+Source18:       toolchain-mingw32.meson
+Source19:       toolchain-mingw64.meson
 
 # Taken from the Fedora filesystem package
 Source101:      https://fedorahosted.org/filesystem/browser/lang-exceptions
@@ -135,8 +137,8 @@ install -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_libexecdir}/mingw-scripts
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd $RPM_BUILD_ROOT%{_bindir}
-for i in mingw32-configure mingw32-cmake mingw32-make mingw32-pkg-config \
-         mingw64-configure mingw64-cmake mingw64-make mingw64-pkg-config ; do
+for i in mingw32-configure mingw32-cmake mingw32-make mingw32-meson mingw32-pkg-config \
+         mingw64-configure mingw64-cmake mingw64-make mingw64-meson mingw64-pkg-config ; do
   ln -s %{_libexecdir}/mingw-scripts $i
 done
 popd
@@ -274,6 +276,8 @@ install -m 0644 %{SOURCE15} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/mingw
 install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mingw/
 install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
+install -m 0644 %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/mingw/
+install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %files base
@@ -291,10 +295,12 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 %{_bindir}/mingw32-configure
 %{_bindir}/mingw32-cmake
 %{_bindir}/mingw32-make
+%{_bindir}/mingw32-meson
 %{_bindir}/mingw32-pkg-config
 %{_prefix}/i686-w64-mingw32
 %{_rpmconfigdir}/fileattrs/mingw32.attr
 %{_datadir}/mingw/toolchain-mingw32.cmake
+%{_datadir}/mingw/toolchain-mingw32.meson
 
 %files -n mingw64-filesystem
 %{macrosdir}/macros.mingw64
@@ -302,13 +308,18 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 %{_bindir}/mingw64-configure
 %{_bindir}/mingw64-cmake
 %{_bindir}/mingw64-make
+%{_bindir}/mingw64-meson
 %{_bindir}/mingw64-pkg-config
 %{_prefix}/x86_64-w64-mingw32
 %{_rpmconfigdir}/fileattrs/mingw64.attr
 %{_datadir}/mingw/toolchain-mingw64.cmake
+%{_datadir}/mingw/toolchain-mingw64.meson
 
 
 %changelog
+* Fri Apr 20 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 104-1
+- Add macros for meson and ninja
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson
new file mode 100644
index 0000000..127d413
--- /dev/null
+++ b/toolchain-mingw32.meson
@@ -0,0 +1,20 @@
+[binaries]
+c = '/usr/bin/i686-w64-mingw32-gcc'
+cpp = '/usr/bin/i686-w64-mingw32-g++'
+fortran = '/usr/bin/i686-w64-mingw32-gfortran'
+rust = ['rustc', '--target', 'i686-pc-windows-msvc', '-C', 'linker=/usr/bin/i686-w64-mingw32-gcc']
+ar = '/usr/bin/i686-w64-mingw32-ar'
+pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
+ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
+strip = '/usr/bin/i686-w64-mingw32-strip'
+windres = '/usr/bin/i686-w64-mingw32-windres'
+
+[properties]
+root = '/usr/i686-w64-mingw32/sys-root/mingw'
+needs_exe_wrapper = true
+
+[host_machine]
+system = 'windows'
+cpu_family = 'x86'
+cpu = 'i686'
+endian = 'little'
diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson
new file mode 100644
index 0000000..9e0a180
--- /dev/null
+++ b/toolchain-mingw64.meson
@@ -0,0 +1,20 @@
+[binaries]
+c = '/usr/bin/x86_64-w64-mingw32-gcc'
+cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+fortran = '/usr/bin/x86_64-w64-mingw32-gfortran'
+rust = ['rustc', '--target', 'x86_64-pc-windows-msvc', '-C', 'linker=/usr/bin/x86_64-w64-mingw32-gcc']
+ar = '/usr/bin/x86_64-w64-mingw32-ar'
+pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
+strip = '/usr/bin/x86_64-w64-mingw32-strip'
+windres = '/usr/bin/x86_64-w64-mingw32-windres'
+
+[properties]
+root = '/usr/x86_64-w64-mingw32/sys-root/mingw'
+needs_exe_wrapper = true
+
+[host_machine]
+system = 'windows'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'

From 59fb5dec7ba62f6518cc785b76e81e990c4abeff Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 10:20:33 +0000
Subject: [PATCH 07/90] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index d96cc48..a6cd0f4 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        104
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 Group:          Development/Libraries
@@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Apr 20 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 104-1
 - Add macros for meson and ninja
 

From e467da62aec65acbb720a8f2fe66af0e6d03a406 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:54 +0100
Subject: [PATCH 08/90] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 mingw-filesystem.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index a6cd0f4..d570808 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,6 @@ Version:        104
 Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
-Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://fedoraproject.org/wiki/MinGW
 BuildArch:      noarch

From 7b85d868c919389bd69fad8a86a4d43da4635dab Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 1 Feb 2019 10:28:11 +0000
Subject: [PATCH 09/90] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index d570808..ef49e8c 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        104
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From ed40f14dd0e9ed051f355c99c46165a0d3e2513c Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 23 Nov 2018 00:40:09 -0500
Subject: [PATCH 10/90] Remove redundant $@ in mingw_cmake and mingw_meson.

$@ is not used by the RPM macro _in RPM_ since it is executed as a line
by itself, not a script or function.

There's already a $@ in the mingw-scripts.sh file, so when expanded from
the macro, the script contains two $@, sending redundant arguments to
cmake and meson.
---
 macros.mingw32        | 4 ++--
 macros.mingw64        | 4 ++--
 mingw-filesystem.spec | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 1e7bd36..4b4d68b 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -137,7 +137,7 @@
         -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw32_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW32_CMAKE_ARGS} \\\
-        "$@" $__mingw32_topdir
+        $__mingw32_topdir
 
 %mingw32_cmake \
   MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}" \
@@ -173,7 +173,7 @@
         --infodir %{mingw32_infodir} \\\
         ${MINGW_MESON_ARGS} \\\
         ${MINGW32_MESON_ARGS} \\\
-        "$@" $__mingw32_topdir
+        $__mingw32_topdir
 
 %mingw32_description This is the cross-compiled version of this library / tool.\
 You should only install this package if you want to cross-compile programs for \
diff --git a/macros.mingw64 b/macros.mingw64
index 55857d6..78079f5 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -137,7 +137,7 @@
         -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw64_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW64_CMAKE_ARGS} \\\
-        "$@" $__mingw64_topdir
+        $__mingw64_topdir
 
 %mingw64_cmake \
   MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}" \
@@ -173,7 +173,7 @@
         --infodir %{mingw64_infodir} \\\
         ${MINGW_MESON_ARGS} \\\
         ${MINGW64_MESON_ARGS} \\\
-        "$@" $__mingw64_topdir
+        $__mingw64_topdir
 
 %mingw64_description This is the cross-compiled version of this library / tool.\
 You should only install this package if you want to cross-compile programs for \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index ef49e8c..d0d33d5 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        104
-Release:        3%{?dist}
+Version:        105
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Tue Feb 05 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 105-1
+- Remove redundant $@ in mingw_cmake and mingw_meson, breaking wrapper scripts
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 2fdaf5a89a721f3c81880d694a64681e26455628 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 14 Feb 2019 21:42:43 +0100
Subject: [PATCH 11/90] Revert "Remove redundant  in mingw_cmake and
 mingw_meson"

It causes no arguments at all to be passed to cmake
---
 macros.mingw32        | 4 ++--
 macros.mingw64        | 4 ++--
 mingw-filesystem.spec | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 4b4d68b..1e7bd36 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -137,7 +137,7 @@
         -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw32_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW32_CMAKE_ARGS} \\\
-        $__mingw32_topdir
+        "$@" $__mingw32_topdir
 
 %mingw32_cmake \
   MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}" \
@@ -173,7 +173,7 @@
         --infodir %{mingw32_infodir} \\\
         ${MINGW_MESON_ARGS} \\\
         ${MINGW32_MESON_ARGS} \\\
-        $__mingw32_topdir
+        "$@" $__mingw32_topdir
 
 %mingw32_description This is the cross-compiled version of this library / tool.\
 You should only install this package if you want to cross-compile programs for \
diff --git a/macros.mingw64 b/macros.mingw64
index 78079f5..55857d6 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -137,7 +137,7 @@
         -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw64_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW64_CMAKE_ARGS} \\\
-        $__mingw64_topdir
+        "$@" $__mingw64_topdir
 
 %mingw64_cmake \
   MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}" \
@@ -173,7 +173,7 @@
         --infodir %{mingw64_infodir} \\\
         ${MINGW_MESON_ARGS} \\\
         ${MINGW64_MESON_ARGS} \\\
-        $__mingw64_topdir
+        "$@" $__mingw64_topdir
 
 %mingw64_description This is the cross-compiled version of this library / tool.\
 You should only install this package if you want to cross-compile programs for \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index d0d33d5..7fe492f 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        105
+Version:        106
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Thu Feb 14 2019 Sandro Mani <manisandro@gmail.com> - 106-1
+- Revert "Remove redundant $@ in mingw_cmake and mingw_meson", it causes no arguments at all to be passed to cmake
+
 * Tue Feb 05 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 105-1
 - Remove redundant $@ in mingw_cmake and mingw_meson, breaking wrapper scripts
 

From ff5a0b892ec7fad2b158ad1838f7d78c8e093e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
Date: Wed, 19 Jun 2019 14:08:39 +0200
Subject: [PATCH 12/90] Add %%mingw_ninja_install macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In order to make the life of the mingw packages easier, let's add a
%%mingw_ninja_install macro that will run `ninja -C install` in the
proper directory (the one configured using %%mingw_meson macro), passing
the correct DESTDIR to ninja.

In case it's not done, po files are not correctly installed and
%%mingw_find_lang macro will fail.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
 macros.mingw          | 12 ++++++++++++
 mingw-filesystem.spec |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/macros.mingw b/macros.mingw
index a30b141..c152d6d 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -172,5 +172,17 @@ ninja -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_NINJA_ARGS \
 }                                                                   \
 run_mingw_ninja
 
+%mingw_ninja_install                                                    \
+run_mingw_ninja_install()                                               \
+{                                                                       \
+%if 0%{?mingw_build_win32} == 1                                         \
+DESTDIR=%{buildroot} ninja -C build_win32$MINGW_BUILDDIR_SUFFIX install \
+%endif                                                                  \
+%if 0%{?mingw_build_win64} == 1                                         \
+DESTDIR=%{buildroot} ninja -C build_win64$MINGW_BUILDDIR_SUFFIX install \
+%endif                                                                  \
+}                                                                       \
+run_mingw_ninja_install
+
 # Deprecated:
 %mingw_make_install         %mingw_make install
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 7fe492f..175342f 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        106
+Version:        107
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Wed Jun 19 2019 Fabiano Fidêncio <fidencio@redhat.com> - 107-1
+- Add %%mingw_ninja_install macro
+
 * Thu Feb 14 2019 Sandro Mani <manisandro@gmail.com> - 106-1
 - Revert "Remove redundant $@ in mingw_cmake and mingw_meson", it causes no arguments at all to be passed to cmake
 

From cfb1eb657587965675cf7c8d7e4253215f1b0580 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 16:41:07 +0000
Subject: [PATCH 13/90] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 175342f..cd8719c 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        107
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Wed Jun 19 2019 Fabiano Fidêncio <fidencio@redhat.com> - 107-1
 - Add %%mingw_ninja_install macro
 

From c3d26e7c6d3395c73379d6c507470a7806ce76e4 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 12 Aug 2019 13:27:48 +0200
Subject: [PATCH 14/90] Fix mingw-find-debuginfo.sh to pick up strippable
 binaries also in %%{_prefix}/%%{mingw32,64_target}

---
 mingw-filesystem.spec   | 7 +++++--
 mingw-find-debuginfo.sh | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index cd8719c..cd0e5d3 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        107
-Release:        2%{?dist}
+Version:        108
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Mon Aug 12 2019 Sandro Mani <manisandro@gmail.com> - 108-1
+- Fix mingw-find-debuginfo.sh to pick up strippable binaries also in %%{_prefix}/%%{mingw32,64_target}
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
index 261385f..f877343 100755
--- a/mingw-find-debuginfo.sh
+++ b/mingw-find-debuginfo.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/sh
 # mingw-find-debuginfo.sh - automagically generate debug info and file list
 # for inclusion in an rpm spec file for mingw-* packages.
 
@@ -33,7 +33,7 @@ do
 done
 
 for target in $@; do
-	prefix=`rpm --eval "%{${target}_prefix}"`
+	prefix=`rpm --eval "%{_prefix}/%{${target}_target}"`
 	if [ ! -d $RPM_BUILD_ROOT$prefix ] ; then
 		continue
 	fi

From 782b1042837da23883e88d9cfe0be3f3adfc85b1 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 29 Aug 2019 23:09:34 +0200
Subject: [PATCH 15/90] Add dlltool to toolchain-mingw{32,64}.meson

---
 macros.mingw32          | 1 +
 macros.mingw64          | 1 +
 mingw-filesystem.spec   | 5 ++++-
 toolchain-mingw32.meson | 1 +
 toolchain-mingw64.meson | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 1e7bd36..87af379 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -81,6 +81,7 @@
   unset x i
 
 %mingw32_pkg_config %{mingw32_target}-pkg-config
+%mingw32_pkgconfig_personalitydir %{mingw32_datadir}/pkgconfig/personality.d
 
 %mingw32_configure %{mingw32_env} ; \
   __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\
diff --git a/macros.mingw64 b/macros.mingw64
index 55857d6..39b4f4f 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -81,6 +81,7 @@
   unset x i
 
 %mingw64_pkg_config %{mingw64_target}-pkg-config
+%mingw64_pkgconfig_personalitydir %{mingw32_datadir}/pkgconfig/personality.d
 
 %mingw64_configure %{mingw64_env} ; \
   __mingw64_topdir=.; if ! test -x configure; then __mingw64_topdir=..; fi; \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index cd0e5d3..33e1853 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        108
+Version:        109
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Thu Aug 29 2019 Sandro Mani <manisandro@gmail.com> - 109-1
+- Add dlltool to toolchain-mingw{32,64}.meson
+
 * Mon Aug 12 2019 Sandro Mani <manisandro@gmail.com> - 108-1
 - Fix mingw-find-debuginfo.sh to pick up strippable binaries also in %%{_prefix}/%%{mingw32,64_target}
 
diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson
index 127d413..edae1d6 100644
--- a/toolchain-mingw32.meson
+++ b/toolchain-mingw32.meson
@@ -8,6 +8,7 @@ pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
 strip = '/usr/bin/i686-w64-mingw32-strip'
 windres = '/usr/bin/i686-w64-mingw32-windres'
+dlltool = '/usr/bin/i686-w64-mingw32-dlltool'
 
 [properties]
 root = '/usr/i686-w64-mingw32/sys-root/mingw'
diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson
index 9e0a180..195df84 100644
--- a/toolchain-mingw64.meson
+++ b/toolchain-mingw64.meson
@@ -8,6 +8,7 @@ pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
 strip = '/usr/bin/x86_64-w64-mingw32-strip'
 windres = '/usr/bin/x86_64-w64-mingw32-windres'
+dlltool = '/usr/bin/x86_64-w64-mingw32-dlltool'
 
 [properties]
 root = '/usr/x86_64-w64-mingw32/sys-root/mingw'

From 32c17a2e88ff1cf9e4a2737beda4377af2774464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Thu, 7 Nov 2019 17:53:04 +0400
Subject: [PATCH 16/90] Add redhat-rpm-config dependency. Fixes rhbz#1769792
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 mingw-filesystem.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 33e1853..4705e0e 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        109
+Version:        110
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -58,6 +58,7 @@ This environment is maintained by the Fedora MinGW SIG at:
 %package base
 Summary:        Generic files which are needed for both mingw32-filesystem and mingw64-filesystem
 
+Requires:       redhat-rpm-config
 # Obsolete the packages from the test repo
 Obsoletes:      cross-filesystem < 67-2
 Obsoletes:      cross-filesystem-scripts < 67-2
@@ -316,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Thu Nov 07 2019 Marc-André Lureau <marcandre.lureau@redhat.com> - 110-1
+- Add redhat-rpm-config dependency. Fixes rhbz#1769792
+
 * Thu Aug 29 2019 Sandro Mani <manisandro@gmail.com> - 109-1
 - Add dlltool to toolchain-mingw{32,64}.meson
 

From 3ca816d704a6b5ee3ffa28129f89b218c38f5911 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jan 2020 12:54:25 +0000
Subject: [PATCH 17/90] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 4705e0e..07e8a82 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        110
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Nov 07 2019 Marc-André Lureau <marcandre.lureau@redhat.com> - 110-1
 - Add redhat-rpm-config dependency. Fixes rhbz#1769792
 

From c343831a16ae4a188cb5de080bb4ef0b67ced484 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 13 Feb 2020 11:12:10 +0000
Subject: [PATCH 18/90] All mingw packages have been retired in EPEL 7, see
 https://pagure.io/fesco/issue/2333

---
 .gitignore              |    0
 COPYING                 |  339 -----------
 dead.package            |    1 +
 iso_3166.sed            |   31 -
 iso_639.sed             |   31 -
 lang-exceptions         |   99 ----
 macros.mingw            |  145 -----
 macros.mingw32          |  169 ------
 macros.mingw64          |  169 ------
 mingw-filesystem.spec   |  796 -------------------------
 mingw-find-debuginfo.sh |   39 --
 mingw-find-lang.sh      |   17 -
 mingw-find-provides.sh  |   24 -
 mingw-find-requires.sh  |   50 --
 mingw-rpmlint.config    |   24 -
 mingw-scripts.sh        |   45 --
 mingw32.attr            |    3 -
 mingw32.sh              |    3 -
 mingw64.attr            |    3 -
 mingw64.sh              |    3 -
 sources                 |    0
 standard-dlls-mingw32   |  329 -----------
 standard-dlls-mingw64   | 1232 ---------------------------------------
 toolchain-mingw32.cmake |   27 -
 toolchain-mingw64.cmake |   27 -
 25 files changed, 1 insertion(+), 3605 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 COPYING
 create mode 100644 dead.package
 delete mode 100644 iso_3166.sed
 delete mode 100644 iso_639.sed
 delete mode 100644 lang-exceptions
 delete mode 100644 macros.mingw
 delete mode 100644 macros.mingw32
 delete mode 100644 macros.mingw64
 delete mode 100644 mingw-filesystem.spec
 delete mode 100755 mingw-find-debuginfo.sh
 delete mode 100755 mingw-find-lang.sh
 delete mode 100755 mingw-find-provides.sh
 delete mode 100755 mingw-find-requires.sh
 delete mode 100644 mingw-rpmlint.config
 delete mode 100755 mingw-scripts.sh
 delete mode 100644 mingw32.attr
 delete mode 100644 mingw32.sh
 delete mode 100644 mingw64.attr
 delete mode 100644 mingw64.sh
 delete mode 100644 sources
 delete mode 100644 standard-dlls-mingw32
 delete mode 100644 standard-dlls-mingw64
 delete mode 100644 toolchain-mingw32.cmake
 delete mode 100644 toolchain-mingw64.cmake

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/COPYING b/COPYING
deleted file mode 100644
index d159169..0000000
--- a/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..0a0f899
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+All mingw packages have been retired in EPEL 7, see https://pagure.io/fesco/issue/2333
diff --git a/iso_3166.sed b/iso_3166.sed
deleted file mode 100644
index 705dbdb..0000000
--- a/iso_3166.sed
+++ /dev/null
@@ -1,31 +0,0 @@
-1,/<iso_3166_entries/b
-
-# on each new iso-code process the current one
-\!\(<iso_3166_entry\|</iso_3166_entries>\)!{
-    x
-    s/^$//
-    # we are on the first iso-code--nothing to process here
-    t
-    # process and write to output
-    s/\s\+/ /g
-    s/<iso_3166_entry//
-    s!/\s*>!!
-    # use '%' as a separator of parsed and unparsed input
-    s/\(.*\)alpha_2_code="\([^"]\+\)"\(.*\)/\2 % \1 \3/
-    s/\([^%]\+\)%\(.*\)alpha_3_code="\([^"]\+\)"\(.*\)/\1% \2 \4/
-    #  clear subst. memory for the next t
-    t clear
-    :clear
-    s/\([^%]\+\)%\(.*\)numeric_code="\([^"]\+\)"\(.*\)/\1% \2 \4/
-    t name
-    # no 3166 code--write xx
-    s/%/\tXX %/
-    :name
-    s/\([^%]\+\)%\(.*\)name="\([^"]\+\)"\(.*\)/\1\t\3/
-    s/ \t/\t/g
-    p
-    b
-    :noout
-}
-
-H
diff --git a/iso_639.sed b/iso_639.sed
deleted file mode 100644
index e7e4d05..0000000
--- a/iso_639.sed
+++ /dev/null
@@ -1,31 +0,0 @@
-1,/<iso_639_entries/b
-
-# on each new iso-code process the current one
-\!\(<iso_639_entry\|</iso_639_entries>\)!{
-    x
-    s/^$//
-    # we are on the first iso-code--nothing to process here
-    t
-    # process and write to output
-    s/\s\+/ /g
-    s/<iso_639_entry//
-    s!/\s*>!!
-    # use '%' as a separator of parsed and unparsed input
-    s/\(.*\)iso_639_2T_code="\([^"]\+\)"\(.*\)/\2 % \1 \3/
-    s/\([^%]\+\)%\(.*\)iso_639_2B_code="\([^"]\+\)"\(.*\)/\1\t\3 % \2 \4/
-    #  clear subst. memory for the next t
-    t clear
-    :clear
-    s/\([^%]\+\)%\(.*\)iso_639_1_code="\([^"]\+\)"\(.*\)/\1\t\3 % \2 \4/
-    t name
-    # no 639-1 code--write xx
-    s/%/\tXX %/
-    :name
-    s/\([^%]\+\)%\(.*\)name="\([^"]\+\)"\(.*\)/\1\t\3/
-    s/ \t/\t/g
-    p
-    b
-    :noout
-}
-
-H
diff --git a/lang-exceptions b/lang-exceptions
deleted file mode 100644
index 8568e5f..0000000
--- a/lang-exceptions
+++ /dev/null
@@ -1,99 +0,0 @@
-# This file contains a list of locality-specifc locales for which we ship
-# translations.
-#
-# The easiest way to generate this file is something along the lines of:
-#
-# repoquery -qal | awk -F '/' '/^\/usr\/share\/locale\/[a-z]*[_@]+/ { print $5 }' | sort -u
-# 
-# and then sorting out the various invalid entires. (all_languages, locales
-# with charset definitions (.UTF-8, etc.))
-af_ZA
-am_ET
-ast_ES
-az_IR
-bg_BG
-bn_IN
-ca@valencia
-ca_ES
-ca_ES@valencian
-cs_CZ
-de_AT
-de_CH
-de_DE
-default
-el_GR
-en_AU
-en_CA
-en_GB
-en_US
-en_NZ
-es_AR
-es_CL
-es_CO
-es_CR
-es_DO
-es_EC
-es_ES
-es_GT
-es_HN
-es_MX
-es_NI
-es_PA
-es_PE
-es_PR
-es_SV
-es_UY
-es_VE
-et_EE
-eu_ES
-fa_IR
-fi_FI
-fr_BE
-fr_CA
-fr_CH
-fr_FR
-gl_ES
-he_IL
-hr_HR
-hu_HU
-it_CH
-it_IT
-ja_JP
-ko_KR
-ks@devanagari
-lv_LV
-ms_MY
-my_MM
-nb_NO
-nds_DE
-nl_BE
-nl_NL
-pl_PL
-pt_BR
-pt_PT
-ru_RU
-sl_SI
-sq_AL
-sr_RS
-sv_SE
-uk_UA
-ur_PK
-zh_CN
-zh_CN.GB2312
-zh_HK
-zh_TW
-zh_TW.Big5
-en@boldquot
-en@quot
-nds@NFE
-sr@ije
-sr@ijekavian
-sr@ijekavianlatin
-sr@latin
-sr@Latn
-uz@cyrillic
-uz@Latn
-be@latin
-en@shaw
-brx
-brx_IN
diff --git a/macros.mingw b/macros.mingw
deleted file mode 100644
index a0bd07f..0000000
--- a/macros.mingw
+++ /dev/null
@@ -1,145 +0,0 @@
-# RPM macros for the Fedora MinGW Cross Compiler collection
-
-%mingw_build_targets        mingw32 mingw64
-%mingw_build_win32          1
-%mingw_build_win64          1
-
-%mingw_strip                mingw-strip
-%mingw_objdump              mingw-objdump
-%mingw_objcopy              mingw-objcopy
-
-%mingw_findprovides         %{_rpmconfigdir}/mingw-find-provides.sh %{mingw_build_targets}
-%mingw_findrequires         %{_rpmconfigdir}/mingw-find-requires.sh %{mingw_build_targets}
-%mingw_finddebuginfo        %{_rpmconfigdir}/mingw-find-debuginfo.sh
-
-%mingw_find_lang            %{_rpmconfigdir}/mingw-find-lang.sh %{buildroot}
-
-%mingw_debug_install_post   %{mingw_finddebuginfo} %{_builddir}/%{?buildsubdir} %{mingw_build_targets}
-
-%mingw_debug_package               \
-%if 0%{?mingw_build_win32} == 1    \
-%{?mingw32_debug_package}          \
-%endif                             \
-%if 0%{?mingw_build_win64} == 1    \
-%{?mingw64_debug_package}          \
-%endif                             \
-%{nil}
-
-%mingw_package_header                                         \
-%global __strip %{mingw_strip}                                \
-%global __objdump %{mingw_objdump}                            \
-%if 0%{?rhel} == 6                                            \
-%global _use_internal_dependency_generator 0                  \
-%global __find_requires %{mingw_findrequires}                 \
-%global __find_provides %{mingw_findprovides}                 \
-%endif                                                        \
-%global __debug_install_post %%{mingw_debug_install_post}     \
-%{nil}
-
-%mingw_configure                                       \
-run_mingw_configure()                                  \
-{                                                      \
-[ "%_configure_gnuconfig_hack" = 1 ] && for i in $(find . -name config.guess -o -name config.sub) ; do \
-    [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \
-done ; \
-%if 0%{?mingw_build_win32} == 1                        \
-mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw32_configure} "$@"                         \
-popd                                                   \
-%endif                                                 \
-%if 0%{?mingw_build_win64} == 1                        \
-mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw64_configure} "$@"                         \
-popd                                                   \
-%endif                                                 \
-}                                                      \
-run_mingw_configure
-
-%mingw_make                                                         \
-run_mingw_make()                                                    \
-{                                                                   \
-%if 0%{?mingw_build_win32} == 1                                     \
-make -C build_win32$MINGW_BUILDDIR_SUFFIX "$@" $MINGW32_MAKE_ARGS   \
-%endif                                                              \
-%if 0%{?mingw_build_win64} == 1                                     \
-make -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_MAKE_ARGS   \
-%endif                                                              \
-}                                                                   \
-run_mingw_make
-
-%mingw_cmake                                           \
-run_mingw_cmake()                                      \
-{                                                      \
-%if 0%{?mingw_build_win32} == 1                        \
-mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw32_cmake "$@"}                             \
-popd                                                   \
-%endif                                                 \
-%if 0%{?mingw_build_win64} == 1                        \
-mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw64_cmake "$@"}                             \
-popd                                                   \
-%endif                                                 \
-}                                                      \
-run_mingw_cmake
-
-%mingw_cmake_kde4                                      \
-run_mingw_cmake_kde4()                                 \
-{                                                      \
-%if 0%{?mingw_build_win32} == 1                        \
-mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw32_cmake_kde4 "$@"}                        \
-popd                                                   \
-%endif                                                 \
-%if 0%{?mingw_build_win64} == 1                        \
-mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw64_cmake_kde4 "$@"}                        \
-popd                                                   \
-%endif                                                 \
-}                                                      \
-run_mingw_cmake_kde4
-
-%mingw_qmake_qt4                                       \
-run_mingw_qmake_qt4()                                  \
-{                                                      \
-%if 0%{?mingw_build_win32} == 1                        \
-mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw32_qmake_qt4} "$@"                         \
-popd                                                   \
-%endif                                                 \
-%if 0%{?mingw_build_win64} == 1                        \
-mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw64_qmake_qt4} "$@"                         \
-popd                                                   \
-%endif                                                 \
-}                                                      \
-run_mingw_qmake_qt4
-
-%mingw_qmake_qt5                                       \
-run_mingw_qmake_qt5()                                  \
-{                                                      \
-%if 0%{?mingw_build_win32} == 1                        \
-mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw32_qmake_qt5} "$@"                         \
-popd                                                   \
-%endif                                                 \
-%if 0%{?mingw_build_win64} == 1                        \
-mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw64_qmake_qt5} "$@"                         \
-popd                                                   \
-%endif                                                 \
-}                                                      \
-run_mingw_qmake_qt5
-
-# Deprecated:
-%mingw_make_install         %mingw_make install
diff --git a/macros.mingw32 b/macros.mingw32
deleted file mode 100644
index a3662ca..0000000
--- a/macros.mingw32
+++ /dev/null
@@ -1,169 +0,0 @@
-# RPM macros for Fedora MinGW.
-
-%mingw32_pkg_name        %(echo %{name} | sed 's/^mingw-/mingw32-/')
-%mingw32_target          i686-w64-mingw32
-
-# Paths.
-%mingw32_sysroot         %{_prefix}/%{mingw32_target}/sys-root
-%mingw32_prefix          %{mingw32_sysroot}/mingw
-%mingw32_exec_prefix     %{mingw32_prefix}
-%mingw32_bindir          %{mingw32_exec_prefix}/bin
-%mingw32_sbindir         %{mingw32_exec_prefix}/sbin
-%mingw32_libexecdir      %{mingw32_exec_prefix}/libexec
-%mingw32_libdir          %{mingw32_exec_prefix}/lib
-%mingw32_datadir         %{mingw32_prefix}/share
-%mingw32_docdir          %{mingw32_prefix}/share/doc
-%mingw32_infodir         %{mingw32_prefix}/share/info
-%mingw32_mandir          %{mingw32_prefix}/share/man
-%mingw32_sysconfdir      %{mingw32_prefix}/etc
-%mingw32_sharedstatedir  %{mingw32_prefix}/com
-%mingw32_localstatedir   %{mingw32_prefix}/var
-%mingw32_includedir      %{mingw32_prefix}/include
-
-# Build macros.
-%mingw32_host            %{mingw32_target}
-
-%mingw32_cflags          %{mingw32_cppflags} -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
-%mingw32_cppflags        %{nil}
-%mingw32_ldflags         %{nil}
-
-%mingw32_cc              %{mingw32_target}-gcc
-%mingw32_cxx             %{mingw32_target}-g++
-%mingw32_cpp             %{mingw32_target}-gcc -E
-%mingw32_addr2line       %{mingw32_target}-addr2line
-%mingw32_ar              %{mingw32_target}-ar
-%mingw32_as              %{mingw32_target}-as
-%mingw32_dlltool         %{mingw32_target}-dlltool
-%mingw32_dllwrap         %{mingw32_target}-dllwrap
-%mingw32_gcov            %{mingw32_target}-gcov
-%mingw32_gprof           %{mingw32_target}-gprof
-%mingw32_ld              %{mingw32_target}-ld
-%mingw32_nm              %{mingw32_target}-nm
-%mingw32_objcopy         %{mingw32_target}-objcopy
-%mingw32_objdump         %{mingw32_target}-objdump
-%mingw32_ranlib          %{mingw32_target}-ranlib
-%mingw32_readelf         %{mingw32_target}-readelf
-%mingw32_size            %{mingw32_target}-size
-%mingw32_strings         %{mingw32_target}-strings
-%mingw32_strip           %{mingw32_target}-strip
-%mingw32_windmc          %{mingw32_target}-windmc
-%mingw32_windres         %{mingw32_target}-windres
-
-%mingw32_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
-  if test -z "$PATH_ORIG" ; then \
-    PATH_ORIG="$PATH"; export PATH_ORIG; \
-  fi; \
-  PATH="%{mingw32_bindir}:$PATH_ORIG"; export PATH; \
-  HOST_CC=gcc; export HOST_CC; \
-  unset PKG_CONFIG_PATH; \
-  _PREFIX="%{_bindir}/%{mingw32_target}-"; \
-  for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \
-    x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
-    declare -x $x="$i" ; export $x; \
-  done; \
-  unset _PREFIX; \
-  CC="${MINGW32_CC:-%mingw32_cc}"; export CC; \
-  CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \
-  CPPFLAGS="${MINGW32_CPPFLAGS-%mingw32_cppflags}"; export CPPFLAGS; \
-  if [ -x "%{_bindir}/%{mingw32_cxx}" ]; then \
-    CXX="${MINGW32_CXX:-%mingw32_cxx}"; export CXX; \
-    CXXFLAGS="${MINGW32_CXXFLAGS-%mingw32_cflags}"; export CXXFLAGS; \
-  else \
-    CXX=; export CXX; \
-    ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \
-    CXXFLAGS=; export CXXFLAGS; \
-  fi; \
-  LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \
-  for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \
-    x=`basename $i|tr "a-z+-." "A-ZX_"`; \
-    declare -x $x="$i" ; export $x; \
-  done; \
-  unset x i
-
-%mingw32_pkg_config %{mingw32_target}-pkg-config
-
-%mingw32_configure %{mingw32_env} ; \
-  __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\
-  $__mingw32_topdir/configure \\\
-	--host=%{mingw32_host} \\\
-	--build=%_build \\\
-	--target=%{mingw32_target} \\\
-	--prefix=%{mingw32_prefix} \\\
-	--exec-prefix=%{mingw32_exec_prefix} \\\
-	--bindir=%{mingw32_bindir} \\\
-	--sbindir=%{mingw32_sbindir} \\\
-	--sysconfdir=%{mingw32_sysconfdir} \\\
-	--datadir=%{mingw32_datadir} \\\
-	--includedir=%{mingw32_includedir} \\\
-	--libdir=%{mingw32_libdir} \\\
-	--libexecdir=%{mingw32_libexecdir} \\\
-	--localstatedir=%{mingw32_localstatedir} \\\
-	--sharedstatedir=%{mingw32_sharedstatedir} \\\
-	--mandir=%{mingw32_mandir} \\\
-	--infodir=%{mingw32_infodir} \\\
-	${MINGW_CONFIGURE_ARGS} \\\
-	${MINGW32_CONFIGURE_ARGS}
-
-%mingw32_make %{mingw32_env} ; \
-  make \\\
-	prefix=%{mingw32_prefix} \\\
-	exec_prefix=%{mingw32_exec_prefix} \\\
-	bindir=%{mingw32_bindir} \\\
-	sbindir=%{mingw32_sbindir} \\\
-	sysconfdir=%{mingw32_sysconfdir} \\\
-	datadir=%{mingw32_datadir} \\\
-	includedir=%{mingw32_includedir} \\\
-	libdir=%{mingw32_libdir} \\\
-	libexecdir=%{mingw32_libexecdir} \\\
-	localstatedir=%{mingw32_localstatedir} \\\
-	sharedstatedir=%{mingw32_sharedstatedir} \\\
-	mandir=%{mingw32_mandir} \\\
-	infodir=%{mingw32_infodir}
-
-%mingw32_cmake_generic %{mingw32_env} ; \
-  PKG_CONFIG_LIBDIR="%{mingw32_libdir}/pkgconfig:%{mingw32_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
-  if test -f CMakeLists.txt; then __mingw32_topdir=.; \\\
-  elif test -f ../CMakeLists.txt; then __mingw32_topdir=..; \\\
-  else __mingw32_topdir=""; fi; \\\
-  if test "${MINGW_CMAKE_NO_VERBOSE}" == "" ; then \
-    MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON" \
-  fi \
-  PATH=%{_prefix}/%{mingw32_target}/bin:$PATH %__cmake \\\
-        -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32.cmake \\\
-        -DBUILD_SHARED_LIBS:BOOL=ON \\\
-        -DSYSCONF_INSTALL_DIR:PATH=%{mingw32_sysconfdir} \\\
-        -DSHARE_INSTALL_PREFIX:PATH=%{mingw32_datadir} \\\
-        -DCMAKE_INSTALL_PREFIX:PATH=%{mingw32_prefix} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw32_libdir} \\\
-        ${MINGW_CMAKE_ARGS} \\\
-        ${MINGW32_CMAKE_ARGS} \\\
-        "$@" $__mingw32_topdir
-
-%mingw32_cmake \
-  MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}" \
-  %mingw32_cmake_generic
-
-%mingw32_cmake_kde4 \
-  MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}/kde4" \
-  %mingw32_cmake_generic
-
-%mingw32_qmake_qt4 /usr/bin/mingw32-qmake-qt4
-%mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
-
-%mingw32_description This is the cross-compiled version of this library / tool.\
-You should only install this package if you want to cross-compile programs for \
-Win32 (32 bit Windows).
-
-%mingw32_debug_package                                                   \
-%package -n %{mingw32_pkg_name}-debuginfo                                \
-Summary: Debug information for package %{mingw32_pkg_name}               \
-Group: Development/Debug                                                 \
-BuildArch: noarch                                                        \
-%description -n %{mingw32_pkg_name}-debuginfo                            \
-This package provides debug information for package %{mingw32_pkg_name}. \
-Debug information is useful when developing applications that use this   \
-package or when debugging this package.                                  \
-%files -n %{mingw32_pkg_name}-debuginfo -f mingw32-debugfiles.list       \
-%defattr(-,root,root,-)                                                  \
-%{nil}
-
diff --git a/macros.mingw64 b/macros.mingw64
deleted file mode 100644
index 8db57f4..0000000
--- a/macros.mingw64
+++ /dev/null
@@ -1,169 +0,0 @@
-# RPM macros for Fedora MinGW.
-
-%mingw64_pkg_name        %(echo %{name} | sed 's/^mingw-/mingw64-/')
-%mingw64_target          x86_64-w64-mingw32
-
-# Paths.
-%mingw64_sysroot         %{_prefix}/%{mingw64_target}/sys-root
-%mingw64_prefix          %{mingw64_sysroot}/mingw
-%mingw64_exec_prefix     %{mingw64_prefix}
-%mingw64_bindir          %{mingw64_exec_prefix}/bin
-%mingw64_sbindir         %{mingw64_exec_prefix}/sbin
-%mingw64_libexecdir      %{mingw64_exec_prefix}/libexec
-%mingw64_libdir          %{mingw64_exec_prefix}/lib
-%mingw64_datadir         %{mingw64_prefix}/share
-%mingw64_docdir          %{mingw64_prefix}/share/doc
-%mingw64_infodir         %{mingw64_prefix}/share/info
-%mingw64_mandir          %{mingw64_prefix}/share/man
-%mingw64_sysconfdir      %{mingw64_prefix}/etc
-%mingw64_sharedstatedir  %{mingw64_prefix}/com
-%mingw64_localstatedir   %{mingw64_prefix}/var
-%mingw64_includedir      %{mingw64_prefix}/include
-
-# Build macros.
-%mingw64_host            %{mingw64_target}
-
-%mingw64_cflags          %{mingw64_cppflags} -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
-%mingw64_cppflags        %{nil}
-%mingw64_ldflags         %{nil}
-
-%mingw64_cc              %{mingw64_target}-gcc
-%mingw64_cxx             %{mingw64_target}-g++
-%mingw64_cpp             %{mingw64_target}-gcc -E
-%mingw64_addr2line       %{mingw64_target}-addr2line
-%mingw64_ar              %{mingw64_target}-ar
-%mingw64_as              %{mingw64_target}-as
-%mingw64_dlltool         %{mingw64_target}-dlltool
-%mingw64_dllwrap         %{mingw64_target}-dllwrap
-%mingw64_gcov            %{mingw64_target}-gcov
-%mingw64_gprof           %{mingw64_target}-gprof
-%mingw64_ld              %{mingw64_target}-ld
-%mingw64_nm              %{mingw64_target}-nm
-%mingw64_objcopy         %{mingw64_target}-objcopy
-%mingw64_objdump         %{mingw64_target}-objdump
-%mingw64_ranlib          %{mingw64_target}-ranlib
-%mingw64_readelf         %{mingw64_target}-readelf
-%mingw64_size            %{mingw64_target}-size
-%mingw64_strings         %{mingw64_target}-strings
-%mingw64_strip           %{mingw64_target}-strip
-%mingw64_windmc          %{mingw64_target}-windmc
-%mingw64_windres         %{mingw64_target}-windres
-
-%mingw64_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
-  if test -z "$PATH_ORIG" ; then \
-    PATH_ORIG="$PATH"; export PATH_ORIG; \
-  fi; \
-  PATH="%{mingw64_bindir}:$PATH_ORIG"; export PATH; \
-  HOST_CC=gcc; export HOST_CC; \
-  unset PKG_CONFIG_PATH; \
-  _PREFIX="%{_bindir}/%{mingw64_target}-"; \
-  for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \
-    x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
-    declare -x $x="$i" ; export $x; \
-  done; \
-  unset _PREFIX; \
-  CC="${MINGW64_CC:-%mingw64_cc}"; export CC; \
-  CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \
-  CPPFLAGS="${MINGW64_CPPFLAGS-%mingw64_cppflags}"; export CPPFLAGS; \
-  if [ -x "%{_bindir}/%{mingw64_cxx}" ]; then \
-    CXX="${MINGW64_CXX:-%mingw64_cxx}"; export CXX; \
-    CXXFLAGS="${MINGW64_CXXFLAGS-%mingw64_cflags}"; export CXXFLAGS; \
-  else \
-    CXX=; export CXX; \
-    ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \
-    CXXFLAGS=; export CXXFLAGS; \
-  fi; \
-  LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \
-  for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \
-    x=`basename $i|tr "a-z+-." "A-ZX_"`; \
-    declare -x $x="$i" ; export $x; \
-  done; \
-  unset x i
-
-%mingw64_pkg_config %{mingw64_target}-pkg-config
-
-%mingw64_configure %{mingw64_env} ; \
-  __mingw64_topdir=.; if ! test -x configure; then __mingw64_topdir=..; fi; \\\
-  $__mingw64_topdir/configure \\\
-	--host=%{mingw64_host} \\\
-	--build=%_build \\\
-	--target=%{mingw64_target} \\\
-	--prefix=%{mingw64_prefix} \\\
-	--exec-prefix=%{mingw64_exec_prefix} \\\
-	--bindir=%{mingw64_bindir} \\\
-	--sbindir=%{mingw64_sbindir} \\\
-	--sysconfdir=%{mingw64_sysconfdir} \\\
-	--datadir=%{mingw64_datadir} \\\
-	--includedir=%{mingw64_includedir} \\\
-	--libdir=%{mingw64_libdir} \\\
-	--libexecdir=%{mingw64_libexecdir} \\\
-	--localstatedir=%{mingw64_localstatedir} \\\
-	--sharedstatedir=%{mingw64_sharedstatedir} \\\
-	--mandir=%{mingw64_mandir} \\\
-	--infodir=%{mingw64_infodir} \\\
-	${MINGW_CONFIGURE_ARGS} \\\
-	${MINGW64_CONFIGURE_ARGS}
-
-%mingw64_make %{mingw64_env} ; \
-  make \\\
-	prefix=%{mingw64_prefix} \\\
-	exec_prefix=%{mingw64_exec_prefix} \\\
-	bindir=%{mingw64_bindir} \\\
-	sbindir=%{mingw64_sbindir} \\\
-	sysconfdir=%{mingw64_sysconfdir} \\\
-	datadir=%{mingw64_datadir} \\\
-	includedir=%{mingw64_includedir} \\\
-	libdir=%{mingw64_libdir} \\\
-	libexecdir=%{mingw64_libexecdir} \\\
-	localstatedir=%{mingw64_localstatedir} \\\
-	sharedstatedir=%{mingw64_sharedstatedir} \\\
-	mandir=%{mingw64_mandir} \\\
-	infodir=%{mingw64_infodir}
-
-%mingw64_cmake_generic %{mingw64_env} ; \
-  PKG_CONFIG_LIBDIR="%{mingw64_libdir}/pkgconfig:%{mingw64_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
-  if test -f CMakeLists.txt; then __mingw64_topdir=.; \\\
-  elif test -f ../CMakeLists.txt; then __mingw64_topdir=..; \\\
-  else __mingw64_topdir=""; fi; \\\
-  if test "${MINGW_CMAKE_NO_VERBOSE}" == "" ; then \
-    MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON" \
-  fi \
-  PATH=%{_prefix}/%{mingw64_target}/bin:$PATH %__cmake \\\
-        -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw64.cmake \\\
-        -DBUILD_SHARED_LIBS:BOOL=ON \\\
-        -DSYSCONF_INSTALL_DIR:PATH=%{mingw64_sysconfdir} \\\
-        -DSHARE_INSTALL_PREFIX:PATH=%{mingw64_datadir} \\\
-        -DCMAKE_INSTALL_PREFIX:PATH=%{mingw64_prefix} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw64_libdir} \\\
-        ${MINGW_CMAKE_ARGS} \\\
-        ${MINGW64_CMAKE_ARGS} \\\
-        "$@" $__mingw64_topdir
-
-%mingw64_cmake \
-  MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}" \
-  %mingw64_cmake_generic
-
-%mingw64_cmake_kde4 \
-  MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}/kde4" \
-  %mingw64_cmake_generic
-
-%mingw64_qmake_qt4 /usr/bin/mingw64-qmake-qt4
-%mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
-
-%mingw64_description This is the cross-compiled version of this library / tool.\
-You should only install this package if you want to cross-compile programs for \
-Win64 (64 bit Windows).
-
-%mingw64_debug_package                                                   \
-%package -n %{mingw64_pkg_name}-debuginfo                                \
-Summary: Debug information for package %{mingw64_pkg_name}               \
-Group: Development/Debug                                                 \
-BuildArch: noarch                                                        \
-%description -n %{mingw64_pkg_name}-debuginfo                            \
-This package provides debug information for package %{mingw64_pkg_name}. \
-Debug information is useful when developing applications that use this   \
-package or when debugging this package.                                  \
-%files -n %{mingw64_pkg_name}-debuginfo -f mingw64-debugfiles.list       \
-%defattr(-,root,root,-)                                                  \
-%{nil}
-
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
deleted file mode 100644
index 394a351..0000000
--- a/mingw-filesystem.spec
+++ /dev/null
@@ -1,796 +0,0 @@
-%global debug_package %{nil}
-
-# Place RPM macros in %%{_rpmconfigdir}/macros.d if it exists (RPM 4.11+)
-# Otherwise, use %%{_sysconfdir}/rpm
-# https://lists.fedoraproject.org/pipermail/devel/2014-January/195026.html
-%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
-
-Name:           mingw-filesystem
-Version:        101
-Release:        1%{?dist}
-Summary:        MinGW cross compiler base filesystem and environment
-
-Group:          Development/Libraries
-License:        GPLv2+
-URL:            http://fedoraproject.org/wiki/MinGW
-BuildArch:      noarch
-
-Source0:        COPYING
-Source1:        macros.mingw
-Source2:        macros.mingw32
-Source3:        macros.mingw64
-Source4:        mingw32.sh
-Source5:        mingw64.sh
-Source6:        mingw-find-debuginfo.sh
-Source7:        mingw-find-requires.sh
-Source8:        mingw-find-provides.sh
-Source9:        mingw-scripts.sh
-Source10:       mingw-rpmlint.config
-Source11:       toolchain-mingw32.cmake
-Source12:       toolchain-mingw64.cmake
-Source13:       mingw-find-lang.sh
-Source14:       mingw32.attr
-Source15:       mingw64.attr
-# generated with:
-# (rpm -ql mingw32-crt | grep '\.a$' | while read f ; do i686-w64-mingw32-dlltool   -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-mingw32
-Source16:       standard-dlls-mingw32
-# (rpm -ql mingw64-crt | grep '\.a$' | while read f ; do x86_64-w64-mingw32-dlltool -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-mingw64
-Source17:       standard-dlls-mingw64
-
-# Taken from the Fedora filesystem package
-Source101:      https://fedorahosted.org/filesystem/browser/lang-exceptions
-Source102:      iso_639.sed
-Source103:      iso_3166.sed
-
-BuildRequires:  iso-codes
-
-
-%description
-This package contains the base filesystem layout, RPM macros and
-environment for all Fedora MinGW packages.
-
-This environment is maintained by the Fedora MinGW SIG at:
-
-  http://fedoraproject.org/wiki/SIGs/MinGW
-
-
-%package base
-Summary:        Generic files which are needed for both mingw32-filesystem and mingw64-filesystem
-
-# Obsolete the packages from the test repo
-Obsoletes:      cross-filesystem < 67-2
-Obsoletes:      cross-filesystem-scripts < 67-2
-Obsoletes:      mingw-filesystem < 75-2
-Obsoletes:      mingw-filesystem-scripts < 75-2
-
-%description base
-This package contains the base filesystem layout, RPM macros and
-environment for all Fedora MinGW packages.
-
-This environment is maintained by the Fedora MinGW SIG at:
-
-  http://fedoraproject.org/wiki/SIGs/MinGW
-
-
-%package -n mingw32-filesystem
-Summary:        MinGW cross compiler base filesystem and environment for the win32 target
-Requires:       %{name}-base = %{version}-%{release}
-
-# Note about 'Provides: mingw32(foo.dll)'
-# ------------------------------------------------------------
-#
-# We want to be able to build & install mingw32 libraries without
-# necessarily needing to install wine.  (And certainly not needing to
-# install Windows!)  There is no requirement to have wine installed in
-# order to use the mingw toolchain to develop software (ie. to
-# compile more stuff on top of it), so why require that?
-#
-# So for expediency, this base package provides the "missing" DLLs
-# from Windows.  Another way to do it would be to exclude these
-# proprietary DLLs in our find-requires checking script - essentially
-# it comes out the same either way.
-#
-Provides:       %(sed "s/\(.*\)/mingw32(\1) /g" %{SOURCE16} | tr "\n" " ")
-Provides:       mingw32(mscoree.dll)
-
-%description -n mingw32-filesystem
-This package contains the base filesystem layout, RPM macros and
-environment for all Fedora MinGW packages.
-
-This environment is maintained by the Fedora MinGW SIG at:
-
-  http://fedoraproject.org/wiki/SIGs/MinGW
-
-
-%package -n mingw64-filesystem
-Summary:        MinGW cross compiler base filesystem and environment for the win64 target
-Requires:       %{name}-base = %{version}-%{release}
-
-Provides:       %(sed "s/\(.*\)/mingw64(\1) /g" %{SOURCE17} | tr "\n" " ")
-Provides:       mingw64(mscoree.dll)
-
-%description -n mingw64-filesystem
-This package contains the base filesystem layout, RPM macros and
-environment for all Fedora MinGW packages.
-
-This environment is maintained by the Fedora MinGW SIG at:
-
-  http://fedoraproject.org/wiki/SIGs/MinGW
-
-
-%prep
-%setup -q -c -T
-cp %{SOURCE0} COPYING
-
-
-%build
-# nothing
-
-
-%install
-mkdir -p $RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
-install -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_libexecdir}/mingw-scripts
-
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-pushd $RPM_BUILD_ROOT%{_bindir}
-for i in mingw32-configure mingw32-cmake mingw32-make mingw32-pkg-config \
-         mingw64-configure mingw64-cmake mingw64-make mingw64-pkg-config ; do
-  ln -s %{_libexecdir}/mingw-scripts $i
-done
-popd
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-
-mkdir -p $RPM_BUILD_ROOT%{macrosdir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{macrosdir}/macros.mingw
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{macrosdir}/macros.mingw32
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{macrosdir}/macros.mingw64
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/
-
-# Create the folders required for gcc and binutils
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/lib
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/lib
-
-# The MinGW system root which will contain Windows native binaries
-# and Windows-specific header files, pkgconfig, etc.
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/etc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/include
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/include/sys
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/cmake
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/sbin
-
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/etc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/cmake
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/sbin
-
-# We don't normally package manual pages and info files, except
-# where those are not supplied by a Fedora native package.  So we
-# need to create the directories.
-#
-# Note that some packages try to install stuff in
-#   /usr/x86_64-pc-mingw32/sys-root/man and
-#   /usr/x86_64-pc-mingw32/sys-root/doc
-# but those are both packaging bugs.
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/doc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/info
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/aclocal
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/themes
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/cmake
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/pkgconfig
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/xml
-
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/doc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/info
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/aclocal
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/themes
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/cmake
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/xml
-
-# Own folders for all locales
-# Snippet taken from the Fedora filesystem package
-sed -n -f %{SOURCE102} /usr/share/xml/iso-codes/iso_639.xml > $RPM_BUILD_ROOT/iso_639.tab
-sed -n -f %{SOURCE103} /usr/share/xml/iso-codes/iso_3166.xml > $RPM_BUILD_ROOT/iso_3166.tab
-
-grep -v "^$" $RPM_BUILD_ROOT/iso_639.tab | grep -v "^#" | while read a b c d ; do
-    [[ "$d" =~ "^Reserved" ]] && continue
-    [[ "$d" =~ "^No linguistic" ]] && continue
-
-    locale=$c
-    if [ "$locale" = "XX" ]; then
-        locale=$b
-    fi
-    echo "%lang(${locale}) %{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale/${locale}" >> filelist_mingw32
-    echo "%lang(${locale}) %{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale/${locale}" >> filelist_mingw64
-done
-
-cat %{SOURCE101} | grep -v "^#" | grep -v "^$" | while read loc ; do
-    locale=$loc
-    locality=
-    special=
-    [[ "$locale" =~ "@" ]] && locale=${locale%%%%@*}
-    [[ "$locale" =~ "_" ]] && locality=${locale##*_}
-    [[ "$locality" =~ "." ]] && locality=${locality%%%%.*}
-    [[ "$loc" =~ "_" ]] || [[ "$loc" =~ "@" ]] || special=$loc
-
-    # If the locality is not official, skip it
-    if [ -n "$locality" ]; then
-        grep -q "^$locality" $RPM_BUILD_ROOT/iso_3166.tab || continue
-    fi
-    # If the locale is not official and not special, skip it
-    if [ -z "$special" ]; then
-        egrep -q "[[:space:]]${locale%%_*}[[:space:]]" $RPM_BUILD_ROOT/iso_639.tab || continue
-    fi
-    echo "%lang(${locale}) %{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw32
-    echo "%lang(${locale}) %{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw64
-done
-
-rm -f $RPM_BUILD_ROOT/iso_639.tab
-rm -f $RPM_BUILD_ROOT/iso_3166.tab
-
-cat filelist_mingw32 filelist_mingw64 | grep "locale" | while read a b ; do
-    mkdir -p -m 755 %{buildroot}/$b/LC_MESSAGES
-done
-
-# NB. NOT _libdir
-mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm
-install -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -m 0755 %{SOURCE7} $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -m 0755 %{SOURCE8} $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -m 0755 %{SOURCE13} $RPM_BUILD_ROOT%{_rpmconfigdir}
-
-mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/fileattrs
-install -m 0644 %{SOURCE14} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/
-install -m 0644 %{SOURCE15} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mingw
-install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mingw/
-install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
-
-
-%files base
-%doc COPYING
-%dir %{_sysconfdir}/rpmlint/
-%config(noreplace) %{_sysconfdir}/rpmlint/mingw-rpmlint.config
-%{macrosdir}/macros.mingw
-%{_libexecdir}/mingw-scripts
-%{_rpmconfigdir}/mingw*
-%dir %{_datadir}/mingw/
-
-%files -n mingw32-filesystem
-%{macrosdir}/macros.mingw32
-%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
-%{_bindir}/mingw32-configure
-%{_bindir}/mingw32-cmake
-%{_bindir}/mingw32-make
-%{_bindir}/mingw32-pkg-config
-%{_prefix}/i686-w64-mingw32
-%{_rpmconfigdir}/fileattrs/mingw32.attr
-%{_datadir}/mingw/toolchain-mingw32.cmake
-
-%files -n mingw64-filesystem
-%{macrosdir}/macros.mingw64
-%config(noreplace) %{_sysconfdir}/profile.d/mingw64.sh
-%{_bindir}/mingw64-configure
-%{_bindir}/mingw64-cmake
-%{_bindir}/mingw64-make
-%{_bindir}/mingw64-pkg-config
-%{_prefix}/x86_64-w64-mingw32
-%{_rpmconfigdir}/fileattrs/mingw64.attr
-%{_datadir}/mingw/toolchain-mingw64.cmake
-
-
-%changelog
-* Sun May  8 2016 Erik van Pienbroek <epienbro@fedoraproject.org> - 101-1
-- Update config.{guess,sub} in %%mingw_configure (#1288256)
-- Regenerated list of default win32 DLL's
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Apr 11 2015 Erik van Pienbroek <epienbro@fedoraproject.org> - 100-1
-- Various CMake improvements:
-  * The toolchain files /usr/share/data/mingw/toolchain-mingw32.cmake
-    and /usr/share/data/mingw/toolchain-mingw64.cmake don't have
-    an uppercase character in their file name any more
-  * Add CMAKE_SYSTEM_PROCESSOR to the CMake toolchain files
-  * Removed Boost_COMPILER from the CMake toolchain files as
-    it was unused and broken anyway
-  * Made the RPM macros mingw32_cmake, mingw32_cmake_kde4,
-    mingw64_cmake and mingw64_cmake_kde4 more generic
-  * Removed the rpath references as mingw doesn't support rpath
-  * Allow verbose CMake output to be disabled by setting the
-    environment variable MINGW_CMAKE_NO_VERBOSE (RHBZ #987644)
-  * When calling the mingw32-cmake and mingw64-cmake wrapper
-    scripts don't use verbose CMake output by default
-  * When using the CMake wrappers, prevent CFLAGS and CXXFLAGS
-    from being set unless they're already set in the current
-    environment (RHBZ #1136069)
-  * Don't set LIB_INSTALL_DIR any more in the CMake macros
-    as it breaks CPack and isn't needed by any of the
-    Fedora MinGW packages (RHBZ #1152696)
-- Accept empty MINGW{32,64}_{C,CPP,CXX}FLAGS environment variables
-- Removed old _mingw32 macros which have been deprecated since Fedora 17
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Feb  8 2014 Erik van Pienbroek <epienbro@fedoraproject.org> - 99-4
-- Place the RPM macros in /usr/lib/rpm/macros.d when using a modern RPM
-
-* Sat Aug  3 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 99-3
-- Own the folders %%{mingw32_libdir}/cmake and %%{mingw64_libdir}/cmake
-- Own all the locale folders below %%{mingw32_datadir}/locale and %%{mingw64_datadir}/locale (RHBZ #798329)
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Jun 15 2013 Kalev Lember <kalevlember@gmail.com> - 99-1
-- Remove invalid macros with '++' in the name
-
-* Sun Jun  2 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 98-2
-- Only set the environment variable PKG_CONFIG_LIBDIR when
-  using the macros %%mingw32_cmake, %%mingw32_cmake_kde4,
-  %%mingw64_cmake or %%mingw64_cmake_kde4
-- Fixes FTBFS of the mingw-matahari package
-
-* Sun May 12 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 98-1
-- Removed the use of the environment variable PKG_CONFIG_LIBDIR
-  While building binaries the tool {i686,x86_64}-w64-mingw32-pkg-config
-  should be used to find out pkg-config information
-  The environment variable PKG_CONFIG already automatically points
-  to the right cross-compiler aware version of pkg-config when
-  the mingw{32,64}-pkg-config packages are installed
-- Fixes compilation of mingw-gtk3 3.9.0 (GNOME BZ #699690)
-- Automatically add R: mingw{32,64}-pkg-config tags when .pc files
-  are detected while building mingw packages
-- Bumped the minimum required version of mingw{32,64}-filesystem
-  to >= 95 in built mingw packages as this is the first version of
-  which was introduced in Fedora with a stable interface
-- Updated the list of DLLs which are part of the Win32 API with
-  the libraries d3dcompiler_46.dll, d3dcsx_46.dll, davclnt.dll,
-  devmgr.dll, devobj.dll and devrtl.dll
-
-* Thu Feb 28 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 97-3
-- Remove %%config from %%{_sysconfdir}/rpm/macros.*
-  (https://fedorahosted.org/fpc/ticket/259).
-- Minor spec fixes.
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 97-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Dec 16 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 97-1
-- Added support for using the environment variables MINGW32_MAKE_ARGS and
-  MINGW64_MAKE_ARGS. These environment variables can be used to  provide
-  additional target-specific arguments when using the %%mingw_make macro
-
-* Mon Dec  3 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 96-3
-- Added support for RHEL6
-
-* Sat Nov 10 2012 Kalev Lember <kalevlember@gmail.com> - 96-2
-- Add provides for mscoree.dll and regenerate the standard-dlls file
-
-* Mon Sep 17 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 96-1
-- Added new macros for Qt5 support, %%mingw32_qmake_qt5, %%mingw64_qmake_qt5,
-  %%mingw_qmake_qt4 and %%mingw_qmake_qt5
-- It isn't necessary to call %%mingw32_env / %%mingw64_env any more
-  in the %%mingw32_qmake_qt4 and %%mingw64_qmake_qt4 macros
-
-* Mon Aug 13 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-14
-- Fix the handling of quoted arguments in the cmake macros
-
-* Tue Jul 24 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-13
-- Make sure the %%mingw_cmake and %%mingw_cmake_kde4 macros respect the
-  environment variable MINGW_BUILDDIR_SUFFIX
-
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 95-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed Jun 13 2012 Kalev Lember <kalevlember@gmail.com> - 95-11
-- Fix syntax error in mingw64_env macro, thanks to Akira TAGOH (#831534)
-
-* Wed Jun  6 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-10
-- Prevent errors when the folders %%{mingw32_prefix} or %%{mingw64_prefix} are missing
-- Fix parse error when -config files containing a . are available
-  in %%{mingw32_bindir} or %%{mingw64_bindir} (RHBZ #657478)
-
-* Thu Apr 19 2012 Kalev Lember <kalevlember@gmail.com> - 95-9
-- Fix whitespace handling in %%mingw_configure and friends
-
-* Sat Mar 17 2012 Kalev Lember <kalevlember@gmail.com> - 95-8
-- Generate the list of mingw32(...) and mingw64(...) DLL name provides from
-  mingw-crt import libraries
-
-* Sat Mar 17 2012 Kalev Lember <kalevlember@gmail.com> - 95-7
-- Define mingw_build_win32/win64 in system macros, so that each
-  individual package wouldn't have to
-
-* Fri Mar 16 2012 Kalev Lember <kalevlember@gmail.com> - 95-6
-- Fix warnings during debuginfo generation
-
-* Fri Mar 16 2012 Kalev Lember <kalevlember@gmail.com> - 95-5
-- Simplify the mingw_make_install macro, also moving it to the deprecated
-  section
-
-* Mon Mar 12 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-4
-- Added a manual provides for the native windows library ksuser.dll as
-  wine doesn't have an implementation for this library at the moment
-
-* Tue Mar 06 2012 Kalev Lember <kalevlember@gmail.com> - 95-3
-- Merge copy-n-paste duplicate %%mingw32_debug_package code
-- Get rid of the USE_OLD_METHOD hack in mingw-find-debuginfo.sh
-- Add missing %%mingw32_debug_install_post
-
-* Tue Feb 28 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-2
-- Fixed broken summary tags
-
-* Sat Feb 25 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-1
-- Added support for both win32 and win64 targets
-- Fixed rpmlint issues
-- Fixed permissions of the scripts (775 -> 755)
-- Fixed description of the various subpackages
-- Make the various macros compliant with the new packaging guidelines:
-  https://fedorahosted.org/fpc/ticket/71
-- Suppress arch-independent-package-contains-binary-or-object rpmlint
-  errors for static libraries
-- Improved the mingw_configure, mingw_make, mingw_make_install,
-  mingw_cmake and mingw_cmake_kde4 RPM macros so packagers don't need
-  to use quotes anymore when using arguments. Thanks to Kalev Lember
-  for the initial proof of concept
-- Dropped the -mms-bitfields argument from the default CFLAGS as
-  it is enabled by default as of gcc 4.7
-- Replaced the CMake defines QT_HEADERS_DIR and QT_LIBRARY_DIR
-  with QT_BINARY_DIR which is a more proper method to make CMake
-  aware of the location of Qt. Thx to Dominik Schmidt for the hint
-- Make sure CMake can detect the qmake-qt4 binary in /usr/$target/bin
-- Make sure CMake can also detect the (native) Qt tools
-  qdbuscpp2xml and qdbusxml2cpp
-- Added new RPM macros mingw_cmake_kde4, mingw32_cmake_kde4 and mingw64_cmake_kde4
-- Added three new environment variables which can be set to
-  influence the behaviour of the cmake macros:
-  MINGW_CMAKE_ARGS, MINGW32_CMAKE_ARGS and MINGW64_CMAKE_ARGS
-- Dropped the mingw32-qmake-qt4 and mingw64-qmake-qt4 wrapper scripts
-  as they're now provided by the mingw{32,64}-qt-qmake packages
-- Added a new RPM macro: %%{?mingw_package_header}
-  Packagers can use this macro instead of the original boilerplate
-  code which is needed for all mingw packages
-- Made argument passing using the backwards compatibility macro %%{_mingw32_cmake} work
-- Fixed an issue in the mingw_cmake macro where it could point to
-  a non-existant CMakeLists.txt file
-- Fixed a bug in the find-requires script which causes all packages to depend
-  on both the mingw32 and the mingw64 toolchains
-- Split out the RPM macros which require both the mingw{32,64}-filesystem
-  packages in a new file and put it in the mingw-filesystem-base package
-- Generate seperate debuginfo packages for mingw32 and mingw64
-- Set the minimum version of R: mingw{32,64}-filesystem to 70
-- Use the correct FSF-address in some scripts
-- Thanks to all the contributors: Erik van Pienbroek, Kalev Lember, Levente
-  Farkas, Marc-Andre Lureau.
-
-* Thu Feb 23 2012 Kalev Lember <kalevlember@gmail.com> - 69-15
-- Rename the source package to mingw-filesystem (#673784)
-
-* Sun Feb  5 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-14
-- Use a more complete list of Win32 default dlls based on the
-  dlls exported by wine (thanks to Levente Farkas). RHBZ #787486
-
-* Tue Jan 31 2012 Kalev Lember <kalevlember@gmail.com> - 69-13
-- Remove the mingw32-pkg-config wrapper as well, now that we have separate
-  mingw32-pkg-config package
-
-* Tue Jan 31 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-12
-- Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now
-  have a mingw32-pkg-config package
-
-* Tue Jan 10 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-11
-- Set Boost_COMPILER to -gcc47 in cmake toolchain file
-
-* Tue Nov 22 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-10
-- Fixed a small regression introduced by the previous release which caused an
-  FTBFS for mingw32-matahari as indicated on the fedora-mingw mailing list
-
-* Wed Nov 16 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-9
-- Added various definitions to the CMake toolchain file (RHBZ #753906)
-
-* Tue Aug 02 2011 Kalev Lember <kalevlember@gmail.com> - 69-8
-- Added avicap32.dll and psapi.dll to the list of Win32 default DLLs
-  (thanks to Farkas Levente)
-
-* Wed Jul 13 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-7
-- Added glu32.dll and wsock32.dll to the list of Win32 default dll's
-
-* Wed Jul  6 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-6
-- Use a more complete list of Win32 default dll's
-
-* Wed Jul 06 2011 Kalev Lember <kalevlember@gmail.com> - 69-5
-- Fixed dep gen with upper case dll names
-
-* Fri Jul  1 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-4
-- The %%{_mingw32_qmake_qt4} macro pointed to an invalid mkspecs name. Fixed
-
-* Tue Jun 28 2011 Kalev Lember <kalev@smartlink.ee> - 69-3
-- Set Boost_COMPILER to -gcc46 in cmake toolchain file
-
-* Sun May 29 2011 Kalev Lember <kalev@smartlink.ee> - 69-2
-- Make sure the -debuginfo subpackages are mingw32- prefixed
-  even if the base package is mingw-
-
-* Tue May 24 2011 Kalev Lember <kalev@smartlink.ee> - 69-1
-- Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/
-- Own the sbin/ directory
-- Fixed the -n option with _mingw32_debug_package macro
-
-* Mon May 23 2011 Kalev Lember <kalev@smartlink.ee> - 68-3
-- Own etc/, share/pkgconfig/, share/xml/ directories
-
-* Sat May 21 2011 Kalev Lember <kalev@smartlink.ee> - 68-2
-- Own the _mingw32_datadir/cmake/ directory
-
-* Fri May 20 2011 Kalev Lember <kalev@smartlink.ee> - 68-1
-- Support RPM 4.9 new "fileattr" dep extraction system
-- Cleaned up the spec file from cruft not needed with latest rpm
-- Generate versionless mingw32-filesystem Requires
-
-* Sat May 14 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 67-1
-- Don't unset PKG_CONFIG_PATH in the wrapper scripts
-  mingw32-pkg-config and i686-pc-mingw32-pkg-config (BZ #688171)
-
-* Sun May 01 2011 Kalev Lember <kalev@smartlink.ee> - 66-1
-- Override boost library suffix in cmake toolchain file
-
-* Thu Mar 17 2011 Kalev Lember <kalev@smartlink.ee> - 65-1
-- Don't error out trying to set illegal LD.BFD variable name
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 64-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Jan 12 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 64-2
-- Own the directory %%{_mingw32_datadir}/themes
-
-* Sun Nov 14 2010 Ivan Romanov <drizt@land.ru> - 64-1
-- Removed -win32 option for mingw32-qmake-qt4 (is obsoletes since qt version 4.7.0)
-- Using win32-g++-fedora-cross instead fedora-win32-cross spec file
-
-* Thu Nov 11 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 63-1
-- Set the CMAKE_RC_COMPILER variable in the CMake toolchain file (RHBZ #652435)
-
-* Tue Oct 19 2010 Ivan Romanov <drizt@land.ru> - 62-2
-- Added mingw32-qmake-qt4
-
-* Mon Oct 11 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 62-1
-- Provide mingw32(odbc32.dll) for Qt
-
-* Sun Sep 12 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 61-1
-- Provide mingw32(gdiplus.dll) for gdk-pixbuf
-
-* Thu Sep  9 2010 Richard W.M. Jones <rjones@redhat.com> - 60-1
-- Provide virtual mingw32(ws2_32.dll) for libvirt.
-
-* Mon Sep 06 2010 Kalev Lember <kalev@smartlink.ee> - 59-1
-- Own /etc/rpmlint/ dir instead of depending on rpmlint package (RHBZ#629791)
-
-* Fri Sep  3 2010 Richard W.M. Jones <rjones@redhat.com> - 58-1
-- Remove requires setup and rpm (RHBZ#629791).
-
-* Tue Jun  8 2010 Richard W.M. Jones <rjones@redhat.com> - 57-1
-- Add provides mingw32(rpcrt4.dll) (RHBZ#594581).
-
-* Mon May 24 2010 Kalev Lember <kalev@smartlink.ee> - 56-2
-- Work around cmake's Qt detection in the toolchain file
-
-* Fri Sep 18 2009 Erik van Pienbroek <epienbro@fedoraproject.org. - 56-1
-- Prevented a circular dependency which caused the i686-pc-mingw32-pkg-config
-  script to be broken. Thanks to Kalev Lember for spotting this bug
-
-* Tue Sep  1 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 55-1
-- The wrapper scripts i686-pc-mingw32-pkg-config, mingw32-pkg-config,
-  mingw32-configure, mingw32-make and mingw32-cmake had a bug where
-  quoted arguments could get interpreted incorrect.
-  Thanks to Michael Ploujnikov for helping out with this issue
-
-* Sat Aug 29 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 54-1
-- Added the file /usr/bin/i686-pc-mingw32-pkg-config which is a wrapper script
-  which calls pkg-config with the right environment variables set (BZ #513825)
-
-* Sun Aug 23 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 53-1
-- Fixed a small rpmlint warning caused by the debuginfo generation macro
-  Thanks to Kalev Lember for spotting this
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 52-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jun 24 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 52-2
-- Updated ChangeLog comment from previous version as the RPM variable
-  __debug_install_post needs to be overridden instead of __os_install_post
-  for -debuginfo subpackage generation
-
-* Mon Jun 22 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 52-1
-- Add script to create -debuginfo subpackages
-  This script was created by Fridrich Strba
-- All mingw32 packages now need to add these lines to their .spec files:
-  %%define __debug_install_post %%{_mingw32_debug_install_post}
-  %%{_mingw32_debug_package}
-
-* Thu Jun  4 2009 Adam Goode <adam@spicenitz.org> - 51-1
-- Add CMake rules
-
-* Tue Apr 21 2009 Richard W.M. Jones <rjones@redhat.com> - 50-4
-- Fix dependency problem with + in DLL name (Thomas Sailer).
-
-* Fri Mar 27 2009 Richard W.M. Jones <rjones@redhat.com> - 50-3
-- Fix up and test mingw32-pkg-config changes.
-
-* Thu Mar 26 2009 Levente Farkas <lfarkas@lfarkas.org> - 50-1
-- Add mingw32-pkg-config.
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 49-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Feb 20 2009 Richard W.M. Jones <rjones@redhat.com> - 49-2
-- Rebuild for mingw32-gcc 4.4
-
-* Thu Feb 19 2009 Richard W.M. Jones <rjones@redhat.com> - 49-1
-- Added virtual provides for mingw32(cfgmgr32.dll) and mingw32(setupapi.dll).
-
-* Wed Feb 18 2009 Richard W.M. Jones <rjones@redhat.com> - 48-1
-- Fix _mingw32_configure.
-
-* Tue Feb 17 2009 Richard W.M. Jones <rjones@redhat.com> - 47-1
-- Rename mingw32-COPYING to COPYING.
-- Rename mingw32-macros.mingw32 to macros.mingw32.
-- _mingw32_configure looks for configure in "." and ".." dirs.
-- Added _mingw32_description.
-- Added mingw32(version.dll) virtual provides (rhbz#485842).
-
-* Sun Feb  1 2009 Richard W.M. Jones <rjones@redhat.com> - 46-1
-- Unset PKG_CONFIG_PATH because /usr/lib/rpm/macros sets it (Erik van
-  Pienbroek).
-
-* Wed Jan 28 2009 Richard W.M. Jones <rjones@redhat.com> - 45-1
-- Use PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH so that native pkgconfig
-  is never searched.
-
-* Mon Jan 26 2009 Richard W.M. Jones <rjones@redhat.com> - 44-1
-- Install rpmlint overrides file to suppress some rpmlint warnings.
-
-* Sat Jan 24 2009 Richard W.M. Jones <rjones@redhat.com> - 43-6
-- Don't claim C++ compiler exists if it's not installed, as this
-  breaks autoconf and (in particular) libtool.
-
-* Wed Jan 14 2009 Richard W.M. Jones <rjones@redhat.com> - 42-1
-- Add pseudo-provides secur32.dll
-
-* Wed Dec 17 2008 Levente Farkas <lfarkas@lfarkas.org> - 41-1
-- Re-add mingw32-make
-
-* Sat Dec  6 2008 Levente Farkas <lfarkas@lfarkas.org> - 40-2
-- Rewrite mingw32-scripts to run in the current shell
-- (Re-add mingw32-make) - Removed by RWMJ.
-- Add mingw32-env to mingw32.sh
-
-* Mon Nov 24 2008 Richard W.M. Jones <rjones@redhat.com> - 39-3
-- Unify mingw32-filesystem packages from all three branches again, and test.
-- Fix mingw32-scripts so it can handle extra parameters correctly.
-- Remove mingw32-env & mingw32-make since neither of them actually work.
-
-* Sun Nov 23 2008 Richard Jones <rjones@redhat.com> - 38-1
-- Added mingw32(glut32.dll).
-
-* Wed Nov 19 2008 Richard Jones <rjones@redhat.com> - 37-1
-- Revert part of the 36-1 patch.  --build option to configure was wrong.
-
-* Wed Nov 19 2008 Richard Jones <rjones@redhat.com> - 36-1
-- Greatly improved macros (Levente Farkas).
-- Added -mms-bitfields.
-
-* Thu Nov 13 2008 Richard Jones <rjones@redhat.com> - 35-1
-- Added mingw32(wldap32.dll) pseudo-provides.
-
-* Wed Oct 29 2008 Richard Jones <rjones@redhat.com> - 34-1
-- Set --prefix correctly.
-
-* Wed Oct 29 2008 Richard Jones <rjones@redhat.com> - 33-1
-- Remove mingw32.{sh,csh} which are unused.
-
-* Mon Oct 27 2008 Richard Jones <rjones@redhat.com> - 32-1
-- Add mingw32-configure script.
-
-* Mon Oct 27 2008 Richard Jones <rjones@redhat.com> - 31-1
-- Update the spec file with explanation of the 'Provides: mingw32(...)'
-  lines for Windows system DLLs.
-
-* Mon Oct  6 2008 Richard Jones <rjones@redhat.com> - 30-1
-- Added _mingw32_cxx.
-
-* Thu Sep 25 2008 Richard Jones <rjones@redhat.com> - 29-1
-- Added _mingw32_as, _mingw32_dlltool, _mingw32_windres.
-
-* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 27-1
-- Begin the grand renaming of mingw -> mingw32.
-- Added mingw32(mscoree.dll).
-
-* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 25-1
-- Add shared aclocal directory.
-
-* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 24-1
-- Remove mingw-defs, since no longer used.
-- Add _mingw_infodir.
-
-* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 23-1
-- Add macros for find-provides/requires scripts
-
-* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 22-1
-- Windows provides OLE32.DLL.
-
-* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 21-1
-- Allow '.' in dll names for find-requires
-- Windows provides GDI32.DLL.
-
-* Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 20-1
-- On 64 bit install in /usr/lib/rpm always.
-
-* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 19-1
-- 'user32.dll' is provided by Windows.
-- Allow '-' in DLL names.
-- More accurate detection of DLLs in requires/provides scripts.
-
-* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 17-1
-- Automatically add mingw-filesystem and mingw-runtime requires.
-- Add --prefix to _mingw_configure macro.
-- Three backslashes required on each continuation line in RPM macros.
-
-* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 14-1
-- Fix path to mingw-find-requires/provides scripts.
-
-* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 12-1
-- Put CFLAGS on a single line to avoid problems in some configure scripts.
-
-* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 10-1
-- Provides certain base Windows DLLs (not literally).
-
-* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 9-1
-- Include RPM dependency generators and definitions.
-
-* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 4-1
-- Add _mingw_cc/cflags/etc. and _mingw_configure macros.
-
-* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 3-1
-- Add _mingw_host macro.
-
-* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 2-1
-- Add _mingw_sysroot macro.
-- Add _mingw_target macro.
-
-* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 1-1
-- Basic filesystem layout.
diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
deleted file mode 100755
index e47df65..0000000
--- a/mingw-find-debuginfo.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# mingw-find-debuginfo.sh - automagically generate debug info and file list
-# for inclusion in an rpm spec file for mingw-* packages.
-
-if [ "$#" -lt 2 ] ; then
-    echo "Usage: $0 <BUILDDIR> [TARGET]..."
-    exit 1
-fi
-
-BUILDDIR=$1
-shift
-
-for f in `find $RPM_BUILD_ROOT -type f -name "*.exe" -or -name "*.dll"`
-do
-	case $(mingw-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
-	    *debuglink*) continue ;;
-	    *debug*) ;;
-	    *gnu.version*)
-		echo "WARNING: "`echo $f | sed -e "s,^$RPM_BUILD_ROOT/*,/,"`" is already stripped!"
-		continue
-		;;
-	    *) continue ;;
-	esac
-
-	echo extracting debug info from $f
-	mingw-objcopy --only-keep-debug $f $f.debug || :
-	pushd `dirname $f`
-	mingw-objcopy --add-gnu-debuglink=`basename $f.debug` --strip-unneeded `basename $f` || :
-	popd
-done
-
-for target in $@; do
-	prefix=`rpm --eval "%{${target}_prefix}"`
-	if [ ! -d $RPM_BUILD_ROOT$prefix ] ; then
-		continue
-	fi
-	find $RPM_BUILD_ROOT$prefix -type f -name "*.exe.debug" -or -name "*.dll.debug" |
-		sed -n -e "s#^$RPM_BUILD_ROOT##p" > $BUILDDIR/${target}-debugfiles.list
-done
diff --git a/mingw-find-lang.sh b/mingw-find-lang.sh
deleted file mode 100755
index 097fc21..0000000
--- a/mingw-find-lang.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Wrapper for the %find_lang macro which splits out the various translations in per-target lists
-
-/usr/lib/rpm/find-lang.sh $*
-if test $? != 0 ; then
-    exit 1
-fi
-
-PACKAGE_NAME=$2
-targets=`rpm --eval '%{mingw_build_targets}'`
-for target in $targets; do
-	prefix=`rpm --eval "%{${target}_prefix}"`
-	cat $2.lang | grep "$prefix" > ${target}-$PACKAGE_NAME.lang
-done
-
-exit 0
diff --git a/mingw-find-provides.sh b/mingw-find-provides.sh
deleted file mode 100755
index 30c6150..0000000
--- a/mingw-find-provides.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# This script reads filenames from STDIN and outputs any relevant provides
-# information that needs to be included in the package.
-
-targets=$@
-if [ -z "$targets" ] ; then
-    echo "Usage: $0 [ mingw32 ] [ mingw64 ]"
-    exit 1
-fi
-
-filelist=`sed "s/['\"]/\\\&/g"`
-
-dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll$')
-
-for f in $dlls; do
-    basename=`basename $f | tr [:upper:] [:lower:]`
-    for target in $targets; do
-        host_triplet=`rpm --eval "%{${target}_target}"`
-        [[ $f =~ .*$host_triplet.* ]] && echo "$target($basename)"
-    done
-done
-
-exit 0
diff --git a/mingw-find-requires.sh b/mingw-find-requires.sh
deleted file mode 100755
index 84686c1..0000000
--- a/mingw-find-requires.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-# This script reads filenames from STDIN and outputs any relevant provides
-# information that needs to be included in the package.
-
-[ -z "$OBJDUMP" ] && OBJDUMP=mingw-objdump
-
-targets=$@
-if [ -z "$targets" ] ; then
-    echo "Usage: $0 [ mingw32 ] [ mingw64 ]"
-    exit 1
-fi
-
-# Get the list of files.
-
-filelist=`sed "s/['\"]/\\\&/g"`
-
-dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
-pkgconfig_files=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(pc)$')
-
-for target in $targets; do
-	dll_found=false
-	host_triplet=`rpm --eval "%{${target}_target}"`
-	for f in $dlls; do
-		if [[ $f =~ .*$host_triplet.* ]]; then
-			$OBJDUMP -p $f | grep 'DLL Name' | grep -Eio '[-._\+[:alnum:]]+\.dll' |
-				tr [:upper:] [:lower:] |
-				sed "s/\(.*\)/$target(\1)/"
-			dll_found=true
-		fi
-	done
-
-	# Add a dependency on filesystem and crt if necessary
-	if [ $dll_found = true ]; then
-		echo "${target}-filesystem >= 95"
-		echo "${target}-crt"
-	fi
-
-	pkgconfig_files_found=false
-	for f in $pkgconfig_files; do
-		if [[ $f =~ .*$host_triplet.* ]]; then
-			pkgconfig_files_found=true
-		fi
-	done
-
-	# Add a dependency on $target-pkg-config if necessary
-	if [ $pkgconfig_files_found = true ]; then
-		echo "${target}-pkg-config"
-	fi
-done | sort -u
diff --git a/mingw-rpmlint.config b/mingw-rpmlint.config
deleted file mode 100644
index 1c43c92..0000000
--- a/mingw-rpmlint.config
+++ /dev/null
@@ -1,24 +0,0 @@
-# rpmlint overrides file.
-# This file filters out MinGW warnings.
-# See: http://fedoraproject.org/wiki/MinGW/Rpmlint
-
-# Unconditionally remove devel-file-in-non-devel rpmlint warning.
-addFilter ("^mingw32-.*devel-file-in-non-devel")
-addFilter ("^mingw64-.*devel-file-in-non-devel")
-
-# /usr/x86_64-pc-mingw32 is permitted by MinGW packaging guidelines.
-addFilter ("^mingw32-.*non-standard-dir-in-usr i686-w64-mingw32")
-addFilter ("^mingw64-.*non-standard-dir-in-usr x86_64-w64-mingw32")
-
-# Permit *.la files (error is a bit odd, but it's what rpmlint prints).
-addFilter ("^mingw32-.*script-without-shebang.*\.la$")
-addFilter ("^mingw64-.*script-without-shebang.*\.la$")
-
-# GCC and libtool create executable archive files.  It's not clear
-# why, but we permit this for now.
-addFilter ("^mingw32-.*spurious-executable-perm.*\.dll\.a$")
-addFilter ("^mingw64-.*spurious-executable-perm.*\.dll\.a$")
-
-# *.a and *.dll.a files are permitted arch-independent objects.
-addFilter ("^mingw32-.*arch-independent-package-contains-binary-or-object.*\.a$")
-addFilter ("^mingw64-.*arch-independent-package-contains-binary-or-object.*\.a$")
diff --git a/mingw-scripts.sh b/mingw-scripts.sh
deleted file mode 100755
index 929a901..0000000
--- a/mingw-scripts.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh -
-
-# mingw-scripts
-# Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones.
-# Copyright (C) 2008 Levente Farkas
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# This is a useful command-line script through which one can use the
-# macros from /etc/rpm/macros.cross, macros.mingw32 and macros.mingw64
-
-if [ "`basename $0`" = "i686-w64-mingw32-pkg-config" ] ; then
-    NAME="mingw32_pkg_config"
-elif [ "`basename $0`" = "x86_64-w64-mingw32-pkg-config" ] ; then
-    NAME="mingw64_pkg_config"
-else
-    NAME="`basename $0|tr -- - _`"
-fi
-
-# When using the CMake wrappers, prevent CFLAGS and CXXFLAGS from being set
-# unless they're already set in the current environment (RHBZ #1136069)
-if [[ $NAME == *cmake* ]] ; then
-    MINGW32_CFLAGS=${MINGW32_CFLAGS:-""}
-    MINGW32_CXXFLAGS=${MINGW32_CXXFLAGS:-""}
-    MINGW64_CFLAGS=${MINGW64_CFLAGS:-""}
-    MINGW64_CXXFLAGS=${MINGW64_CXXFLAGS:-""}
-fi
-
-# NOTE: The use of 'eval' in combination with '$@' is a potential security risk
-#       We should find a more safe replacement for this command
-#       Suggestions are welcome at the Fedora MinGW mailing list
-eval "MINGW_CMAKE_NO_VERBOSE=1 `rpm --eval "%{$NAME}"`" '"$@"'
diff --git a/mingw32.attr b/mingw32.attr
deleted file mode 100644
index 498385b..0000000
--- a/mingw32.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-%__mingw32_provides	%{_rpmconfigdir}/mingw-find-provides.sh mingw32
-%__mingw32_requires	%{_rpmconfigdir}/mingw-find-requires.sh mingw32
-%__mingw32_path		^%{mingw32_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee])$
diff --git a/mingw32.sh b/mingw32.sh
deleted file mode 100644
index 921ad73..0000000
--- a/mingw32.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Environment variables for cross compilers.
-
-alias mingw32-env='eval `rpm --eval %{mingw32_env}`'
diff --git a/mingw64.attr b/mingw64.attr
deleted file mode 100644
index 9e7ab01..0000000
--- a/mingw64.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-%__mingw64_provides	%{_rpmconfigdir}/mingw-find-provides.sh mingw64
-%__mingw64_requires	%{_rpmconfigdir}/mingw-find-requires.sh mingw64
-%__mingw64_path		^%{mingw64_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee])$
diff --git a/mingw64.sh b/mingw64.sh
deleted file mode 100644
index 2913bf0..0000000
--- a/mingw64.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Environment variables for cross compilers.
-
-alias mingw64-env='eval `rpm --eval %{mingw64_env}`'
diff --git a/sources b/sources
deleted file mode 100644
index e69de29..0000000
diff --git a/standard-dlls-mingw32 b/standard-dlls-mingw32
deleted file mode 100644
index 2606332..0000000
--- a/standard-dlls-mingw32
+++ /dev/null
@@ -1,329 +0,0 @@
-aclui.dll
-activeds.dll
-adsldpc.dll
-advapi32.dll
-apcups.dll
-authz.dll
-avicap32.dll
-avifil32.dll
-avrt.dll
-bcrypt.dll
-bootvid.dll
-browcli.dll
-bthprops.cpl
-cabinet.dll
-cap.dll
-cfgmgr32.dll
-classpnp.sys
-clfsw32.dll
-clusapi.dll
-cmutil.dll
-comctl32.dll
-comdlg32.dll
-connect.dll
-credui.dll
-crtdll.dll
-crypt32.dll
-cryptnet.dll
-cryptsp.dll
-cryptxml.dll
-cscapi.dll
-ctl3d32.dll
-d2d1.dll
-d3d11.dll
-d3d8.dll
-d3d9.dll
-d3dcompiler_37.dll
-d3dcompiler_38.dll
-d3dcompiler_39.dll
-d3dcompiler_40.dll
-d3dcompiler_41.dll
-d3dcompiler_42.dll
-d3dcompiler_43.dll
-d3dcompiler_46.dll
-d3dcompiler_47.dll
-d3dcompiler.dll
-d3dcsx_46.dll
-d3dcsxd_43.dll
-d3dim.dll
-d3drm.dll
-d3dx10_33.dll
-d3dx10_34.dll
-d3dx10_35.dll
-d3dx10_36.dll
-d3dx10_37.dll
-d3dx10_38.dll
-d3dx10_39.dll
-d3dx10_40.dll
-d3dx10_41.dll
-d3dx10_42.dll
-d3dx10_43.dll
-d3dx11_42.dll
-d3dx11_43.dll
-d3dx8d.dll
-d3dx9_24.dll
-d3dx9_25.dll
-d3dx9_26.dll
-d3dx9_27.dll
-d3dx9_28.dll
-d3dx9_29.dll
-d3dx9_30.dll
-d3dx9_31.dll
-d3dx9_32.dll
-d3dx9_33.dll
-d3dx9_34.dll
-d3dx9_35.dll
-d3dx9_36.dll
-d3dx9_37.dll
-d3dx9_38.dll
-d3dx9_39.dll
-d3dx9_40.dll
-d3dx9_41.dll
-d3dx9_42.dll
-d3dx9_43.dll
-d3dx9d.dll
-d3dxof.dll
-davclnt.dll
-davhlpr.dll
-dbgeng.dll
-dbghelp.dll
-ddraw.dll
-devmgr.dll
-devobj.dll
-devrtl.dll
-dfscli.dll
-dhcpcsvc6.dll
-dhcpcsvc.dll
-dhcpsapi.dll
-dinput8.dll
-dinput.dll
-dlcapi.dll
-dnsapi.dll
-dplayx.dll
-dpnaddr.dll
-dpnet.dll
-dpnlobby.def
-dpvoice.dll
-dsetup.dll
-dsound.dll
-dsrole.dll
-dssec.dll
-dwmapi.dll
-dwrite.dll
-dxapi.sys
-dxgi.dll
-dxva2.dll
-eappcfg.dll
-eapphost.dll
-eappprxy.dll
-elscore.dll
-esent.dll
-evr.dll
-faultrep.dll
-fwpuclnt.dll
-gdi32.dll
-gdiplus.dll
-genericui.dll
-glaux.dll
-glu32.dll
-glut32.dll
-glut.dll
-gpapi.dll
-gpedit.dll
-gpscript.dll
-gptext.dll
-hal.dll
-hidclass.sys
-hid.dll
-hidparse.sys
-httpapi.dll
-icmui.dll
-igmpagnt.dll
-imagehlp.dll
-imm32.dll
-iphlpapi.dll
-iscsidsc.dll
-kernel32.dll
-ksproxy.ax
-ks.sys
-ksuser.dll
-ktmw32.dll
-logoncli.dll
-lz32.dll
-mapi32.dll
-mcd.sys
-mfcuia32.dll
-mf.dll
-mfplat.dll
-mgmtapi.dll
-mprapi.dll
-mpr.dll
-mqrt.dll
-msacm32.dll
-mscms.dll
-msctf.dll
-msdmo.dll
-msdrm.dll
-mshtml.dll
-mshtmled.dll
-msi.dll
-msimg32.dll
-mstask.dll
-msvcp60.dll
-msvcr100.dll
-msvcr110.dll
-msvcr120d.dll
-msvcr120.dll
-msvcr80.dll
-msvcr90d.dll
-msvcr90.dll
-msvcrt.dll
-msvfw32.dll
-mswsock.dll
-ncrypt.dll
-nddeapi.dll
-ndfapi.dll
-ndis.sys
-netapi32.dll
-netjoin.dll
-netutils.dll
-newdev.dll
-normaliz.dll
-ntdll.dll
-ntdsapi.dll
-ntmsapi.dll
-ntoskrnl.exe
-odbc32.dll
-odbccp32.dll
-ole32.dll
-oleacc.dll
-oleaut32.dll
-olecli32.dll
-oledlg.dll
-olepro32.dll
-olesvr32.dll
-olethk32.dll
-opengl32.dll
-p2pcollab.dll
-p2p.dll
-p2pgraph.dll
-pcwum.dll
-pdh.dll
-pdhui.dll
-penwin32.dll
-pkpd32.dll
-polprocl.dll
-powrprof.dll
-psapi.dll
-quartz.dll
-qutil.dll
-qwave.dll
-rapi.dll
-rasapi32.dll
-rasdlg.dll
-resutils.dll
-rpcdce4.dll
-rpcdiag.dll
-rpchttp.dll
-rpcns4.dll
-rpcrt4.dll
-rstrtmgr.dll
-rtm.dll
-rtutils.dll
-samcli.dll
-schedcli.dll
-scsiport.sys
-secur32.dll
-setupapi.dll
-shell32.dll
-shfolder.dll
-shlwapi.dll
-slc.dll
-slcext.dll
-slwga.dll
-snmpapi.dll
-spoolss.dll
-srvcli.dll
-sspicli.dll
-svrapi.dll
-sxs.dll
-t2embed.dll
-tapi32.dll
-tbs.dll
-tdh.dll
-tdi.sys
-thirdpartyeapdispatcher.dll
-txfw32.dll
-url.dll
-urlmon.dll
-usbcamd2.sys
-usbcamd.sys
-usbd.sys
-usbport.sys
-user32.dll
-userenv.dll
-usp10.dll
-uxtheme.dll
-vdmdbg.dll
-version.dll
-videoprt.sys
-virtdisk.dll
-vssapi.dll
-vss_ps.dll
-vsstrace.dll
-wdsclientapi.dll
-wdsclient.dll
-wdscore.dll
-wdscsl.dll
-wdsimage.dll
-wdstptc.dll
-wdsupgcompl.dll
-wdsutil.dll
-wecapi.dll
-wer.dll
-wevtapi.dll
-wevtfwd.dll
-wiadss.dll
-win32k.sys
-win32spl.dll
-winhttp.dll
-wininet.dll
-winmm.dll
-winscard.dll
-winspool.drv
-winstrm.dll
-wintrust.dll
-winusb.dll
-wkscli.dll
-wlanapi.dll
-wlanui.dll
-wlanutil.dll
-wldap32.dll
-wmilib.sys
-wow32.dll
-ws2_32.dll
-wsdapi.dll
-wsnmp32.dll
-wsock32.dll
-wst.dll
-wtsapi32.dll
-x3daudio1_2.dll
-x3daudio1_3.dll
-x3daudio1_4.dll
-x3daudio1_5.dll
-x3daudio1_6.dll
-x3daudio1_7.dll
-x3daudiod1_7.dll
-xapofx1_0.dll
-xapofx1_1.dll
-xapofx1_2.dll
-xapofx1_3.dll
-xapofx1_4.dll
-xapofx1_5.dll
-xapofxd1_5.dll
-xaudio2_8.dll
-xinput1_1.dll
-xinput1_2.dll
-xinput1_3.dll
-xinput1_4.dll
-xinput9_1_0.dll
diff --git a/standard-dlls-mingw64 b/standard-dlls-mingw64
deleted file mode 100644
index 496a4a7..0000000
--- a/standard-dlls-mingw64
+++ /dev/null
@@ -1,1232 +0,0 @@
-6to4svc.dll
-aaaamon.dll
-acledit.dll
-aclui.dll
-active.dll
-activeds.dll
-admparse.dll
-admwprox.dll
-adptif.dll
-adrot.dll
-adsiis.dll
-adsiisex.dll
-adsldpc.dll
-adsldp.dll
-adsmsext.dll
-adsnt.dll
-advapi32.dll
-advpack.dll
-aelupsvc.dll
-agentanm.dll
-agentctl.dll
-agentdp2.dll
-agentdpv.dll
-agentmpx.dll
-agentpsh.dll
-agentsr.dll
-agrmco64.dll
-agtintl.dll
-aksclass.dll
-alrsvc.dll
-amstream.dll
-apcups.dll
-apphelp.dll
-appmgmts.dll
-aqadmin.dll
-aqueue.dll
-asp.dll
-aspperf.dll
-asycfilt.dll
-atkctrs.dll
-atl.dll
-atmlib.dll
-atrace.dll
-audiosrv.dll
-authz.dll
-autodial.dll
-autodisc.dll
-avicap32.dll
-avifil32.dll
-avrt.dll
-azroles.dll
-azroleui.dll
-basesrv.dll
-batmeter.dll
-batt.dll
-bcrypt.dll
-bidispl.dll
-bitsprx2.dll
-bitsprx3.dll
-bnts.dll
-bootvid.dll
-bprovider.dll
-browscap.dll
-browser.dll
-browseui.dll
-brp_sysinfo.dll
-bthpanux.dll
-bthprops.cpl
-bthserv.dll
-cabinet.dll
-cabview.dll
-camocx.dll
-cards.dll
-catsrv.dll
-catsrvps.dll
-catsrvut.dll
-cdfview.dll
-cdm.dll
-cdosys.dll
-certcli.dll
-certmgr.dll
-certobj.dll
-cfgbkend.dll
-cfgmgr32.dll
-c_gb18030.dll
-chsbrkr.dll
-chtbrkr.dll
-ciadmin.dll
-cic.dll
-cimwin32.dll
-cintime.dll
-ciodm.dll
-c_is2022.dll
-c_iscii.dll
-classpnp.sys
-clbcatq.dll
-clb.dll
-clfsw32.dll
-cliconfg.dll
-clusapi.dll
-cmcfg32.dll
-cmdial32.dll
-cmpbk32.dll
-cmprops.dll
-cmsetacl.dll
-cmutil.dll
-cnbjmon.dll
-cnetcfg.dll
-coadmin.dll
-colbact.dll
-colbcat.dll
-comaddin.dll
-comadmin.dll
-comcat.dll
-comctl32.dll
-comdlg32.dll
-compatui.dll
-compstui.dll
-comrepl.dll
-comres.dll
-comsetup.dll
-comsnap.dll
-comsvcs.dll
-comuid.dll
-confmsp.dll
-connect.dll
-console.dll
-controt.dll
-corpol.dll
-credui.dll
-crtdll.dll
-crypt32.dll
-cryptdlg.dll
-cryptdll.dll
-cryptext.dll
-cryptnet.dll
-cryptsp.dll
-cryptsvc.dll
-cryptui.dll
-cryptxml.dll
-cscapi.dll
-cscdll.dll
-cscui.dll
-csrsrv.dll
-cufat.dll
-d2d1.dll
-d3d11.dll
-d3d8thk.dll
-d3d9.dll
-d3dcompiler_37.dll
-d3dcompiler_38.dll
-d3dcompiler_39.dll
-d3dcompiler_40.dll
-d3dcompiler_41.dll
-d3dcompiler_42.dll
-d3dcompiler_43.dll
-d3dcompiler_46.dll
-d3dcompiler_47.dll
-d3dcompiler.dll
-d3dcsx_46.dll
-d3dcsxd_43.dll
-d3dx10_33.dll
-d3dx10_34.dll
-d3dx10_35.dll
-d3dx10_36.dll
-d3dx10_37.dll
-d3dx10_38.dll
-d3dx10_39.dll
-d3dx10_40.dll
-d3dx10_41.dll
-d3dx10_42.dll
-d3dx10_43.dll
-d3dx11_42.dll
-d3dx11_43.dll
-d3dx9_24.dll
-d3dx9_25.dll
-d3dx9_26.dll
-d3dx9_27.dll
-d3dx9_28.dll
-d3dx9_29.dll
-d3dx9_30.dll
-d3dx9_31.dll
-d3dx9_32.dll
-d3dx9_33.dll
-d3dx9_34.dll
-d3dx9_35.dll
-d3dx9_36.dll
-d3dx9_37.dll
-d3dx9_38.dll
-d3dx9_39.dll
-d3dx9_40.dll
-d3dx9_41.dll
-d3dx9_42.dll
-d3dx9_43.dll
-d3dxof.dll
-danim.dll
-dataclen.dll
-datime.dll
-davclnt.dll
-davcprox.dll
-dbgeng.dll
-dbghelp.dll
-dbnetlib.dll
-dbnmpntw.dll
-dciman32.dll
-ddraw.dll
-ddrawex.dll
-deskadp.dll
-deskmon.dll
-deskperf.dll
-devenum.dll
-devmgr.dll
-devobj.dll
-devrtl.dll
-dfrgifcps.dll
-dfrgsnap.dll
-dfrgui.dll
-dfsshlex.dll
-dgnet.dll
-dhcpcsvc6.dll
-dhcpcsvc.dll
-dhcpmon.dll
-dhcpsapi.dll
-diactfrm.dll
-digest.dll
-dimap.dll
-dimsntfy.dll
-dimsroam.dll
-dinput8.dll
-dinput.dll
-directdb.dll
-diskcopy.dll
-dispex.dll
-dmconfig.dll
-dmdlgs.dll
-dmdskmgr.dll
-dmintf.dll
-dmivcitf.dll
-dmocx.dll
-dmserver.dll
-dmutil.dll
-dnsapi.dll
-dnsrslvr.dll
-docprop2.dll
-docprop.dll
-dpnaddr.dll
-dpnet.dll
-dpnhpast.dll
-dpnhupnp.dll
-dpnlobby.dll
-dpvacm.dll
-dpvoice.dll
-dpvvox.dll
-drprov.dll
-ds32gt.dll
-dsauth.dll
-dsdmo.dll
-dsdmoprp.dll
-dskquota.dll
-dskquoui.dll
-dsound3d.dll
-dsound.dll
-dsprop.dll
-dsprov.dll
-dsquery.dll
-dssec.dll
-dssenh.dll
-dsuiext.dll
-duser.dll
-dwmapi.dll
-dwrite.dll
-dxdiagn.dll
-dxgi.dll
-dxtmsft.dll
-dxtrans.dll
-dxva2.dll
-eappcfg.dll
-eapphost.dll
-eappprxy.dll
-efsadu.dll
-els.dll
-encapi.dll
-ersvc.dll
-es.dll
-esent.dll
-esentprf.dll
-esscli.dll
-eventcls.dll
-eventlog.dll
-evntrprv.dll
-evr.dll
-evtgprov.dll
-exports.dll
-exprfdll.dll
-exstrace.dll
-extmgr.dll
-f3ahvoas.dll
-fastprox.dll
-faultrep.dll
-fcachdll.dll
-fde.dll
-fdeploy.dll
-feclient.dll
-filemgmt.dll
-fldrclnr.dll
-fltlib.dll
-fmifs.dll
-fontext.dll
-fontsub.dll
-framedyn.dll
-fsusd.dll
-ftpctrs2.dll
-ftpmib.dll
-ftpsvc2.dll
-fwcfg.dll
-fwpuclnt.dll
-fx.dll
-fxsapi.dll
-fxscfgwz.dll
-fxscom.dll
-fxscomex.dll
-fxsdrv.dll
-fxsmon.dll
-fxsocm.dll
-fxsperf.dll
-fxsroute.dll
-fxsst.dll
-fxst30.dll
-fxstiff.dll
-fxsui.dll
-fxswzrd.dll
-gcdef.dll
-gdi32.dll
-gdiplus.dll
-genericui.dll
-getuname.dll
-glmf32.dll
-glu32.dll
-gpedit.dll
-gpkcsp.dll
-gptext.dll
-guitrn.dll
-gzip.dll
-h323msp.dll
-hal.dll
-hbaapi.dll
-hgfs.dll
-hhsetup.dll
-hidclass.sys
-hid.dll
-hidparse.sys
-hlink.dll
-hmmapi.dll
-hnetcfg.dll
-hnetmon.dll
-hnetwiz.dll
-hostmib.dll
-hotplug.dll
-hticons.dll
-htrn_jis.dll
-httpapi.dll
-httpext.dll
-httpmib.dll
-httpodbc.dll
-htui.dll
-hypertrm.dll
-iasacct.dll
-iasads.dll
-iashlpr.dll
-iasnap.dll
-iaspolcy.dll
-iasrad.dll
-iassam.dll
-iassdo.dll
-iassvcs.dll
-icaapi.dll
-icfgnt.dll
-icm32.dll
-icmp.dll
-icmui.dll
-icwconn.dll
-icwdl.dll
-icwhelp.dll
-icwphbk.dll
-icwutil.dll
-idq.dll
-ieakeng.dll
-ieaksie.dll
-iedkcs32.dll
-iepeers.dll
-iernonce.dll
-iesetup.dll
-ifmon.dll
-ifsutil.dll
-igmpagnt.dll
-iisadmin.dll
-iiscfg.dll
-iisclex4.dll
-iis.dll
-iisext.dll
-iislog.dll
-iismap.dll
-iisprov.dll
-iisrstap.dll
-iisrtl.dll
-iisui.dll
-iisuiobj.dll
-iisutil.dll
-iisw3adm.dll
-imagehlp.dll
-imedic.dll
-imejpcus.dll
-imekrcic.dll
-imeshare.dll
-imeskdic.dll
-imeskdic.dll
-imeskf.dll
-imgutil.dll
-imjp81k.dll
-imjputyc.dll
-imm32.dll
-imsinsnt.dll
-inetcfg.dll
-inetcomm.dll
-inetmgr.dll
-inetmib1.dll
-inetpp.dll
-inetppui.dll
-infoadmn.dll
-infocomm.dll
-infoctrs.dll
-infosoft.dll
-initpki.dll
-input.dll
-inseng.dll
-iphlpapi.dll
-ipmontr.dll
-ipnathlp.dll
-ippromon.dll
-iprip.dll
-iprop.dll
-iprtprio.dll
-iprtrmgr.dll
-ipsecsnp.dll
-ipsecspd.dll
-ipsmsnap.dll
-ipv6mon.dll
-ipxsap.dll
-irclass.dll
-isapips.dll
-isapitst.dll
-isatq.dll
-iscomlog.dll
-iscsidsc.dll
-isignup2.dll
-itlocal.dll
-itss.dll
-ixsso.dll
-iyuv_32.dll
-jet500.dll
-jscript.dll
-jsproxy.dll
-kbd101a.dll
-kbd101b.dll
-kbd101c.dll
-kbd101.dll
-kbd103.dll
-kbd106.dll
-kbd106n.dll
-kbda1.dll
-kbda2.dll
-kbda3.dll
-kbdal.dll
-kbdarme.dll
-kbdarmw.dll
-kbdax2.dll
-kbdaze.dll
-kbdazel.dll
-kbdbe.dll
-kbdbene.dll
-kbdblr.dll
-kbdbr.dll
-kbdbu.dll
-kbdca.dll
-kbdcan.dll
-kbdcr.dll
-kbdcz1.dll
-kbdcz2.dll
-kbdcz.dll
-kbdda.dll
-kbddiv1.dll
-kbddiv2.dll
-kbddv.dll
-kbdes.dll
-kbdest.dll
-kbdfa.dll
-kbdfc.dll
-kbdfi.dll
-kbdfo.dll
-kbdfr.dll
-kbdgae.dll
-kbdgeo.dll
-kbdgkl.dll
-kbdgr1.dll
-kbdgr.dll
-kbdhe220.dll
-kbdhe319.dll
-kbdheb.dll
-kbdhe.dll
-kbdhela2.dll
-kbdhela3.dll
-kbdhept.dll
-kbdhu1.dll
-kbdhu.dll
-kbdibm02.dll
-kbdic.dll
-kbdindev.dll
-kbdinguj.dll
-kbdinhin.dll
-kbdinkan.dll
-kbdinmar.dll
-kbdinpun.dll
-kbdintam.dll
-kbdintel.dll
-kbdir.dll
-kbdit142.dll
-kbdit.dll
-kbdkaz.dll
-kbdkor.dll
-kbdkyr.dll
-kbdla.dll
-kbdlayout.dll
-kbdlk41a.dll
-kbdlk41j.dll
-kbdlt1.dll
-kbdlt.dll
-kbdlv1.dll
-kbdlv.dll
-kbdmac.dll
-kbdmon.dll
-kbdnec95.dll
-kbdnecat.dll
-kbdnec.dll
-kbdnecnt.dll
-kbdne.dll
-kbdno.dll
-kbdpl1.dll
-kbdpl.dll
-kbdpo.dll
-kbdro.dll
-kbdru1.dll
-kbdru.dll
-kbdsf.dll
-kbdsg.dll
-kbdsl1.dll
-kbdsl.dll
-kbdsp.dll
-kbdsw.dll
-kbdsyr1.dll
-kbdsyr2.dll
-kbdtat.dll
-kbdth0.dll
-kbdth1.dll
-kbdth2.dll
-kbdth3.dll
-kbdtuf.dll
-kbdtuq.dll
-kbduk.dll
-kbdur.dll
-kbdurdu.dll
-kbdusa.dll
-kbdus.dll
-kbdusl.dll
-kbdusr.dll
-kbdusx.dll
-kbduzb.dll
-kbdvntc.dll
-kbdycc.dll
-kbdycl.dll
-kd1394.dll
-kdcom.dll
-kerberos.dll
-kernel32.dll
-keymgr.dll
-korwbrkr.dll
-krnlprov.dll
-ks.sys
-ksuser.dll
-ktmw32.dll
-langwrbk.dll
-licdll.dll
-licmgr.dll
-licwmi.dll
-linkinfo.dll
-lmhsvc.exe
-lmmib2.dll
-lmrt.dll
-loadperf.dll
-localsec.dll
-localspl.dll
-localui.dll
-log.dll
-loghours.dll
-logscript.dll
-lonsint.dll
-lpdsvc.dll
-lpk.dll
-lprhelp.dll
-lprmon.dll
-lprui.dll
-lsasrv.dll
-lz32.dll
-mag_hook.dll
-mailmsg.dll
-mapi32.dll
-marscore.dll
-mcastmib.dll
-mcd32.dll
-mcdsrv32.dll
-mchgrcoi.dll
-mciavi32.dll
-mcicda.dll
-mciole32.dll
-mciqtz32.dll
-mciseq.dll
-mciwave.dll
-mdhcp.dll
-mdminst.dll
-metadata.dll
-mf3216.dll
-mfc42.dll
-mfc42u.dll
-mfcsubs.dll
-mf.dll
-mfplat.dll
-mgmtapi.dll
-midimap.dll
-migism.dll
-miglibnt.dll
-mimefilt.dll
-mlang.dll
-mll_hp.dll
-mll_mtf.dll
-mll_qic.dll
-mmcbase.dll
-mmcndmgr.dll
-mmcshext.dll
-mmfutil.dll
-mmutilse.dll
-mobsync.dll
-modemui.dll
-mofd.dll
-mprapi.dll
-mprddm.dll
-mprdim.dll
-mpr.dll
-mprui.dll
-mqad.dll
-mqcertui.dll
-mqdscli.dll
-mqgentr.dll
-mqise.dll
-mqoa.dll
-mqperf.dll
-mqqm.dll
-mqrtdep.dll
-mqrt.dll
-mqsec.dll
-mqsnap.dll
-mqupgrd.dll
-mqutil.dll
-msaatext.dll
-msacm32.dll
-msadcs.dll
-msadds.dll
-msado15.dll
-msadomd.dll
-msador15.dll
-msadox.dll
-msadrh15.dll
-msafd.dll
-msasn1.dll
-mscandui.dll
-mscat32.dll
-mscms.dll
-msctf.dll
-msctfp.dll
-msdadiag.dll
-msdaosp.dll
-msdaps.dll
-msdart.dll
-msdatl3.dll
-msdfmap.dll
-msdmo.dll
-msdrm.dll
-msdtclog.dll
-msdtcprx.dll
-msdtctm.dll
-msdtcuiu.dll
-msftedit.dll
-msgina.dll
-msgr3en.dll
-msgsvc.dll
-mshtml.dll
-mshtmled.dll
-msident.dll
-msi.dll
-msieftp.dll
-msihnd.dll
-msimg32.dll
-msimtf.dll
-msinfo32.dll
-msiprov.dll
-msir3jp.dll
-msisip.dll
-msjtes40.dll
-mslbui.dll
-msls31.dll
-mslwvtts.dll
-msmqocm.dll
-msobcomm.dll
-msobdl.dll
-msobmain.dll
-msobshel.dll
-msobweb.dll
-msoeacct.dll
-msoe.dll
-msoert2.dll
-mspatcha.dll
-mspmspsn.dll
-msports.dll
-msrating.dll
-msremote.dll
-msrle32.dll
-mssign32.dll
-mssip32.dll
-mstask.dll
-mstime.dll
-mstlsapi.dll
-mstscax.dll
-msutb.dll
-msv1_0.dll
-msvcirt.dll
-msvcp60.dll
-msvcr100.dll
-msvcr110.dll
-msvcr120d.dll
-msvcr120.dll
-msvcr80.dll
-msvcr90d.dll
-msvcr90.dll
-msvcrt.dll
-msvfw32.dll
-msvidc32.dll
-msvidctl.dll
-msw3prt.dll
-mswsock.dll
-msxactps.dll
-msxml3.dll
-msyuv.dll
-mtxclu.dll
-mtxdm.dll
-mtxex.dll
-mtxoci.dll
-mycomput.dll
-mydocs.dll
-narrhook.dll
-navdgf.dll
-ncobjapi.dll
-ncprov.dll
-ncrypt.dll
-ncxp.dll
-nddeapi.dll
-nddenb32.dll
-ndfapi.dll
-ndisnpp.dll
-ndis.sys
-netapi32.dll
-netcfgx.dll
-netid.dll
-netlogon.dll
-netman.dll
-netobjs.dll
-netoc.dll
-netplwiz.dll
-netrap.dll
-netshell.dll
-netui0.dll
-netui1.dll
-netui2.dll
-newdev.dll
-nextlink.dll
-nlhtml.dll
-nntpadm.dll
-nntpapi.dll
-nntpsnap.dll
-normaliz.dll
-npptools.dll
-nshipsec.dll
-ntdll.dll
-ntdsapi.dll
-ntdsbcli.dll
-ntdtcsetup.dll
-ntevt.dll
-ntfsdrv.dll
-ntlanman.dll
-ntlanui.dll
-ntlsapi.dll
-ntmarta.dll
-ntmsapi.dll
-ntmsdba.dll
-ntmsevt.dll
-ntmsmgr.dll
-ntmssvc.dll
-ntoc.dll
-ntoskrnl.exe
-ntprint.dll
-ntshrui.dll
-ntvdm64.dll
-nwprovau.dll
-oakley.dll
-objsel.dll
-occache.dll
-ocmanage.dll
-ocmsn.dll
-ocsbs.dll
-odbc32.dll
-odbc32gt.dll
-odbcbcp.dll
-odbcconf.dll
-odbccp32.dll
-odbccr32.dll
-odbctrac.dll
-oeimport.dll
-oemiglib.dll
-offfilt.dll
-ole32.dll
-oleacc.dll
-oleaut32.dll
-olecli32.dll
-olecnv32.dll
-oledb32.dll
-oledb32r.dll
-oledlg.dll
-oleprn.dll
-olesvr32.dll
-opengl32.dll
-osuninst.dll
-ovprintmondll.dll
-p2pcollab.dll
-p2p.dll
-p2pgraph.dll
-panmap.dll
-pautoenr.dll
-pchsvc.dll
-pcwum.dll
-pdh.dll
-perfctrs.dll
-perfdisk.dll
-perfnet.dll
-perfos.dll
-perfproc.dll
-perfts.dll
-persist.dll
-photowiz.dll
-pid.dll
-pidgen.dll
-pjlmon.dll
-pngfilter.dll
-policman.dll
-polstore.dll
-powrprof.dll
-printui.dll
-profmap.dll
-proppage.dll
-provthrd.dll
-ps5ui.dll
-psapi.dll
-psbase.dll
-pschdprf.dll
-pscript5.dll
-ps.dll
-psnppagn.dll
-pstorec.dll
-pstorsvc.dll
-qasf.dll
-qcap.dll
-qdvd.dll
-qdv.dll
-qedit.dll
-qmgr.dll
-qmgrprxy.dll
-qosname.dll
-quartz.dll
-query.dll
-qutil.dll
-qwave.dll
-rasadhlp.dll
-rasapi32.dll
-rasauto.dll
-raschap.dll
-rasctrs.dll
-rasdlg.dll
-rasman.dll
-rasmans.dll
-rasmontr.dll
-rasmxs.dll
-rasppp.dll
-rasrad.dll
-rassapi.dll
-rasser.dll
-rassistance.dll
-rastapi.dll
-rastls.dll
-rcbdyctl.dll
-rdchost.dll
-rdpcfgex.dll
-rdpsnd.dll
-rdpwsx.dll
-regapi.dll
-regsvc.dll
-regwizctrl.dll
-remotepage.dll
-rend.dll
-resutils.dll
-riched20.dll
-rnr20.dll
-routemsg.dll
-routetab.dll
-rpcdiag.dll
-rpchttp.dll
-rpcns4.dll
-rpcnsh.dll
-rpcref.dll
-rpcrt4.dll
-rpcss.dll
-rsaenh.dll
-rshx32.dll
-rsmps.dll
-rstrtmgr.dll
-rtm.dll
-rtutils.dll
-rwnh.dll
-safrcfiledlg.dll
-safrdm.dll
-safrslv.dll
-samlib.dll
-samsrv.dll
-scarddlg.dll
-sccbase.dll
-sccsccp.dll
-scecli.dll
-scesrv.dll
-schannel.dll
-schedsvc.dll
-sclgntfy.dll
-scredir.dll
-script.dll
-scripto.dll
-scriptpw.dll
-scrobj.dll
-scrptutl.dll
-scrrun.dll
-sdhcinst.dll
-sdpblb.dll
-seclogon.dll
-secur32.dll
-security.dll
-sendcmsg.dll
-sendmail.dll
-sensapi.dll
-senscfg.dll
-sens.dll
-seo.dll
-seos.dll
-serialui.dll
-servdeps.dll
-serwvdrv.dll
-setupapi.dll
-setupqry.dll
-sfc.dll
-sfcfiles.dll
-sfc_os.dll
-sfilter2.dll
-sfmapi.dll
-shdocvw.dll
-shell32.dll
-shfolder.dll
-shgina.dll
-shimeng.dll
-shimgvw.dll
-shlwapi.dll
-shmedia.dll
-shscrap.dll
-shsvcs.dll
-sigtab.dll
-simptcp.exe
-simx.dll
-sisbkup.dll
-skdll.dll
-slayerxp.dll
-slbcsp.dll
-slbiop.dll
-slc.dll
-slcext.dll
-slwga.dll
-smlogcfg.dll
-smtpadm.dll
-smtpapi.dll
-smtpcons.dll
-smtpctrs.dll
-smtpsnap.dll
-smtpsvc.dll
-snapin.dll
-sniffpol.dll
-snmpapi.dll
-snmpcl.dll
-snmpelea.dll
-snmpincl.dll
-snmpmib.exe
-snmpsmir.dll
-snmpsnap.dll
-snmpstup.dll
-snmpthrd.dll
-softpub.dll
-spcommon.dll
-spoolss.dll
-sptip.dll
-spttseng.dll
-sqlsrv32.dll
-sqlxmlx.dll
-srchctls.dll
-srchui.dll
-srclient.dll
-srrstr.dll
-srsvc.dll
-srvsvc.dll
-ssdpapi.dll
-ssdpsrv.dll
-ssinc.dll
-sspicli.dll
-sstub.dll
-staxmem.dll
-stclient.dll
-stdprov.dll
-sti_ci.dll
-sti.dll
-stobject.dll
-streamci.dll
-strmfilt.dll
-subauth.dll
-svcext.dll
-svcpack.dll
-sweeprx.dll
-swprv.dll
-sxs.dll
-synceng.dll
-syncui.dll
-sysinv.dll
-sysmod.dll
-syssetup.dll
-t2embed.dll
-tapi32.dll
-tapi3.dll
-tapiperf.dll
-tapisrv.dll
-tbs.dll
-tcpmib.dll
-tcpmon.dll
-tcpmonui.dll
-tdh.dll
-termmgr.dll
-termsrv.dll
-thawbrkr.dll
-themeui.dll
-tlntsvrps.dll
-traffic.dll
-trialoc.dll
-trigobjs.dll
-trkwks.dll
-tsappcmp.dll
-tsbyuv.dll
-tscfgwmi.dll
-tsd32.dll
-tshoot.dll
-tsoc.dll
-twext.dll
-txflogdll.dll
-txfw32.dll
-ufat.dll
-uihelper.dll
-ulib.dll
-umandlg.dll
-umdmxfrm.dll
-umpnpmgr.dll
-unidrv.dll
-unidrvui.dll
-uniime.dll
-unimdmat.dll
-uniplat.dll
-untfs.dll
-upnp.dll
-upnphost.dll
-upnpui.dll
-ureg.dll
-urlauth.dll
-url.dll
-urlmon.dll
-usbcamd2.sys
-usbd.sys
-usbmon.dll
-usbport.sys
-user32.dll
-userenv.dll
-usp10.dll
-utildll.dll
-uxtheme.dll
-vbscript.dll
-vdsdyndr.dll
-vds_ps.dll
-vdsutil.dll
-vdswmi.dll
-verifier.dll
-version.dll
-vgx.dll
-viewprov.dll
-vmx_mode.dll
-vssapi.dll
-vss_ps.dll
-vsstrace.dll
-vsswmi.dll
-w32time.dll
-w32topl.dll
-w3cache.dll
-w3comlog.dll
-w3core.dll
-w3ctrlps.dll
-w3ctrs.dll
-w3dt.dll
-w3ext.dll
-w3isapi.dll
-w3ssl.dll
-w3tp.dll
-wab32.dll
-wabimp.dll
-wamreg.dll
-wamregps.dll
-wbemcore.dll
-wbemupgd.dll
-wdigest.dll
-wdmaud.drv
-wdsclientapi.dll
-wdsclient.dll
-wdscore.dll
-wdscsl.dll
-wdsimage.dll
-wdstptc.dll
-wdsupgcompl.dll
-wdsutil.dll
-webcheck.dll
-webclnt.dll
-webhits.dll
-wecapi.dll
-wer.dll
-wevtapi.dll
-wevtfwd.dll
-wiadss.dll
-wiarpc.dll
-wiaservc.dll
-wiashext.dll
-win32spl.dll
-winfax.dll
-winhttp.dll
-wininet.dll
-winipsec.dll
-winmm.dll
-winrnr.dll
-winscard.dll
-winspool.drv
-winsrv.dll
-winsta.dll
-wintrust.dll
-winusb.dll
-wkssvc.dll
-wlanapi.dll
-wlanui.dll
-wlanutil.dll
-wldap32.dll
-wlnotify.dll
-wlstore.dll
-wmi2xml.dll
-wmiaprpl.dll
-wmi.dll
-wmilib.sys
-wmiprop.dll
-wmisvc.dll
-wow64cpu.dll
-wow64.dll
-wow64mib.dll
-wow64win.dll
-wpd_ci.dll
-ws2_32.dll
-ws2help.dll
-wscsvc.dll
-wsdapi.dll
-wshatm.dll
-wshbth.dll
-wshcon.dll
-wsock32.dll
-wtsapi32.dll
-x3daudio1_2.dll
-x3daudio1_3.dll
-x3daudio1_4.dll
-x3daudio1_5.dll
-x3daudio1_6.dll
-x3daudio1_7.dll
-x3daudiod1_7.dll
-xapofx1_0.dll
-xapofx1_1.dll
-xapofx1_2.dll
-xapofx1_3.dll
-xapofx1_4.dll
-xapofx1_5.dll
-xapofxd1_5.dll
-xaudio2_8.dll
-xfiles.dll
-xinput1_1.dll
-xinput1_2.dll
-xinput1_3.dll
-xinput1_4.dll
-xinput9_1_0.dll
-zoneoc.dll
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
deleted file mode 100644
index 70f6441..0000000
--- a/toolchain-mingw32.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-SET(CMAKE_SYSTEM_NAME Windows)
-SET(CMAKE_SYSTEM_PROCESSOR x86)
-
-# specify the cross compiler
-SET(CMAKE_C_COMPILER /usr/bin/i686-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER /usr/bin/i686-w64-mingw32-g++)
-
-# where is the target environment
-SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32/sys-root/mingw)
-
-# search for programs in the build host directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-# Make sure Qt can be detected by CMake
-SET(QT_BINARY_DIR /usr/i686-w64-mingw32/bin /usr/bin)
-
-# set the resource compiler (RHBZ #652435)
-SET(CMAKE_RC_COMPILER /usr/bin/i686-w64-mingw32-windres)
-
-# These are needed for compiling lapack (RHBZ #753906)
-SET(CMAKE_Fortran_COMPILER /usr/bin/i686-w64-mingw32-gfortran)
-SET(CMAKE_AR:FILEPATH /usr/bin/i686-w64-mingw32-ar)
-SET(CMAKE_RANLIB:FILEPATH /usr/bin/i686-w64-mingw32-ranlib)
-
diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake
deleted file mode 100644
index b323e11..0000000
--- a/toolchain-mingw64.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-SET(CMAKE_SYSTEM_NAME Windows)
-SET(CMAKE_SYSTEM_PROCESSOR x86_64)
-
-# specify the cross compiler
-SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32-g++)
-
-# where is the target environment
-SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32/sys-root/mingw)
-
-# search for programs in the build host directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-# Make sure Qt can be detected by CMake
-SET(QT_BINARY_DIR /usr/x86_64-w64-mingw32/bin /usr/bin)
-
-# set the resource compiler (RHBZ #652435)
-SET(CMAKE_RC_COMPILER /usr/bin/x86_64-w64-mingw32-windres)
-
-# These are needed for compiling lapack (RHBZ #753906)
-SET(CMAKE_Fortran_COMPILER /usr/bin/x86_64-w64-mingw32-gfortran)
-SET(CMAKE_AR:FILEPATH /usr/bin/x86_64-w64-mingw32-ar)
-SET(CMAKE_RANLIB:FILEPATH /usr/bin/x86_64-w64-mingw32-ranlib)
-

From 64521a8bdbe603ea1ae78e17641b7cc22fcd33a0 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 1 May 2020 09:55:55 +0100
Subject: [PATCH 19/90] Quote sequences to tr to avoid the shell handling them
 (#1830233)

---
 mingw-filesystem.spec  | 7 +++++--
 mingw-find-provides.sh | 4 ++--
 mingw-find-requires.sh | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 07e8a82..d3fd47b 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        110
-Release:        2%{?dist}
+Version:        111
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Fri May 01 2020 David Woodhouse <dwmw2@infradead.org> - 111-1
+- Quote tr sequences like '[blank]' to prevent the shell from doing so (#1830233)
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/mingw-find-provides.sh b/mingw-find-provides.sh
index 30c6150..1bcb2da 100755
--- a/mingw-find-provides.sh
+++ b/mingw-find-provides.sh
@@ -11,10 +11,10 @@ fi
 
 filelist=`sed "s/['\"]/\\\&/g"`
 
-dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll$')
+dlls=$(echo $filelist | tr '[:blank:]' '\n' | grep '\.dll$')
 
 for f in $dlls; do
-    basename=`basename $f | tr [:upper:] [:lower:]`
+    basename=`basename $f | tr '[:upper:]' '[:lower:]'`
     for target in $targets; do
         host_triplet=`rpm --eval "%{${target}_target}"`
         [[ $f =~ .*$host_triplet.* ]] && echo "$target($basename)"
diff --git a/mingw-find-requires.sh b/mingw-find-requires.sh
index 84686c1..d824272 100755
--- a/mingw-find-requires.sh
+++ b/mingw-find-requires.sh
@@ -15,8 +15,8 @@ fi
 
 filelist=`sed "s/['\"]/\\\&/g"`
 
-dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
-pkgconfig_files=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(pc)$')
+dlls=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(dll|exe)$')
+pkgconfig_files=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(pc)$')
 
 for target in $targets; do
 	dll_found=false
@@ -24,7 +24,7 @@ for target in $targets; do
 	for f in $dlls; do
 		if [[ $f =~ .*$host_triplet.* ]]; then
 			$OBJDUMP -p $f | grep 'DLL Name' | grep -Eio '[-._\+[:alnum:]]+\.dll' |
-				tr [:upper:] [:lower:] |
+				tr '[:upper:]' '[:lower:]' |
 				sed "s/\(.*\)/$target(\1)/"
 			dll_found=true
 		fi

From 3ad1f950f20dcc998f98dc14510b6ed40d36ee49 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 22 May 2020 21:44:20 +0200
Subject: [PATCH 20/90] Fix mingw_meson resulting in ERROR: Unable to determine
 dynamic linker

---
 macros.mingw32        | 4 ++--
 macros.mingw64        | 4 ++--
 mingw-filesystem.spec | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 87af379..719c7d7 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -152,8 +152,8 @@
 %mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
 
 %mingw32_meson %{mingw32_env} ; \
-  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\
-  export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_ldflags}"; \\\
+  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
+  export CFLAGS="%{mingw32_cflags}" CXXFLAGS="%{mingw32_cflags}" LDFLAGS="%{mingw32_ldflags}"; \\\
   if test -f meson.build; then __mingw32_topdir=.; \\\
   elif test -f ../meson.build; then __mingw32_topdir=..; \\\
   else __mingw32_topdir=""; fi; \\\
diff --git a/macros.mingw64 b/macros.mingw64
index 39b4f4f..425bc13 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -152,8 +152,8 @@
 %mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
 
 %mingw64_meson %{mingw64_env} ; \
-  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\
-  export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_ldflags}"; \\\
+  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
+  export CFLAGS="%{mingw64_cflags}" CXXFLAGS="%{mingw64_cflags}" LDFLAGS="%{mingw64_ldflags}"; \\\
   if test -f meson.build; then __mingw64_topdir=.; \\\
   elif test -f ../meson.build; then __mingw64_topdir=..; \\\
   else __mingw64_topdir=""; fi; \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index d3fd47b..072d1cf 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        111
+Version:        112
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Fri May 22 2020 Sandro Mani <manisandro@gmail.com> - 112-1
+- Fix %%mingw_meson resulting in ERROR: Unable to determine dynamic linker
+
 * Fri May 01 2020 David Woodhouse <dwmw2@infradead.org> - 111-1
 - Quote tr sequences like '[blank]' to prevent the shell from doing so (#1830233)
 

From 717f2a929bd25b62a0427e8e5c3792a0939dbfce Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sat, 23 May 2020 14:00:10 +0200
Subject: [PATCH 21/90] Add %mingw_make_build and %mingw_make_install

---
 macros.mingw          | 9 +++++----
 mingw-filesystem.spec | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/macros.mingw b/macros.mingw
index c152d6d..78417ef 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -62,10 +62,10 @@ run_mingw_configure
 run_mingw_make()                                                    \
 {                                                                   \
 %if 0%{?mingw_build_win32} == 1                                     \
-make -C build_win32$MINGW_BUILDDIR_SUFFIX "$@" $MINGW32_MAKE_ARGS   \
+%{__make} -C build_win32$MINGW_BUILDDIR_SUFFIX "$@" $MINGW32_MAKE_ARGS   \
 %endif                                                              \
 %if 0%{?mingw_build_win64} == 1                                     \
-make -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_MAKE_ARGS   \
+%{__make} -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_MAKE_ARGS   \
 %endif                                                              \
 }                                                                   \
 run_mingw_make
@@ -184,5 +184,6 @@ DESTDIR=%{buildroot} ninja -C build_win64$MINGW_BUILDDIR_SUFFIX install \
 }                                                                       \
 run_mingw_ninja_install
 
-# Deprecated:
-%mingw_make_install         %mingw_make install
+
+%mingw_make_build           %mingw_make %{_make_output_sync} %{?_smp_mflags} %{_make_verbose}
+%mingw_make_install         %mingw_make install DESTDIR=%{?buildroot} INSTALL="%{__install} -p"
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 072d1cf..cf860f5 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        112
+Version:        113
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Sat May 23 2020 Sandro Mani <manisandro@gmail.com> - 113-1
+- Add %%mingw_make_build and %%mingw_make_install
+
 * Fri May 22 2020 Sandro Mani <manisandro@gmail.com> - 112-1
 - Fix %%mingw_meson resulting in ERROR: Unable to determine dynamic linker
 

From 6de060b5d3398eb052b2d6388ce9001e2a31f779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 14 Jul 2020 10:30:42 +0100
Subject: [PATCH 22/90] Add meson hint for libgcrypt-config on mingw cross
 builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://bugzilla.redhat.com/show_bug.cgi?id=1856446

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 mingw-filesystem.spec   | 5 ++++-
 toolchain-mingw32.meson | 1 +
 toolchain-mingw64.meson | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index cf860f5..747e9a8 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        113
+Version:        114
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Tue Jul 14 2020 Daniel P. Berrangé <berrange@redhat.com> - 114-1
+- Add meson hint for libgcrypt-config on mingw cross builds (#1856446)
+
 * Sat May 23 2020 Sandro Mani <manisandro@gmail.com> - 113-1
 - Add %%mingw_make_build and %%mingw_make_install
 
diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson
index edae1d6..4d3000b 100644
--- a/toolchain-mingw32.meson
+++ b/toolchain-mingw32.meson
@@ -9,6 +9,7 @@ ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
 strip = '/usr/bin/i686-w64-mingw32-strip'
 windres = '/usr/bin/i686-w64-mingw32-windres'
 dlltool = '/usr/bin/i686-w64-mingw32-dlltool'
+libgcrypt-config = '/usr/i686-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
 
 [properties]
 root = '/usr/i686-w64-mingw32/sys-root/mingw'
diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson
index 195df84..918bee0 100644
--- a/toolchain-mingw64.meson
+++ b/toolchain-mingw64.meson
@@ -9,6 +9,7 @@ ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
 strip = '/usr/bin/x86_64-w64-mingw32-strip'
 windres = '/usr/bin/x86_64-w64-mingw32-windres'
 dlltool = '/usr/bin/x86_64-w64-mingw32-dlltool'
+libgcrypt-config = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
 
 [properties]
 root = '/usr/x86_64-w64-mingw32/sys-root/mingw'

From 3e5c7d77ddbac9665e5013823afbcbf446e9cdf8 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sun, 19 Jul 2020 20:13:57 +0200
Subject: [PATCH 23/90] Add -fstack-protector to LDFLAGS

---
 macros.mingw32        | 2 +-
 macros.mingw64        | 2 +-
 mingw-filesystem.spec | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 719c7d7..b9a635f 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -25,7 +25,7 @@
 
 %mingw32_cflags          %{mingw32_cppflags} -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw32_cppflags        %{nil}
-%mingw32_ldflags         %{nil}
+%mingw32_ldflags         -fstack-protector
 
 %mingw32_cc              %{mingw32_target}-gcc
 %mingw32_cxx             %{mingw32_target}-g++
diff --git a/macros.mingw64 b/macros.mingw64
index 425bc13..9bc2113 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -25,7 +25,7 @@
 
 %mingw64_cflags          %{mingw64_cppflags} -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw64_cppflags        %{nil}
-%mingw64_ldflags         %{nil}
+%mingw64_ldflags         -fstack-protector
 
 %mingw64_cc              %{mingw64_target}-gcc
 %mingw64_cxx             %{mingw64_target}-g++
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 747e9a8..37cba09 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        114
+Version:        115
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Thu Jul 02 2020 Sandro Mani <manisandro@gmail.com> - 115-1
+- Add -fstack-protector to LDFLAGS (since we carry -D_FORTIFY_SOURCE=2 in cflags, see https://sourceforge.net/p/mingw-w64/bugs/818/)
+
 * Tue Jul 14 2020 Daniel P. Berrangé <berrange@redhat.com> - 114-1
 - Add meson hint for libgcrypt-config on mingw cross builds (#1856446)
 

From 8b144a44b684d4bc7dd767da59f5c22ceb4a5cfe Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 27 Jul 2020 16:10:52 +0200
Subject: [PATCH 24/90] Add -lssp to LDFLAGS

---
 macros.mingw32        | 2 +-
 macros.mingw64        | 2 +-
 mingw-filesystem.spec | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index b9a635f..49efc47 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -25,7 +25,7 @@
 
 %mingw32_cflags          %{mingw32_cppflags} -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw32_cppflags        %{nil}
-%mingw32_ldflags         -fstack-protector
+%mingw32_ldflags         -fstack-protector -lssp
 
 %mingw32_cc              %{mingw32_target}-gcc
 %mingw32_cxx             %{mingw32_target}-g++
diff --git a/macros.mingw64 b/macros.mingw64
index 9bc2113..8183fb2 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -25,7 +25,7 @@
 
 %mingw64_cflags          %{mingw64_cppflags} -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw64_cppflags        %{nil}
-%mingw64_ldflags         -fstack-protector
+%mingw64_ldflags         -fstack-protector -lssp
 
 %mingw64_cc              %{mingw64_target}-gcc
 %mingw64_cxx             %{mingw64_target}-g++
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 37cba09..dfa0f5e 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        115
+Version:        116
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Mon Jul 27 2020 Sandro Mani <manisandro@gmail.com> - 116-1
+- Add -lssp to LDFLAGS
+
 * Thu Jul 02 2020 Sandro Mani <manisandro@gmail.com> - 115-1
 - Add -fstack-protector to LDFLAGS (since we carry -D_FORTIFY_SOURCE=2 in cflags, see https://sourceforge.net/p/mingw-w64/bugs/818/)
 

From b733b32514d698cd44765eb7c4aa950f1ee391ff Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 27 Jul 2020 16:13:34 +0200
Subject: [PATCH 25/90] Fix changelog order

---
 mingw-filesystem.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index dfa0f5e..76be2f9 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -320,7 +320,7 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 * Mon Jul 27 2020 Sandro Mani <manisandro@gmail.com> - 116-1
 - Add -lssp to LDFLAGS
 
-* Thu Jul 02 2020 Sandro Mani <manisandro@gmail.com> - 115-1
+* Thu Jul 23 2020 Sandro Mani <manisandro@gmail.com> - 115-1
 - Add -fstack-protector to LDFLAGS (since we carry -D_FORTIFY_SOURCE=2 in cflags, see https://sourceforge.net/p/mingw-w64/bugs/818/)
 
 * Tue Jul 14 2020 Daniel P. Berrangé <berrange@redhat.com> - 114-1

From 93b1a51945b4fab41281275e1ac42eb567a3ef52 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 13 Jan 2021 03:20:02 +0000
Subject: [PATCH 26/90] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 mingw-filesystem.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 76be2f9..f985833 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -43,6 +43,7 @@ Source101:      https://fedorahosted.org/filesystem/browser/lang-exceptions
 Source102:      iso_639.sed
 Source103:      iso_3166.sed
 
+BuildRequires: make
 BuildRequires:  iso-codes
 
 

From 3aae864702a71a71e4581541bc327dfdf459d3f8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 19:53:52 +0000
Subject: [PATCH 27/90] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index f985833..bc7a9f8 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        116
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -318,6 +318,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jul 27 2020 Sandro Mani <manisandro@gmail.com> - 116-1
 - Add -lssp to LDFLAGS
 

From 9e2af704169d8d4acab5a26f187172faa28959eb Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 1 Feb 2021 21:59:11 +0100
Subject: [PATCH 28/90] Filter Windows API umbrella libraries from requires

---
 mingw-filesystem.spec  | 9 ++++++---
 mingw-find-requires.sh | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index bc7a9f8..4452a61 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        116
-Release:        2%{?dist}
+Version:        117
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -318,7 +318,10 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org>
+* Mon Feb 01 2021 Sandro Mani <manisandro@gmail.com> - 117-1
+- Filter Windows API umbrella libraries from requires
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> 116-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
 * Mon Jul 27 2020 Sandro Mani <manisandro@gmail.com> - 116-1
diff --git a/mingw-find-requires.sh b/mingw-find-requires.sh
index d824272..9e8e303 100755
--- a/mingw-find-requires.sh
+++ b/mingw-find-requires.sh
@@ -24,7 +24,7 @@ for target in $targets; do
 	for f in $dlls; do
 		if [[ $f =~ .*$host_triplet.* ]]; then
 			$OBJDUMP -p $f | grep 'DLL Name' | grep -Eio '[-._\+[:alnum:]]+\.dll' |
-				tr '[:upper:]' '[:lower:]' |
+				grep -v 'api-ms-win' | tr '[:upper:]' '[:lower:]' |
 				sed "s/\(.*\)/$target(\1)/"
 			dll_found=true
 		fi

From f88d07b9148b6c5b6768b2b41cb74aada3f9aff8 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 7 Jun 2021 14:17:48 +0200
Subject: [PATCH 29/90] Allow overriding CFLAGS/CXXFLAGS/LDFLAGS for
 %%mingw_meson

---
 macros.mingw32        | 4 +++-
 macros.mingw64        | 4 +++-
 mingw-filesystem.spec | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 49efc47..3c393e1 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -153,7 +153,9 @@
 
 %mingw32_meson %{mingw32_env} ; \
   unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
-  export CFLAGS="%{mingw32_cflags}" CXXFLAGS="%{mingw32_cflags}" LDFLAGS="%{mingw32_ldflags}"; \\\
+  CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \\\
+  CPPFLAGS="${MINGW32_CPPFLAGS-%mingw32_cppflags}"; export CPPFLAGS; \\\
+  LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \\\
   if test -f meson.build; then __mingw32_topdir=.; \\\
   elif test -f ../meson.build; then __mingw32_topdir=..; \\\
   else __mingw32_topdir=""; fi; \\\
diff --git a/macros.mingw64 b/macros.mingw64
index 8183fb2..cb37add 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -153,7 +153,9 @@
 
 %mingw64_meson %{mingw64_env} ; \
   unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
-  export CFLAGS="%{mingw64_cflags}" CXXFLAGS="%{mingw64_cflags}" LDFLAGS="%{mingw64_ldflags}"; \\\
+  CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \\\
+  CPPFLAGS="${MINGW64_CPPFLAGS-%mingw64_cppflags}"; export CPPFLAGS; \\\
+  LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \\\
   if test -f meson.build; then __mingw64_topdir=.; \\\
   elif test -f ../meson.build; then __mingw64_topdir=..; \\\
   else __mingw64_topdir=""; fi; \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 4452a61..005f59f 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        117
+Version:        118
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -318,6 +318,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Mon Jun 07 2021 Sandro Mani <manisandro@gmail.com> - 118-1
+- Allow overriding CFLAGS/CXXFLAGS/LDFLAGS for %%mingw_meson
+
 * Mon Feb 01 2021 Sandro Mani <manisandro@gmail.com> - 117-1
 - Filter Windows API umbrella libraries from requires
 

From 596cb8d01068417a37e01c6de13783aacb5299fa Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Sat, 12 Jun 2021 22:00:09 -0400
Subject: [PATCH 30/90] Use pkgconf for pkgconfig

PkgConf supports pretending to be pkgconfig(1) for cross-target
toolchains through the use of personality files.

By using this method, we can drop mingw-pkg-config and consistently
use native tools for discovery and toolchain configuration for
cross-compilation.
---
 mingw-filesystem.spec       | 37 +++++++++++++++++++++++++++++++++++--
 pkgconf-personality-mingw32 |  6 ++++++
 pkgconf-personality-mingw64 |  6 ++++++
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 pkgconf-personality-mingw32
 create mode 100644 pkgconf-personality-mingw64

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 005f59f..0aca677 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        118
+Version:        119
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -37,14 +37,17 @@ Source16:       standard-dlls-mingw32
 Source17:       standard-dlls-mingw64
 Source18:       toolchain-mingw32.meson
 Source19:       toolchain-mingw64.meson
+Source20:       pkgconf-personality-mingw32
+Source21:       pkgconf-personality-mingw64
 
 # Taken from the Fedora filesystem package
 Source101:      https://fedorahosted.org/filesystem/browser/lang-exceptions
 Source102:      iso_639.sed
 Source103:      iso_3166.sed
 
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  iso-codes
+BuildRequires:  pkgconf
 
 
 %description
@@ -65,6 +68,8 @@ Obsoletes:      cross-filesystem < 67-2
 Obsoletes:      cross-filesystem-scripts < 67-2
 Obsoletes:      mingw-filesystem < 75-2
 Obsoletes:      mingw-filesystem-scripts < 75-2
+# For using pkgconf with MinGW
+Requires:       pkgconf
 
 %description base
 This package contains the base filesystem layout, RPM macros and
@@ -78,6 +83,10 @@ This environment is maintained by the Fedora MinGW SIG at:
 %package -n mingw32-filesystem
 Summary:        MinGW cross compiler base filesystem and environment for the win32 target
 Requires:       %{name}-base = %{version}-%{release}
+# Replace mingw32-pkg-config
+Conflicts:      mingw32-pkg-config < 0.28-17
+Obsoletes:      mingw32-pkg-config < 0.28-17
+Provides:       mingw32-pkg-config = 0.28-17
 
 # Note about 'Provides: mingw32(foo.dll)'
 # ------------------------------------------------------------
@@ -108,6 +117,10 @@ This environment is maintained by the Fedora MinGW SIG at:
 %package -n mingw64-filesystem
 Summary:        MinGW cross compiler base filesystem and environment for the win64 target
 Requires:       %{name}-base = %{version}-%{release}
+# Replace mingw64-pkg-config
+Conflicts:      mingw64-pkg-config < 0.28-17
+Obsoletes:      mingw64-pkg-config < 0.28-17
+Provides:       mingw64-pkg-config = 0.28-17
 
 Provides:       %(sed "s/\(.*\)/mingw64(\1) /g" %{SOURCE17} | tr "\n" " ")
 Provides:       mingw64(mscoree.dll)
@@ -142,6 +155,10 @@ for i in mingw32-configure mingw32-cmake mingw32-make mingw32-meson mingw32-pkg-
          mingw64-configure mingw64-cmake mingw64-make mingw64-meson mingw64-pkg-config ; do
   ln -s %{_libexecdir}/mingw-scripts $i
 done
+for i in i686-w64-mingw32-pkg-config  \
+         x86_64-w64-mingw32-pkg-config ; do
+  ln -s %{_bindir}/pkgconf $i
+done
 popd
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
@@ -280,6 +297,13 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 install -m 0644 %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/mingw/
 install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
+mkdir -p $RPM_BUILD_ROOT%{pkgconfig_personalitydir}
+install -m 0644 %{SOURCE20} $RPM_BUILD_ROOT%{pkgconfig_personalitydir}/i686-w64-mingw32.personality
+install -m 0644 %{SOURCE21} $RPM_BUILD_ROOT%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
+
+# Link mingw-pkg-config man pages to pkgconf(1)
+echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/i686-w64-mingw32-pkg-config.1
+echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1
 
 %files base
 %doc COPYING
@@ -298,10 +322,13 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 %{_bindir}/mingw32-make
 %{_bindir}/mingw32-meson
 %{_bindir}/mingw32-pkg-config
+%{_bindir}/i686-w64-mingw32-pkg-config
+%{_mandir}/man1/i686-w64-mingw32-pkg-config.1*
 %{_prefix}/i686-w64-mingw32
 %{_rpmconfigdir}/fileattrs/mingw32.attr
 %{_datadir}/mingw/toolchain-mingw32.cmake
 %{_datadir}/mingw/toolchain-mingw32.meson
+%{pkgconfig_personalitydir}/i686-w64-mingw32.personality
 
 %files -n mingw64-filesystem
 %{macrosdir}/macros.mingw64
@@ -311,13 +338,19 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 %{_bindir}/mingw64-make
 %{_bindir}/mingw64-meson
 %{_bindir}/mingw64-pkg-config
+%{_bindir}/x86_64-w64-mingw32-pkg-config
+%{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1*
 %{_prefix}/x86_64-w64-mingw32
 %{_rpmconfigdir}/fileattrs/mingw64.attr
 %{_datadir}/mingw/toolchain-mingw64.cmake
 %{_datadir}/mingw/toolchain-mingw64.meson
+%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
 
 
 %changelog
+* Sat Jun 12 2021 Neal Gompa <ngompa13@gmail.com> - 119-1
+- Use pkgconf for pkgconfig
+
 * Mon Jun 07 2021 Sandro Mani <manisandro@gmail.com> - 118-1
 - Allow overriding CFLAGS/CXXFLAGS/LDFLAGS for %%mingw_meson
 
diff --git a/pkgconf-personality-mingw32 b/pkgconf-personality-mingw32
new file mode 100644
index 0000000..dcf7848
--- /dev/null
+++ b/pkgconf-personality-mingw32
@@ -0,0 +1,6 @@
+# MinGW 32-bit x86 Windows target
+Triplet: i686-w64-mingw32
+SysrootDir: /usr/i686-w64-mingw32/sys-root/mingw
+DefaultSearchPaths: /usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig
+SystemIncludePaths: /usr/i686-w64-mingw32/sys-root/mingw/include
+SystemLibraryPaths: /usr/i686-w64-mingw32/sys-root/mingw/lib
diff --git a/pkgconf-personality-mingw64 b/pkgconf-personality-mingw64
new file mode 100644
index 0000000..4cca871
--- /dev/null
+++ b/pkgconf-personality-mingw64
@@ -0,0 +1,6 @@
+# MinGW 64-bit x86 Windows target
+Triplet: x86_64-w64-mingw32
+SysrootDir: /usr/x86_64-w64-mingw32/sys-root/mingw
+DefaultSearchPaths: /usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig
+SystemIncludePaths: /usr/x86_64-w64-mingw32/sys-root/mingw/include
+SystemLibraryPaths: /usr/x86_64-w64-mingw32/sys-root/mingw/lib

From 4a7f3f602c7d532d097c38043efb3935530a8cad Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sun, 13 Jun 2021 09:21:05 +0200
Subject: [PATCH 31/90] Fix packaing man page for mingw-pkgconfig

---
 mingw-filesystem.spec | 171 ++++++++++++++++++++++--------------------
 1 file changed, 88 insertions(+), 83 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 0aca677..c76a269 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -144,13 +144,13 @@ cp %{SOURCE0} COPYING
 
 
 %install
-mkdir -p $RPM_BUILD_ROOT
+mkdir -p %{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
-install -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_libexecdir}/mingw-scripts
+mkdir -p %{buildroot}%{_libexecdir}
+install -m 755 %{SOURCE9} %{buildroot}%{_libexecdir}/mingw-scripts
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-pushd $RPM_BUILD_ROOT%{_bindir}
+mkdir -p %{buildroot}%{_bindir}
+pushd %{buildroot}%{_bindir}
 for i in mingw32-configure mingw32-cmake mingw32-make mingw32-meson mingw32-pkg-config \
          mingw64-configure mingw64-cmake mingw64-make mingw64-meson mingw64-pkg-config ; do
   ln -s %{_libexecdir}/mingw-scripts $i
@@ -161,47 +161,47 @@ for i in i686-w64-mingw32-pkg-config  \
 done
 popd
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/
+install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/profile.d/
 
-mkdir -p $RPM_BUILD_ROOT%{macrosdir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{macrosdir}/macros.mingw
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{macrosdir}/macros.mingw32
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{macrosdir}/macros.mingw64
+mkdir -p %{buildroot}%{macrosdir}
+install -m 644 %{SOURCE1} %{buildroot}%{macrosdir}/macros.mingw
+install -m 644 %{SOURCE2} %{buildroot}%{macrosdir}/macros.mingw32
+install -m 644 %{SOURCE3} %{buildroot}%{macrosdir}/macros.mingw64
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/
+mkdir -p %{buildroot}%{_sysconfdir}/rpmlint
+install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/rpmlint/
 
 # Create the folders required for gcc and binutils
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/lib
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/lib
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/bin
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/lib
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/bin
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/lib
 
 # The MinGW system root which will contain Windows native binaries
 # and Windows-specific header files, pkgconfig, etc.
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/etc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/include
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/include/sys
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/cmake
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/sbin
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/bin
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/etc
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/include
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/include/sys
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/cmake
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/sbin
 
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/etc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/cmake
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/sbin
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/bin
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/etc
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/cmake
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/sbin
 
 # We don't normally package manual pages and info files, except
 # where those are not supplied by a Fedora native package.  So we
@@ -211,36 +211,36 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/sbin
 #   /usr/x86_64-pc-mingw32/sys-root/man and
 #   /usr/x86_64-pc-mingw32/sys-root/doc
 # but those are both packaging bugs.
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/doc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/info
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/aclocal
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/themes
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/cmake
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/pkgconfig
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/xml
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/doc
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/info
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/aclocal
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/themes
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/cmake
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/pkgconfig
+mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/xml
 
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/doc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/info
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/aclocal
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/themes
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/cmake
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/xml
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/doc
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/info
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/aclocal
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/themes
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/cmake
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/xml
 
 # Own folders for all locales
 # Snippet taken from the Fedora filesystem package
-sed -n -f %{SOURCE102} /usr/share/xml/iso-codes/iso_639.xml > $RPM_BUILD_ROOT/iso_639.tab
-sed -n -f %{SOURCE103} /usr/share/xml/iso-codes/iso_3166.xml > $RPM_BUILD_ROOT/iso_3166.tab
+sed -n -f %{SOURCE102} /usr/share/xml/iso-codes/iso_639.xml > %{buildroot}/iso_639.tab
+sed -n -f %{SOURCE103} /usr/share/xml/iso-codes/iso_3166.xml > %{buildroot}/iso_3166.tab
 
-grep -v "^$" $RPM_BUILD_ROOT/iso_639.tab | grep -v "^#" | while read a b c d ; do
+grep -v "^$" %{buildroot}/iso_639.tab | grep -v "^#" | while read a b c d ; do
     [[ "$d" =~ "^Reserved" ]] && continue
     [[ "$d" =~ "^No linguistic" ]] && continue
 
@@ -263,48 +263,50 @@ cat %{SOURCE101} | grep -v "^#" | grep -v "^$" | while read loc ; do
 
     # If the locality is not official, skip it
     if [ -n "$locality" ]; then
-        grep -q "^$locality" $RPM_BUILD_ROOT/iso_3166.tab || continue
+        grep -q "^$locality" %{buildroot}/iso_3166.tab || continue
     fi
     # If the locale is not official and not special, skip it
     if [ -z "$special" ]; then
-        egrep -q "[[:space:]]${locale%%_*}[[:space:]]" $RPM_BUILD_ROOT/iso_639.tab || continue
+        egrep -q "[[:space:]]${locale%%_*}[[:space:]]" %{buildroot}/iso_639.tab || continue
     fi
     echo "%lang(${locale}) %{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw32
     echo "%lang(${locale}) %{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw64
 done
 
-rm -f $RPM_BUILD_ROOT/iso_639.tab
-rm -f $RPM_BUILD_ROOT/iso_3166.tab
+rm -f %{buildroot}/iso_639.tab
+rm -f %{buildroot}/iso_3166.tab
 
 cat filelist_mingw32 filelist_mingw64 | grep "locale" | while read a b ; do
     mkdir -p -m 755 %{buildroot}/$b/LC_MESSAGES
 done
 
 # NB. NOT _libdir
-mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm
-install -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -m 0755 %{SOURCE7} $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -m 0755 %{SOURCE8} $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -m 0755 %{SOURCE13} $RPM_BUILD_ROOT%{_rpmconfigdir}
+mkdir -p %{buildroot}/usr/lib/rpm
+install -m 0755 %{SOURCE6} %{buildroot}%{_rpmconfigdir}
+install -m 0755 %{SOURCE7} %{buildroot}%{_rpmconfigdir}
+install -m 0755 %{SOURCE8} %{buildroot}%{_rpmconfigdir}
+install -m 0755 %{SOURCE13} %{buildroot}%{_rpmconfigdir}
 
-mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/fileattrs
-install -m 0644 %{SOURCE14} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/
-install -m 0644 %{SOURCE15} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/
+mkdir -p %{buildroot}/usr/lib/rpm/fileattrs
+install -m 0644 %{SOURCE14} %{buildroot}%{_rpmconfigdir}/fileattrs/
+install -m 0644 %{SOURCE15} %{buildroot}%{_rpmconfigdir}/fileattrs/
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mingw
-install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mingw/
-install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
-install -m 0644 %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/mingw/
-install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
+mkdir -p %{buildroot}%{_datadir}/mingw
+install -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE18} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE19} %{buildroot}%{_datadir}/mingw/
 
-mkdir -p $RPM_BUILD_ROOT%{pkgconfig_personalitydir}
-install -m 0644 %{SOURCE20} $RPM_BUILD_ROOT%{pkgconfig_personalitydir}/i686-w64-mingw32.personality
-install -m 0644 %{SOURCE21} $RPM_BUILD_ROOT%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
+mkdir -p %{buildroot}%{pkgconfig_personalitydir}
+install -m 0644 %{SOURCE20} %{buildroot}%{pkgconfig_personalitydir}/i686-w64-mingw32.personality
+install -m 0644 %{SOURCE21} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
 
 # Link mingw-pkg-config man pages to pkgconf(1)
+mkdir -p %{buildroot}%{_mandir}/man1/
 echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/i686-w64-mingw32-pkg-config.1
 echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1
 
+
 %files base
 %doc COPYING
 %dir %{_sysconfdir}/rpmlint/
@@ -329,6 +331,8 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 %{_datadir}/mingw/toolchain-mingw32.cmake
 %{_datadir}/mingw/toolchain-mingw32.meson
 %{pkgconfig_personalitydir}/i686-w64-mingw32.personality
+%{_mandir}/man1/i686-w64-mingw32-pkg-config.1*
+
 
 %files -n mingw64-filesystem
 %{macrosdir}/macros.mingw64
@@ -345,6 +349,7 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 %{_datadir}/mingw/toolchain-mingw64.cmake
 %{_datadir}/mingw/toolchain-mingw64.meson
 %{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
+%{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1*
 
 
 %changelog

From a2f99cbf2d44d5fd3f992ac053bb8ecbcf2190b6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 14:24:08 +0000
Subject: [PATCH 32/90] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index c76a269..8aa3d19 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        119
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -353,6 +353,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Sat Jun 12 2021 Neal Gompa <ngompa13@gmail.com> - 119-1
 - Use pkgconf for pkgconfig
 

From 6c5a8d2258ca08ef8d4dd7138f71a32b84187d2b Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 9 Aug 2021 17:14:51 +0200
Subject: [PATCH 33/90] Store debug files below /usr/lib/debug

---
 mingw-filesystem.spec   |  8 ++++++--
 mingw-find-debuginfo.sh | 14 ++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 8aa3d19..3c438cb 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        119
-Release:        2%{?dist}
+Version:        120
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -353,6 +353,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Fri Aug 27 2021 Sandro Mani <manisandro@gmail.com> - 120-1
+- Adapt mingw-find-debuginfo.sh to store debug files below /usr/lib/debug
+- See https://fedoraproject.org/wiki/Changes/F36MingwDebugLocation
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
index f877343..d7c9f79 100755
--- a/mingw-find-debuginfo.sh
+++ b/mingw-find-debuginfo.sh
@@ -23,20 +23,22 @@ do
 	esac
 
 	echo extracting debug info from $f
-	mingw-objcopy --only-keep-debug $f $f.debug || :
-	pushd `dirname $f`
+	dest=${RPM_BUILD_ROOT}/usr/lib/debug${f/$RPM_BUILD_ROOT/}.debug
+	mkdir -p `dirname $dest`
+	mingw-objcopy --only-keep-debug $f $dest || :
+	pushd `dirname $dest`
 	keep_symbols=`mktemp`
-  mingw-nm $f.debug --format=sysv --defined-only | awk -F \| '{ if ($4 ~ "Function") print $1 }' | sort > "$keep_symbols"
-	mingw-objcopy --add-gnu-debuglink=`basename $f.debug` --strip-unneeded `basename $f` --keep-symbols="$keep_symbols" || :
+  mingw-nm $dest --format=sysv --defined-only | awk -F \| '{ if ($4 ~ "Function") print $1 }' | sort > "$keep_symbols"
+	mingw-objcopy --add-gnu-debuglink=`basename $dest` --strip-unneeded `basename $f` --keep-symbols="$keep_symbols" || :
 	rm -f "$keep_symbols"
 	popd
 done
 
 for target in $@; do
 	prefix=`rpm --eval "%{_prefix}/%{${target}_target}"`
-	if [ ! -d $RPM_BUILD_ROOT$prefix ] ; then
+	if [ ! -d ${RPM_BUILD_ROOT}/usr/lib/debug/$prefix ] ; then
 		continue
 	fi
-	find $RPM_BUILD_ROOT$prefix -type f -name "*.exe.debug" -or -name "*.dll.debug" -or -name "*.pyd.debug" |
+	find ${RPM_BUILD_ROOT}/usr/lib/debug/$prefix -type f -name "*.exe.debug" -or -name "*.dll.debug" -or -name "*.pyd.debug" |
 		sed -n -e "s#^$RPM_BUILD_ROOT##p" > $BUILDDIR/${target}-debugfiles.list
 done

From 859cfeb06d63fd786c268415c2251a01dde56356 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sun, 29 Aug 2021 23:02:14 +0200
Subject: [PATCH 34/90] Fix copying minidebug symbols to binary

---
 mingw-find-debuginfo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
index d7c9f79..41cfa82 100755
--- a/mingw-find-debuginfo.sh
+++ b/mingw-find-debuginfo.sh
@@ -29,7 +29,7 @@ do
 	pushd `dirname $dest`
 	keep_symbols=`mktemp`
   mingw-nm $dest --format=sysv --defined-only | awk -F \| '{ if ($4 ~ "Function") print $1 }' | sort > "$keep_symbols"
-	mingw-objcopy --add-gnu-debuglink=`basename $dest` --strip-unneeded `basename $f` --keep-symbols="$keep_symbols" || :
+	mingw-objcopy --add-gnu-debuglink=`basename $dest` --strip-unneeded $f --keep-symbols="$keep_symbols" || :
 	rm -f "$keep_symbols"
 	popd
 done

From 472b833cfeeab150606635f620196b596bb6f8dc Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sun, 29 Aug 2021 23:03:04 +0200
Subject: [PATCH 35/90] Fix file listed twice

---
 mingw-filesystem.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 3c438cb..b043420 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -325,7 +325,6 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 %{_bindir}/mingw32-meson
 %{_bindir}/mingw32-pkg-config
 %{_bindir}/i686-w64-mingw32-pkg-config
-%{_mandir}/man1/i686-w64-mingw32-pkg-config.1*
 %{_prefix}/i686-w64-mingw32
 %{_rpmconfigdir}/fileattrs/mingw32.attr
 %{_datadir}/mingw/toolchain-mingw32.cmake
@@ -343,7 +342,6 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 %{_bindir}/mingw64-meson
 %{_bindir}/mingw64-pkg-config
 %{_bindir}/x86_64-w64-mingw32-pkg-config
-%{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1*
 %{_prefix}/x86_64-w64-mingw32
 %{_rpmconfigdir}/fileattrs/mingw64.attr
 %{_datadir}/mingw/toolchain-mingw64.cmake

From f6cc2b6d756f8201c3119b34046a4da5bf85456a Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sun, 29 Aug 2021 23:04:14 +0200
Subject: [PATCH 36/90] Don't use deprecated external dependency generator

---
 macros.mingw                         |  7 -------
 mingw-filesystem.spec                | 11 ++++++++---
 mingw-find-provides.sh => mingw.prov |  0
 mingw-find-requires.sh => mingw.req  |  0
 mingw32.attr                         |  4 ++--
 mingw64.attr                         |  4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)
 rename mingw-find-provides.sh => mingw.prov (100%)
 rename mingw-find-requires.sh => mingw.req (100%)

diff --git a/macros.mingw b/macros.mingw
index 78417ef..5e5b5f0 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -9,8 +9,6 @@
 %mingw_objcopy              mingw-objcopy
 %mingw_nm                   mingw-nm
 
-%mingw_findprovides         %{_rpmconfigdir}/mingw-find-provides.sh %{mingw_build_targets}
-%mingw_findrequires         %{_rpmconfigdir}/mingw-find-requires.sh %{mingw_build_targets}
 %mingw_finddebuginfo        %{_rpmconfigdir}/mingw-find-debuginfo.sh
 
 %mingw_find_lang            %{_rpmconfigdir}/mingw-find-lang.sh %{buildroot}
@@ -29,11 +27,6 @@
 %mingw_package_header                                         \
 %global __strip %{mingw_strip}                                \
 %global __objdump %{mingw_objdump}                            \
-%if 0%{?rhel} == 6                                            \
-%global _use_internal_dependency_generator 0                  \
-%global __find_requires %{mingw_findrequires}                 \
-%global __find_provides %{mingw_findprovides}                 \
-%endif                                                        \
 %global __debug_install_post %%{mingw_debug_install_post}     \
 %{nil}
 
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index b043420..8d3ee47 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        120
+Version:        121
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -21,8 +21,8 @@ Source3:        macros.mingw64
 Source4:        mingw32.sh
 Source5:        mingw64.sh
 Source6:        mingw-find-debuginfo.sh
-Source7:        mingw-find-requires.sh
-Source8:        mingw-find-provides.sh
+Source7:        mingw.req
+Source8:        mingw.prov
 Source9:        mingw-scripts.sh
 Source10:       mingw-rpmlint.config
 Source11:       toolchain-mingw32.cmake
@@ -351,6 +351,11 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Sun Aug 29 2021 Sandro Mani <manisandro@gmail.com> - 121-1
+- Drop use of deprecated external dependency generator
+- Fix file listed twice
+- Fix copying minidebug symbols to binary in mingw-find-debuginfo.sh
+
 * Fri Aug 27 2021 Sandro Mani <manisandro@gmail.com> - 120-1
 - Adapt mingw-find-debuginfo.sh to store debug files below /usr/lib/debug
 - See https://fedoraproject.org/wiki/Changes/F36MingwDebugLocation
diff --git a/mingw-find-provides.sh b/mingw.prov
similarity index 100%
rename from mingw-find-provides.sh
rename to mingw.prov
diff --git a/mingw-find-requires.sh b/mingw.req
similarity index 100%
rename from mingw-find-requires.sh
rename to mingw.req
diff --git a/mingw32.attr b/mingw32.attr
index 498385b..3baed2e 100644
--- a/mingw32.attr
+++ b/mingw32.attr
@@ -1,3 +1,3 @@
-%__mingw32_provides	%{_rpmconfigdir}/mingw-find-provides.sh mingw32
-%__mingw32_requires	%{_rpmconfigdir}/mingw-find-requires.sh mingw32
+%__mingw32_provides     %{_rpmconfigdir}/mingw.prov mingw32
+%__mingw32_requires     %{_rpmconfigdir}/mingw.req mingw32
 %__mingw32_path		^%{mingw32_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee])$
diff --git a/mingw64.attr b/mingw64.attr
index 9e7ab01..26b69cd 100644
--- a/mingw64.attr
+++ b/mingw64.attr
@@ -1,3 +1,3 @@
-%__mingw64_provides	%{_rpmconfigdir}/mingw-find-provides.sh mingw64
-%__mingw64_requires	%{_rpmconfigdir}/mingw-find-requires.sh mingw64
+%__mingw64_provides     %{_rpmconfigdir}/mingw.prov mingw64
+%__mingw64_requires     %{_rpmconfigdir}/mingw.req mingw64
 %__mingw64_path		^%{mingw64_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee])$

From 0a51e8a6f95d6fddcf51361f8d375b4b1f33df2b Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 2 Sep 2021 00:36:00 +0200
Subject: [PATCH 37/90] Tweak cmake macro to allow overriding
 INCLUDE_INSTALL_DIR, fix double  passed via mingw-scripts

---
 macros.mingw32        | 10 +++++-----
 macros.mingw64        | 10 +++++-----
 mingw-filesystem.spec |  6 +++++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 3c393e1..542af12 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -80,7 +80,7 @@
   done; \
   unset x i
 
-%mingw32_pkg_config %{mingw32_target}-pkg-config
+%mingw32_pkg_config %{mingw32_target}-pkg-config "$@"
 %mingw32_pkgconfig_personalitydir %{mingw32_datadir}/pkgconfig/personality.d
 
 %mingw32_configure %{mingw32_env} ; \
@@ -103,7 +103,7 @@
 	--mandir=%{mingw32_mandir} \\\
 	--infodir=%{mingw32_infodir} \\\
 	${MINGW_CONFIGURE_ARGS} \\\
-	${MINGW32_CONFIGURE_ARGS}
+	${MINGW32_CONFIGURE_ARGS} "$@"
 
 %mingw32_make %{mingw32_env} ; \
   make \\\
@@ -119,7 +119,7 @@
 	localstatedir=%{mingw32_localstatedir} \\\
 	sharedstatedir=%{mingw32_sharedstatedir} \\\
 	mandir=%{mingw32_mandir} \\\
-	infodir=%{mingw32_infodir}
+	infodir=%{mingw32_infodir} "$@"
 
 %mingw32_cmake_generic %{mingw32_env} ; \
   PKG_CONFIG_LIBDIR="%{mingw32_libdir}/pkgconfig:%{mingw32_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
@@ -141,11 +141,11 @@
         "$@" $__mingw32_topdir
 
 %mingw32_cmake \
-  MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}" \
+  MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir} ${MINGW32_CMAKE_ARGS}" \
   %mingw32_cmake_generic
 
 %mingw32_cmake_kde4 \
-  MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}/kde4" \
+  MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}/kde4 ${MINGW32_CMAKE_ARGS}" \
   %mingw32_cmake_generic
 
 %mingw32_qmake_qt4 /usr/bin/mingw32-qmake-qt4
diff --git a/macros.mingw64 b/macros.mingw64
index cb37add..2411144 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -80,7 +80,7 @@
   done; \
   unset x i
 
-%mingw64_pkg_config %{mingw64_target}-pkg-config
+%mingw64_pkg_config %{mingw64_target}-pkg-config "$@"
 %mingw64_pkgconfig_personalitydir %{mingw32_datadir}/pkgconfig/personality.d
 
 %mingw64_configure %{mingw64_env} ; \
@@ -103,7 +103,7 @@
 	--mandir=%{mingw64_mandir} \\\
 	--infodir=%{mingw64_infodir} \\\
 	${MINGW_CONFIGURE_ARGS} \\\
-	${MINGW64_CONFIGURE_ARGS}
+	${MINGW64_CONFIGURE_ARGS} "$@"
 
 %mingw64_make %{mingw64_env} ; \
   make \\\
@@ -119,7 +119,7 @@
 	localstatedir=%{mingw64_localstatedir} \\\
 	sharedstatedir=%{mingw64_sharedstatedir} \\\
 	mandir=%{mingw64_mandir} \\\
-	infodir=%{mingw64_infodir}
+	infodir=%{mingw64_infodir} "$@"
 
 %mingw64_cmake_generic %{mingw64_env} ; \
   PKG_CONFIG_LIBDIR="%{mingw64_libdir}/pkgconfig:%{mingw64_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
@@ -141,11 +141,11 @@
         "$@" $__mingw64_topdir
 
 %mingw64_cmake \
-  MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}" \
+  MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir} ${MINGW64_CMAKE_ARGS}" \
   %mingw64_cmake_generic
 
 %mingw64_cmake_kde4 \
-  MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}/kde4" \
+  MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}/kde4 ${MINGW64_CMAKE_ARGS}" \
   %mingw64_cmake_generic
 
 %mingw64_qmake_qt4 /usr/bin/mingw64-qmake-qt4
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 8d3ee47..96b0446 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        121
+Version:        122
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -351,6 +351,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Thu Sep 02 2021 Sandro Mani <manisandro@gmail.com> - 122-1
+- Allow overriding CMake INCLUDE_INSTALL_DIR in MINGWXX_CMAKE_ARGS
+- Drop evaling $@ in mingw-scripts, ensure mingw macros invoked by mingw-scripts contain $@
+
 * Sun Aug 29 2021 Sandro Mani <manisandro@gmail.com> - 121-1
 - Drop use of deprecated external dependency generator
 - Fix file listed twice

From 91f2255bd346d43b8bad9f8b9a85db41ae7402c9 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 21 Sep 2021 11:03:04 +0200
Subject: [PATCH 38/90] Autogenerate python dependency, also capture pc, pyd
 for dependency generation

---
 mingw-filesystem.spec |  6 +++++-
 mingw.req             | 18 +++++++++++++++++-
 mingw32.attr          |  2 +-
 mingw64.attr          |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 96b0446..aa80ec1 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        122
+Version:        123
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -351,6 +351,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Tue Sep 21 2021 Sandro Mani <manisandro@gmail.com> - 123-1
+- Autogenerate mingw-python3 BR
+- Fix mingw{32/64}.attr to also capture pyd, pc files
+
 * Thu Sep 02 2021 Sandro Mani <manisandro@gmail.com> - 122-1
 - Allow overriding CMake INCLUDE_INSTALL_DIR in MINGWXX_CMAKE_ARGS
 - Drop evaling $@ in mingw-scripts, ensure mingw macros invoked by mingw-scripts contain $@
diff --git a/mingw.req b/mingw.req
index 9e8e303..622e7f8 100755
--- a/mingw.req
+++ b/mingw.req
@@ -15,12 +15,14 @@ fi
 
 filelist=`sed "s/['\"]/\\\&/g"`
 
-dlls=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(dll|exe)$')
+dlls=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(dll|exe|pyd)$')
 pkgconfig_files=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(pc)$')
+py3_files=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(pyd?)$')
 
 for target in $targets; do
 	dll_found=false
 	host_triplet=`rpm --eval "%{${target}_target}"`
+	libdir=`rpm --eval "%{${target}_libdir}"`
 	for f in $dlls; do
 		if [[ $f =~ .*$host_triplet.* ]]; then
 			$OBJDUMP -p $f | grep 'DLL Name' | grep -Eio '[-._\+[:alnum:]]+\.dll' |
@@ -40,6 +42,15 @@ for target in $targets; do
 	for f in $pkgconfig_files; do
 		if [[ $f =~ .*$host_triplet.* ]]; then
 			pkgconfig_files_found=true
+			break
+		fi
+	done
+
+	py3_files_found=false
+	for f in $py3_files; do
+		if [[ $f =~ .*$host_triplet.*lib/python3.* ]]; then
+			py3_files_found=true
+			break
 		fi
 	done
 
@@ -47,4 +58,9 @@ for target in $targets; do
 	if [ $pkgconfig_files_found = true ]; then
 		echo "${target}-pkg-config"
 	fi
+
+        # Add a dependency on python if necessary
+        if [ $py3_files_found = true ]; then
+            echo "${target}-python3";
+        fi
 done | sort -u
diff --git a/mingw32.attr b/mingw32.attr
index 3baed2e..35c1e92 100644
--- a/mingw32.attr
+++ b/mingw32.attr
@@ -1,3 +1,3 @@
 %__mingw32_provides     %{_rpmconfigdir}/mingw.prov mingw32
 %__mingw32_requires     %{_rpmconfigdir}/mingw.req mingw32
-%__mingw32_path		^%{mingw32_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee])$
+%__mingw32_path		^%{mingw32_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee]|[Pp][Yy][Dd]?|[Pp][Cc])$
diff --git a/mingw64.attr b/mingw64.attr
index 26b69cd..5142751 100644
--- a/mingw64.attr
+++ b/mingw64.attr
@@ -1,3 +1,3 @@
 %__mingw64_provides     %{_rpmconfigdir}/mingw.prov mingw64
 %__mingw64_requires     %{_rpmconfigdir}/mingw.req mingw64
-%__mingw64_path		^%{mingw64_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee])$
+%__mingw64_path		^%{mingw64_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee]|[Pp][Yy][Dd]?|[Pp][Cc])$

From 5788afad0b23f2970b6f056f79bfd38aa439a568 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 17 Nov 2021 18:30:23 +0100
Subject: [PATCH 39/90] Use relative paths in cmake/meson toolchain files to
 make ccache work if available

---
 mingw-filesystem.spec   | 6 +++++-
 toolchain-mingw32.cmake | 6 +++---
 toolchain-mingw32.meson | 6 +++---
 toolchain-mingw64.cmake | 6 +++---
 toolchain-mingw64.meson | 6 +++---
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index aa80ec1..e2545d1 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        123
+Version:        124
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -351,6 +351,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Wed Nov 17 2021 Sandro Mani <manisandro@gmail.com> - 124-1
+- Use relative paths in cmake/meson toolchain files to make ccache work if
+  available
+
 * Tue Sep 21 2021 Sandro Mani <manisandro@gmail.com> - 123-1
 - Autogenerate mingw-python3 BR
 - Fix mingw{32/64}.attr to also capture pyd, pc files
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index 70f6441..e8e321a 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -2,8 +2,8 @@ SET(CMAKE_SYSTEM_NAME Windows)
 SET(CMAKE_SYSTEM_PROCESSOR x86)
 
 # specify the cross compiler
-SET(CMAKE_C_COMPILER /usr/bin/i686-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER /usr/bin/i686-w64-mingw32-g++)
+SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
 
 # where is the target environment
 SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32/sys-root/mingw)
@@ -21,7 +21,7 @@ SET(QT_BINARY_DIR /usr/i686-w64-mingw32/bin /usr/bin)
 SET(CMAKE_RC_COMPILER /usr/bin/i686-w64-mingw32-windres)
 
 # These are needed for compiling lapack (RHBZ #753906)
-SET(CMAKE_Fortran_COMPILER /usr/bin/i686-w64-mingw32-gfortran)
+SET(CMAKE_Fortran_COMPILER i686-w64-mingw32-gfortran)
 SET(CMAKE_AR:FILEPATH /usr/bin/i686-w64-mingw32-ar)
 SET(CMAKE_RANLIB:FILEPATH /usr/bin/i686-w64-mingw32-ranlib)
 
diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson
index 4d3000b..99fe91a 100644
--- a/toolchain-mingw32.meson
+++ b/toolchain-mingw32.meson
@@ -1,7 +1,7 @@
 [binaries]
-c = '/usr/bin/i686-w64-mingw32-gcc'
-cpp = '/usr/bin/i686-w64-mingw32-g++'
-fortran = '/usr/bin/i686-w64-mingw32-gfortran'
+c = 'i686-w64-mingw32-gcc'
+cpp = 'i686-w64-mingw32-g++'
+fortran = 'i686-w64-mingw32-gfortran'
 rust = ['rustc', '--target', 'i686-pc-windows-msvc', '-C', 'linker=/usr/bin/i686-w64-mingw32-gcc']
 ar = '/usr/bin/i686-w64-mingw32-ar'
 pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake
index b323e11..0ae6a74 100644
--- a/toolchain-mingw64.cmake
+++ b/toolchain-mingw64.cmake
@@ -2,8 +2,8 @@ SET(CMAKE_SYSTEM_NAME Windows)
 SET(CMAKE_SYSTEM_PROCESSOR x86_64)
 
 # specify the cross compiler
-SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32-g++)
+SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
 
 # where is the target environment
 SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32/sys-root/mingw)
@@ -21,7 +21,7 @@ SET(QT_BINARY_DIR /usr/x86_64-w64-mingw32/bin /usr/bin)
 SET(CMAKE_RC_COMPILER /usr/bin/x86_64-w64-mingw32-windres)
 
 # These are needed for compiling lapack (RHBZ #753906)
-SET(CMAKE_Fortran_COMPILER /usr/bin/x86_64-w64-mingw32-gfortran)
+SET(CMAKE_Fortran_COMPILER x86_64-w64-mingw32-gfortran)
 SET(CMAKE_AR:FILEPATH /usr/bin/x86_64-w64-mingw32-ar)
 SET(CMAKE_RANLIB:FILEPATH /usr/bin/x86_64-w64-mingw32-ranlib)
 
diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson
index 918bee0..2f633aa 100644
--- a/toolchain-mingw64.meson
+++ b/toolchain-mingw64.meson
@@ -1,7 +1,7 @@
 [binaries]
-c = '/usr/bin/x86_64-w64-mingw32-gcc'
-cpp = '/usr/bin/x86_64-w64-mingw32-g++'
-fortran = '/usr/bin/x86_64-w64-mingw32-gfortran'
+c = 'x86_64-w64-mingw32-gcc'
+cpp = 'x86_64-w64-mingw32-g++'
+fortran = 'x86_64-w64-mingw32-gfortran'
 rust = ['rustc', '--target', 'x86_64-pc-windows-msvc', '-C', 'linker=/usr/bin/x86_64-w64-mingw32-gcc']
 ar = '/usr/bin/x86_64-w64-mingw32-ar'
 pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'

From e2f6d807524cedf5399d0a0579daa6052914f532 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sat, 20 Nov 2021 08:28:21 +0100
Subject: [PATCH 40/90] Fix up debug dirs ownership

---
 mingw-filesystem.spec   | 12 +++++++++++-
 mingw-find-debuginfo.sh |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index e2545d1..e6d83c4 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        124
+Version:        125
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -235,6 +235,9 @@ mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/xml
 
+mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/i686-w64-mingw32
+mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32
+
 # Own folders for all locales
 # Snippet taken from the Fedora filesystem package
 sed -n -f %{SOURCE102} /usr/share/xml/iso-codes/iso_639.xml > %{buildroot}/iso_639.tab
@@ -331,6 +334,8 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 %{_datadir}/mingw/toolchain-mingw32.meson
 %{pkgconfig_personalitydir}/i686-w64-mingw32.personality
 %{_mandir}/man1/i686-w64-mingw32-pkg-config.1*
+%dir %{_prefix}/lib/debug/%{_prefix}
+%dir %{_prefix}/lib/debug/%{_prefix}/i686-w64-mingw32
 
 
 %files -n mingw64-filesystem
@@ -348,9 +353,14 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 %{_datadir}/mingw/toolchain-mingw64.meson
 %{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
 %{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1*
+%dir %{_prefix}/lib/debug/%{_prefix}
+%dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32
 
 
 %changelog
+* Sat Nov 20 2021 Sandro Mani <manisandro@gmail.com> - 125-1
+- Fix up debug dirs ownership
+
 * Wed Nov 17 2021 Sandro Mani <manisandro@gmail.com> - 124-1
 - Use relative paths in cmake/meson toolchain files to make ccache work if
   available
diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
index 41cfa82..0dd2045 100755
--- a/mingw-find-debuginfo.sh
+++ b/mingw-find-debuginfo.sh
@@ -41,4 +41,6 @@ for target in $@; do
 	fi
 	find ${RPM_BUILD_ROOT}/usr/lib/debug/$prefix -type f -name "*.exe.debug" -or -name "*.dll.debug" -or -name "*.pyd.debug" |
 		sed -n -e "s#^$RPM_BUILD_ROOT##p" > $BUILDDIR/${target}-debugfiles.list
+        find ${RPM_BUILD_ROOT}/usr/lib/debug/$prefix/* -type d |
+		sed -n -e "s#^$RPM_BUILD_ROOT#%dir #p" >> $BUILDDIR/${target}-debugfiles.list
 done

From ea5c8fc32e7a792782d6bc63aeafce5c324ca409 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 15 Dec 2021 22:21:47 +0100
Subject: [PATCH 41/90] Preserve CC/CXX/FC/RC set by ENV if set in cmake
 toolchain files

---
 mingw-filesystem.spec   |  5 ++++-
 toolchain-mingw32.cmake | 16 ++++++++++++----
 toolchain-mingw64.cmake | 16 ++++++++++++----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index e6d83c4..dbab8b9 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        125
+Version:        126
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Wed Dec 15 2021 Sandro Mani <manisandro@gmail.com> - 126-1
+- Preserve CC/CXX/FC/RC set by ENV if set in cmake toolchain files
+
 * Sat Nov 20 2021 Sandro Mani <manisandro@gmail.com> - 125-1
 - Fix up debug dirs ownership
 
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index e8e321a..27a45df 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -2,8 +2,15 @@ SET(CMAKE_SYSTEM_NAME Windows)
 SET(CMAKE_SYSTEM_PROCESSOR x86)
 
 # specify the cross compiler
-SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
+IF(NOT $ENV{CC})
+    SET(CMAKE_C_COMPILER /usr/bin/i686-w64-mingw32-gcc)
+ENDIF()
+IF(NOT $ENV{CXX})
+    SET(CMAKE_CXX_COMPILER /usr/bin/i686-w64-mingw32-g++)
+ENDIF()
+IF(NOT $ENV{FC})
+    SET(CMAKE_Fortran_COMPILER /usr/bin/i686-w64-mingw32-gfortran)
+ENDIF()
 
 # where is the target environment
 SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32/sys-root/mingw)
@@ -18,10 +25,11 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 SET(QT_BINARY_DIR /usr/i686-w64-mingw32/bin /usr/bin)
 
 # set the resource compiler (RHBZ #652435)
-SET(CMAKE_RC_COMPILER /usr/bin/i686-w64-mingw32-windres)
+IF(NOT $ENV{RC})
+    SET(CMAKE_RC_COMPILER /usr/bin/i686-w64-mingw32-windres)
+ENDIF()
 
 # These are needed for compiling lapack (RHBZ #753906)
-SET(CMAKE_Fortran_COMPILER i686-w64-mingw32-gfortran)
 SET(CMAKE_AR:FILEPATH /usr/bin/i686-w64-mingw32-ar)
 SET(CMAKE_RANLIB:FILEPATH /usr/bin/i686-w64-mingw32-ranlib)
 
diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake
index 0ae6a74..60fcebe 100644
--- a/toolchain-mingw64.cmake
+++ b/toolchain-mingw64.cmake
@@ -2,8 +2,15 @@ SET(CMAKE_SYSTEM_NAME Windows)
 SET(CMAKE_SYSTEM_PROCESSOR x86_64)
 
 # specify the cross compiler
-SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
+IF(NOT $ENV{CC})
+    SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc)
+ENDIF()
+IF(NOT $ENV{CXX})
+    SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32-g++)
+ENDIF()
+IF(NOT $ENV{FC})
+    SET(CMAKE_Fortran_COMPILER /usr/bin/x86_64-w64-mingw32-gfortran)
+ENDIF()
 
 # where is the target environment
 SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32/sys-root/mingw)
@@ -18,10 +25,11 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 SET(QT_BINARY_DIR /usr/x86_64-w64-mingw32/bin /usr/bin)
 
 # set the resource compiler (RHBZ #652435)
-SET(CMAKE_RC_COMPILER /usr/bin/x86_64-w64-mingw32-windres)
+IF(NOT $ENV{RC})
+    SET(CMAKE_RC_COMPILER /usr/bin/x86_64-w64-mingw32-windres)
+ENDIF()
 
 # These are needed for compiling lapack (RHBZ #753906)
-SET(CMAKE_Fortran_COMPILER x86_64-w64-mingw32-gfortran)
 SET(CMAKE_AR:FILEPATH /usr/bin/x86_64-w64-mingw32-ar)
 SET(CMAKE_RANLIB:FILEPATH /usr/bin/x86_64-w64-mingw32-ranlib)
 

From f9b54363f17ae064edd196f567ca128061429ab1 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sat, 8 Jan 2022 19:33:47 +0100
Subject: [PATCH 42/90] Correctly test whether CC/CXX/FC env-vars are set in
 cmake toolchain config

---
 mingw-filesystem.spec   | 5 ++++-
 toolchain-mingw32.cmake | 6 +++---
 toolchain-mingw64.cmake | 7 +++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index dbab8b9..0615a3f 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        126
+Version:        127
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 127-1
+- Correctly test whether CC/CXX/FC env-vars are set in cmake toolchain config
+
 * Wed Dec 15 2021 Sandro Mani <manisandro@gmail.com> - 126-1
 - Preserve CC/CXX/FC/RC set by ENV if set in cmake toolchain files
 
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index 27a45df..71764ea 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -2,13 +2,13 @@ SET(CMAKE_SYSTEM_NAME Windows)
 SET(CMAKE_SYSTEM_PROCESSOR x86)
 
 # specify the cross compiler
-IF(NOT $ENV{CC})
+IF(NOT DEFINED ENV{CC})
     SET(CMAKE_C_COMPILER /usr/bin/i686-w64-mingw32-gcc)
 ENDIF()
-IF(NOT $ENV{CXX})
+IF(NOT DEFINED ENV{CXX})
     SET(CMAKE_CXX_COMPILER /usr/bin/i686-w64-mingw32-g++)
 ENDIF()
-IF(NOT $ENV{FC})
+IF(NOT DEFINED ENV{FC})
     SET(CMAKE_Fortran_COMPILER /usr/bin/i686-w64-mingw32-gfortran)
 ENDIF()
 
diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake
index 60fcebe..2e9ec9d 100644
--- a/toolchain-mingw64.cmake
+++ b/toolchain-mingw64.cmake
@@ -1,14 +1,13 @@
 SET(CMAKE_SYSTEM_NAME Windows)
 SET(CMAKE_SYSTEM_PROCESSOR x86_64)
-
 # specify the cross compiler
-IF(NOT $ENV{CC})
+IF(NOT DEFINED ENV{CC})
     SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc)
 ENDIF()
-IF(NOT $ENV{CXX})
+IF(NOT DEFINED ENV{CXX})
     SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32-g++)
 ENDIF()
-IF(NOT $ENV{FC})
+IF(NOT DEFINED ENV{FC})
     SET(CMAKE_Fortran_COMPILER /usr/bin/x86_64-w64-mingw32-gfortran)
 ENDIF()
 

From 9257d2c01d30700865d9ecb9ba919070b559c663 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sun, 9 Jan 2022 09:19:07 +0100
Subject: [PATCH 43/90] Add Boost_ARCHITECTURE to cmake toolchain file

---
 mingw-filesystem.spec   | 5 ++++-
 toolchain-mingw32.cmake | 2 ++
 toolchain-mingw64.cmake | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 0615a3f..145bf60 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        127
+Version:        128
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 128-1
+- Add Boost_ARCHITECTURE to cmake toolchain file
+
 * Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 127-1
 - Correctly test whether CC/CXX/FC env-vars are set in cmake toolchain config
 
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index 71764ea..36297b5 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -33,3 +33,5 @@ ENDIF()
 SET(CMAKE_AR:FILEPATH /usr/bin/i686-w64-mingw32-ar)
 SET(CMAKE_RANLIB:FILEPATH /usr/bin/i686-w64-mingw32-ranlib)
 
+# Workaround failure to detect boost (see #2037724)
+SET(Boost_ARCHITECTURE "-x32")
diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake
index 2e9ec9d..39b0d65 100644
--- a/toolchain-mingw64.cmake
+++ b/toolchain-mingw64.cmake
@@ -1,5 +1,6 @@
 SET(CMAKE_SYSTEM_NAME Windows)
 SET(CMAKE_SYSTEM_PROCESSOR x86_64)
+
 # specify the cross compiler
 IF(NOT DEFINED ENV{CC})
     SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc)
@@ -32,3 +33,5 @@ ENDIF()
 SET(CMAKE_AR:FILEPATH /usr/bin/x86_64-w64-mingw32-ar)
 SET(CMAKE_RANLIB:FILEPATH /usr/bin/x86_64-w64-mingw32-ranlib)
 
+# Workaround failure to detect boost (see #2037724)
+SET(Boost_ARCHITECTURE "-x64")

From 40a9ee984040f0b83315b393612aab59bf0ebd9b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 19:22:01 +0000
Subject: [PATCH 44/90] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 145bf60..7de95de 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        128
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 128-1
 - Add Boost_ARCHITECTURE to cmake toolchain file
 

From f9734e4bcc4462ef816791417bbb5f556f204b95 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sat, 22 Jan 2022 21:55:50 +0100
Subject: [PATCH 45/90] Also set FCFLAGS in mingw-env

---
 macros.mingw32        | 5 +++++
 macros.mingw64        | 5 +++++
 mingw-filesystem.spec | 7 +++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 542af12..e791e03 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -25,6 +25,7 @@
 
 %mingw32_cflags          %{mingw32_cppflags} -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw32_cppflags        %{nil}
+%mingw32_fflags          -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw32_ldflags         -fstack-protector -lssp
 
 %mingw32_cc              %{mingw32_target}-gcc
@@ -73,6 +74,8 @@
     ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \
     CXXFLAGS=; export CXXFLAGS; \
   fi; \
+  FFLAGS="${MINGW32_FFLAGS-%mingw32_fflags}"; export FFLAGS; \
+  FCFLAGS="${MINGW32_FCFLAGS-%mingw32_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \
   for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \
     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
@@ -155,6 +158,8 @@
   unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
   CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \\\
   CPPFLAGS="${MINGW32_CPPFLAGS-%mingw32_cppflags}"; export CPPFLAGS; \\\
+  FFLAGS="${MINGW32_FFLAGS-%mingw32_fflags}"; export FFLAGS; \
+  FCFLAGS="${MINGW32_FCFLAGS-%mingw32_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \\\
   if test -f meson.build; then __mingw32_topdir=.; \\\
   elif test -f ../meson.build; then __mingw32_topdir=..; \\\
diff --git a/macros.mingw64 b/macros.mingw64
index 2411144..81c10aa 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -25,6 +25,7 @@
 
 %mingw64_cflags          %{mingw64_cppflags} -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw64_cppflags        %{nil}
+%mingw64_fflags          -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw64_ldflags         -fstack-protector -lssp
 
 %mingw64_cc              %{mingw64_target}-gcc
@@ -73,6 +74,8 @@
     ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \
     CXXFLAGS=; export CXXFLAGS; \
   fi; \
+  FFLAGS="${MINGW64_FFLAGS-%mingw64_fflags}"; export FFLAGS; \
+  FCFLAGS="${MINGW64_FCFLAGS-%mingw64_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \
   for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \
     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
@@ -155,6 +158,8 @@
   unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
   CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \\\
   CPPFLAGS="${MINGW64_CPPFLAGS-%mingw64_cppflags}"; export CPPFLAGS; \\\
+  FFLAGS="${MINGW64_FFLAGS-%mingw64_fflags}"; export FFLAGS; \
+  FCFLAGS="${MINGW64_FCFLAGS-%mingw64_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \\\
   if test -f meson.build; then __mingw64_topdir=.; \\\
   elif test -f ../meson.build; then __mingw64_topdir=..; \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 7de95de..24963fa 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        128
-Release:        2%{?dist}
+Version:        129
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Sat Jan 22 2022 Sandro Mani <manisandro@gmail.com> - 129-1
+- Also set FCFLAGS in mingw-env
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From c212a7bc7d7f95837601643356e080b422817545 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 2 Feb 2022 10:37:40 +0100
Subject: [PATCH 46/90] Drop evaling $@ in mingw-scripts, ensure mingw macros
 invoked by mingw-scripts contain $@

---
 mingw-filesystem.spec | 5 ++++-
 mingw-scripts.sh      | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 24963fa..044f54a 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        129
+Version:        130
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Wed Feb 02 2022 Sandro Mani <manisandro@gmail.com> - 130-1
+- Drop evaling $@ in mingw-scripts, ensure mingw macros invoked by mingw-scripts contain $@
+
 * Sat Jan 22 2022 Sandro Mani <manisandro@gmail.com> - 129-1
 - Also set FCFLAGS in mingw-env
 
diff --git a/mingw-scripts.sh b/mingw-scripts.sh
index 929a901..503d5cb 100755
--- a/mingw-scripts.sh
+++ b/mingw-scripts.sh
@@ -39,7 +39,8 @@ if [[ $NAME == *cmake* ]] ; then
     MINGW64_CXXFLAGS=${MINGW64_CXXFLAGS:-""}
 fi
 
-# NOTE: The use of 'eval' in combination with '$@' is a potential security risk
+# NOTE: The use of 'eval' in combination with '$@' in the evaluated rpm macro is
+#       a potential security risk.
 #       We should find a more safe replacement for this command
 #       Suggestions are welcome at the Fedora MinGW mailing list
-eval "MINGW_CMAKE_NO_VERBOSE=1 `rpm --eval "%{$NAME}"`" '"$@"'
+eval "MINGW_CMAKE_NO_VERBOSE=1 `rpm --eval "%{$NAME}"`"

From 03aa020c111ff4ec6a81409eb0f87e6e1b3d8c23 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 10 Feb 2022 11:37:08 +0100
Subject: [PATCH 47/90] More generic mingw_pkg_name macros to also deduce mingw
 package name from native name

---
 macros.mingw32        | 2 +-
 macros.mingw64        | 2 +-
 mingw-filesystem.spec | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index e791e03..040e808 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -1,6 +1,6 @@
 # RPM macros for Fedora MinGW.
 
-%mingw32_pkg_name        %(echo %{name} | sed 's/^mingw-/mingw32-/')
+%mingw32_pkg_name        %(echo %{name} | sed -E 's/^(mingw-|)/mingw32-/')
 %mingw32_target          i686-w64-mingw32
 
 # Paths.
diff --git a/macros.mingw64 b/macros.mingw64
index 81c10aa..896b290 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -1,6 +1,6 @@
 # RPM macros for Fedora MinGW.
 
-%mingw64_pkg_name        %(echo %{name} | sed 's/^mingw-/mingw64-/')
+%mingw64_pkg_name        %(echo %{name} | sed -E 's/^(mingw-|)/mingw64-/')
 %mingw64_target          x86_64-w64-mingw32
 
 # Paths.
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 044f54a..c530dfc 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        130
+Version:        131
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Thu Feb 10 2022 Sandro Mani <manisandro@gmail.com> - 131-1
+- More generic mingw_pkg_name macros to also deduce mingw package name from native name
+
 * Wed Feb 02 2022 Sandro Mani <manisandro@gmail.com> - 130-1
 - Drop evaling $@ in mingw-scripts, ensure mingw macros invoked by mingw-scripts contain $@
 

From 21591ade5eeab4c8fdc1758acba591b09d5fa2d0 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 10 Feb 2022 13:51:35 +0100
Subject: [PATCH 48/90] Move python dependency generation to
 mingw32/64_python3.attr in mingw-python3 package

---
 mingw-filesystem.spec   |  1 +
 mingw-find-debuginfo.sh |  2 +-
 mingw.req               | 15 +--------------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index c530dfc..64c6105 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -359,6 +359,7 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 %changelog
 * Thu Feb 10 2022 Sandro Mani <manisandro@gmail.com> - 131-1
+- Move python dependency generation to mingw32/64_python3.attr in mingw-python3 package
 - More generic mingw_pkg_name macros to also deduce mingw package name from native name
 
 * Wed Feb 02 2022 Sandro Mani <manisandro@gmail.com> - 130-1
diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
index 0dd2045..317749a 100755
--- a/mingw-find-debuginfo.sh
+++ b/mingw-find-debuginfo.sh
@@ -28,7 +28,7 @@ do
 	mingw-objcopy --only-keep-debug $f $dest || :
 	pushd `dirname $dest`
 	keep_symbols=`mktemp`
-  mingw-nm $dest --format=sysv --defined-only | awk -F \| '{ if ($4 ~ "Function") print $1 }' | sort > "$keep_symbols"
+	mingw-nm $dest --format=sysv --defined-only | awk -F \| '{ if ($4 ~ "Function") print $1 }' | sort > "$keep_symbols"
 	mingw-objcopy --add-gnu-debuglink=`basename $dest` --strip-unneeded $f --keep-symbols="$keep_symbols" || :
 	rm -f "$keep_symbols"
 	popd
diff --git a/mingw.req b/mingw.req
index 622e7f8..b7bb6d4 100755
--- a/mingw.req
+++ b/mingw.req
@@ -17,7 +17,6 @@ filelist=`sed "s/['\"]/\\\&/g"`
 
 dlls=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(dll|exe|pyd)$')
 pkgconfig_files=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(pc)$')
-py3_files=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(pyd?)$')
 
 for target in $targets; do
 	dll_found=false
@@ -38,6 +37,7 @@ for target in $targets; do
 		echo "${target}-crt"
 	fi
 
+	# Add a dependency on $target-pkg-config if necessary
 	pkgconfig_files_found=false
 	for f in $pkgconfig_files; do
 		if [[ $f =~ .*$host_triplet.* ]]; then
@@ -46,21 +46,8 @@ for target in $targets; do
 		fi
 	done
 
-	py3_files_found=false
-	for f in $py3_files; do
-		if [[ $f =~ .*$host_triplet.*lib/python3.* ]]; then
-			py3_files_found=true
-			break
-		fi
-	done
-
-	# Add a dependency on $target-pkg-config if necessary
 	if [ $pkgconfig_files_found = true ]; then
 		echo "${target}-pkg-config"
 	fi
 
-        # Add a dependency on python if necessary
-        if [ $py3_files_found = true ]; then
-            echo "${target}-python3";
-        fi
 done | sort -u

From ae9028c3518f1b0962d4f66859bae4fcb04f73f1 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 10 Feb 2022 16:52:43 +0100
Subject: [PATCH 49/90] Bump release

---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 64c6105..0195735 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        131
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Thu Feb 10 2022 Sandro Mani <manisandro@gmail.com> - 131-2
+- Bump release
+
 * Thu Feb 10 2022 Sandro Mani <manisandro@gmail.com> - 131-1
 - Move python dependency generation to mingw32/64_python3.attr in mingw-python3 package
 - More generic mingw_pkg_name macros to also deduce mingw package name from native name

From a1c19e33ff01fc8d2dcbfc428ececdba7805ed6e Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 22 Feb 2022 10:34:23 +0100
Subject: [PATCH 50/90] Create build_winXX directories with mkdir -p

---
 macros.mingw          | 24 ++++++++++++------------
 mingw-filesystem.spec |  7 +++++--
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/macros.mingw b/macros.mingw
index 5e5b5f0..034c5b8 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -37,13 +37,13 @@ run_mingw_configure()                                  \
     [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \
 done ; \
 %if 0%{?mingw_build_win32} == 1                        \
-mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw32_configure} "$@"                         \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_win64} == 1                        \
-mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw64_configure} "$@"                         \
 popd                                                   \
@@ -67,13 +67,13 @@ run_mingw_make
 run_mingw_cmake()                                      \
 {                                                      \
 %if 0%{?mingw_build_win32} == 1                        \
-mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw32_cmake "$@"}                             \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_win64} == 1                        \
-mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw64_cmake "$@"}                             \
 popd                                                   \
@@ -85,13 +85,13 @@ run_mingw_cmake
 run_mingw_cmake_kde4()                                 \
 {                                                      \
 %if 0%{?mingw_build_win32} == 1                        \
-mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw32_cmake_kde4 "$@"}                        \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_win64} == 1                        \
-mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw64_cmake_kde4 "$@"}                        \
 popd                                                   \
@@ -103,13 +103,13 @@ run_mingw_cmake_kde4
 run_mingw_qmake_qt4()                                  \
 {                                                      \
 %if 0%{?mingw_build_win32} == 1                        \
-mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw32_qmake_qt4} "$@"                         \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_win64} == 1                        \
-mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw64_qmake_qt4} "$@"                         \
 popd                                                   \
@@ -121,13 +121,13 @@ run_mingw_qmake_qt4
 run_mingw_qmake_qt5()                                  \
 {                                                      \
 %if 0%{?mingw_build_win32} == 1                        \
-mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw32_qmake_qt5} "$@"                         \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_win64} == 1                        \
-mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw64_qmake_qt5} "$@"                         \
 popd                                                   \
@@ -139,13 +139,13 @@ run_mingw_qmake_qt5
 run_mingw_meson()                                      \
 {                                                      \
 %if 0%{?mingw_build_win32} == 1                        \
-mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw32_meson "$@"}                             \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_win64} == 1                        \
-mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
+mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw64_meson "$@"}                             \
 popd                                                   \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 0195735..acea6f2 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        131
-Release:        2%{?dist}
+Version:        132
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Mon Feb 21 2022 Sandro Mani <manisandro@gmail.com> - 132-1
+- Create build_winXX directories with mkdir -p
+
 * Thu Feb 10 2022 Sandro Mani <manisandro@gmail.com> - 131-2
 - Bump release
 

From ac9fcd8ab6ef95b5fc6d78eeb34a313f86a69c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Tue, 22 Feb 2022 15:34:39 +0400
Subject: [PATCH 51/90] Drop qt4 macros
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Suggested by Sandro Mani
(https://src.fedoraproject.org/rpms/mingw-filesystem/pull-request/8)

I think we could just drop qt4 (and kde4) everywhere. mingw-qt (aka Qt4)
has been removed two years ago (and was FTBFS for another year or two
before that).

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 macros.mingw   | 18 ------------------
 macros.mingw32 |  1 -
 macros.mingw64 |  1 -
 3 files changed, 20 deletions(-)

diff --git a/macros.mingw b/macros.mingw
index 034c5b8..f274198 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -99,24 +99,6 @@ popd                                                   \
 }                                                      \
 run_mingw_cmake_kde4
 
-%mingw_qmake_qt4                                       \
-run_mingw_qmake_qt4()                                  \
-{                                                      \
-%if 0%{?mingw_build_win32} == 1                        \
-mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw32_qmake_qt4} "$@"                         \
-popd                                                   \
-%endif                                                 \
-%if 0%{?mingw_build_win64} == 1                        \
-mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw64_qmake_qt4} "$@"                         \
-popd                                                   \
-%endif                                                 \
-}                                                      \
-run_mingw_qmake_qt4
-
 %mingw_qmake_qt5                                       \
 run_mingw_qmake_qt5()                                  \
 {                                                      \
diff --git a/macros.mingw32 b/macros.mingw32
index 040e808..647d868 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -151,7 +151,6 @@
   MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}/kde4 ${MINGW32_CMAKE_ARGS}" \
   %mingw32_cmake_generic
 
-%mingw32_qmake_qt4 /usr/bin/mingw32-qmake-qt4
 %mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
 
 %mingw32_meson %{mingw32_env} ; \
diff --git a/macros.mingw64 b/macros.mingw64
index 896b290..cecbc56 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -151,7 +151,6 @@
   MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}/kde4 ${MINGW64_CMAKE_ARGS}" \
   %mingw64_cmake_generic
 
-%mingw64_qmake_qt4 /usr/bin/mingw64-qmake-qt4
 %mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
 
 %mingw64_meson %{mingw64_env} ; \

From a4f0ba0de58c1cf2c0a0ca6b51e262707c931f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Tue, 22 Feb 2022 15:39:23 +0400
Subject: [PATCH 52/90] Add ucrt64 target
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

mingw_build_ucrt64 is set to 0, for bootstrapping purposes, to not build
it by default. We may decided to keep it 0, since converting all
packages can take a while.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 macros.mingw               |  45 ++++++++-
 macros.ucrt64              | 195 +++++++++++++++++++++++++++++++++++++
 mingw-filesystem.spec      | 162 ++++++++++++++++++++++--------
 mingw-scripts.sh           |   4 +
 mingw.prov                 |   2 +-
 mingw.req                  |   2 +-
 pkgconf-personality-ucrt64 |   6 ++
 standard-dlls-ucrt64       |   1 +
 toolchain-ucrt64.cmake     |  37 +++++++
 toolchain-ucrt64.meson     |  22 +++++
 ucrt64.attr                |   3 +
 ucrt64.sh                  |   3 +
 12 files changed, 440 insertions(+), 42 deletions(-)
 create mode 100644 macros.ucrt64
 create mode 100644 pkgconf-personality-ucrt64
 create mode 120000 standard-dlls-ucrt64
 create mode 100644 toolchain-ucrt64.cmake
 create mode 100644 toolchain-ucrt64.meson
 create mode 100644 ucrt64.attr
 create mode 100644 ucrt64.sh

diff --git a/macros.mingw b/macros.mingw
index f274198..bd0f635 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -1,8 +1,9 @@
 # RPM macros for the Fedora MinGW Cross Compiler collection
 
-%mingw_build_targets        mingw32 mingw64
+%mingw_build_targets        mingw32 mingw64 ucrt64
 %mingw_build_win32          1
 %mingw_build_win64          1
+%mingw_build_ucrt64         0
 
 %mingw_strip                mingw-strip
 %mingw_objdump              mingw-objdump
@@ -22,6 +23,9 @@
 %if 0%{?mingw_build_win64} == 1    \
 %{?mingw64_debug_package}          \
 %endif                             \
+%if 0%{?mingw_build_ucrt64} == 1   \
+%{?ucrt64_debug_package}          \
+%endif                             \
 %{nil}
 
 %mingw_package_header                                         \
@@ -48,6 +52,12 @@ pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw64_configure} "$@"                         \
 popd                                                   \
 %endif                                                 \
+%if 0%{?mingw_build_ucrt64} == 1                       \
+mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+    %{?ucrt64_configure} "$@"                          \
+popd                                                   \
+%endif                                                 \
 }                                                      \
 run_mingw_configure
 
@@ -60,6 +70,9 @@ run_mingw_make()                                                    \
 %if 0%{?mingw_build_win64} == 1                                     \
 %{__make} -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_MAKE_ARGS   \
 %endif                                                              \
+%if 0%{?mingw_build_ucrt64} == 1                                    \
+%{__make} -C build_ucrt64$MINGW_BUILDDIR_SUFFIX "$@" $UCRT64_MAKE_ARGS   \
+%endif                                                              \
 }                                                                   \
 run_mingw_make
 
@@ -78,6 +91,12 @@ pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw64_cmake "$@"}                             \
 popd                                                   \
 %endif                                                 \
+%if 0%{?mingw_build_ucrt64} == 1                       \
+mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+    %{?ucrt64_cmake "$@"}                              \
+popd                                                   \
+%endif                                                 \
 }                                                      \
 run_mingw_cmake
 
@@ -96,6 +115,12 @@ pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw64_cmake_kde4 "$@"}                        \
 popd                                                   \
 %endif                                                 \
+%if 0%{?mingw_build_ucrt64} == 1                       \
+mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+    %{?ucrt64_cmake_kde4 "$@"}                         \
+popd                                                   \
+%endif                                                 \
 }                                                      \
 run_mingw_cmake_kde4
 
@@ -114,6 +139,12 @@ pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw64_qmake_qt5} "$@"                         \
 popd                                                   \
 %endif                                                 \
+%if 0%{?mingw_build_ucrt64} == 1                       \
+mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+    %{?ucrt64_qmake_qt5} "$@"                          \
+popd                                                   \
+%endif                                                 \
 }                                                      \
 run_mingw_qmake_qt5
 
@@ -132,6 +163,12 @@ pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
     %{?mingw64_meson "$@"}                             \
 popd                                                   \
 %endif                                                 \
+%if 0%{?mingw_build_ucrt64} == 1                       \
+mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+    %{?ucrt64_meson "$@"}                              \
+popd                                                   \
+%endif                                                 \
 }                                                      \
 run_mingw_meson
 
@@ -144,6 +181,9 @@ ninja -C build_win32$MINGW_BUILDDIR_SUFFIX "$@" $MINGW32_NINJA_ARGS \
 %if 0%{?mingw_build_win64} == 1                                     \
 ninja -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_NINJA_ARGS \
 %endif                                                              \
+%if 0%{?mingw_build_ucrt64} == 1                                    \
+ninja -C build_ucrt64$MINGW_BUILDDIR_SUFFIX "$@" $UCRT64_NINJA_ARGS \
+%endif                                                              \
 }                                                                   \
 run_mingw_ninja
 
@@ -156,6 +196,9 @@ DESTDIR=%{buildroot} ninja -C build_win32$MINGW_BUILDDIR_SUFFIX install \
 %if 0%{?mingw_build_win64} == 1                                         \
 DESTDIR=%{buildroot} ninja -C build_win64$MINGW_BUILDDIR_SUFFIX install \
 %endif                                                                  \
+%if 0%{?mingw_build_ucrt64} == 1                                        \
+DESTDIR=%{buildroot} ninja -C build_ucrt64$MINGW_BUILDDIR_SUFFIX install \
+%endif                                                                  \
 }                                                                       \
 run_mingw_ninja_install
 
diff --git a/macros.ucrt64 b/macros.ucrt64
new file mode 100644
index 0000000..f4880cc
--- /dev/null
+++ b/macros.ucrt64
@@ -0,0 +1,195 @@
+# RPM macros for Fedora MinGW UCRT64.
+
+%ucrt64_pkg_name        %(echo %{name} | sed 's/^mingw-/ucrt64-/')
+%ucrt64_target          x86_64-w64-mingw32ucrt
+
+# Paths.
+%ucrt64_sysroot         %{_prefix}/%{ucrt64_target}/sys-root
+%ucrt64_prefix          %{ucrt64_sysroot}/mingw
+%ucrt64_exec_prefix     %{ucrt64_prefix}
+%ucrt64_bindir          %{ucrt64_exec_prefix}/bin
+%ucrt64_sbindir         %{ucrt64_exec_prefix}/sbin
+%ucrt64_libexecdir      %{ucrt64_exec_prefix}/libexec
+%ucrt64_libdir          %{ucrt64_exec_prefix}/lib
+%ucrt64_datadir         %{ucrt64_prefix}/share
+%ucrt64_docdir          %{ucrt64_prefix}/share/doc
+%ucrt64_infodir         %{ucrt64_prefix}/share/info
+%ucrt64_mandir          %{ucrt64_prefix}/share/man
+%ucrt64_sysconfdir      %{ucrt64_prefix}/etc
+%ucrt64_sharedstatedir  %{ucrt64_prefix}/com
+%ucrt64_localstatedir   %{ucrt64_prefix}/var
+%ucrt64_includedir      %{ucrt64_prefix}/include
+
+# Build macros.
+%ucrt64_host            %{ucrt64_target}
+
+%ucrt64_cflags          %{ucrt64_cppflags} -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
+%ucrt64_cppflags        %{nil}
+%ucrt64_ldflags         -fstack-protector -lssp
+
+%ucrt64_cc              %{ucrt64_target}-gcc
+%ucrt64_cxx             %{ucrt64_target}-g++
+%ucrt64_cpp             %{ucrt64_target}-gcc -E
+%ucrt64_addr2line       %{ucrt64_target}-addr2line
+%ucrt64_ar              %{ucrt64_target}-ar
+%ucrt64_as              %{ucrt64_target}-as
+%ucrt64_dlltool         %{ucrt64_target}-dlltool
+%ucrt64_dllwrap         %{ucrt64_target}-dllwrap
+%ucrt64_gcov            %{ucrt64_target}-gcov
+%ucrt64_gprof           %{ucrt64_target}-gprof
+%ucrt64_ld              %{ucrt64_target}-ld
+%ucrt64_nm              %{ucrt64_target}-nm
+%ucrt64_objcopy         %{ucrt64_target}-objcopy
+%ucrt64_objdump         %{ucrt64_target}-objdump
+%ucrt64_ranlib          %{ucrt64_target}-ranlib
+%ucrt64_readelf         %{ucrt64_target}-readelf
+%ucrt64_size            %{ucrt64_target}-size
+%ucrt64_strings         %{ucrt64_target}-strings
+%ucrt64_strip           %{ucrt64_target}-strip
+%ucrt64_windmc          %{ucrt64_target}-windmc
+%ucrt64_windres         %{ucrt64_target}-windres
+
+%ucrt64_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
+  if test -z "$PATH_ORIG" ; then \
+    PATH_ORIG="$PATH"; export PATH_ORIG; \
+  fi; \
+  PATH="%{ucrt64_bindir}:$PATH_ORIG"; export PATH; \
+  HOST_CC=gcc; export HOST_CC; \
+  unset PKG_CONFIG_PATH; \
+  _PREFIX="%{_bindir}/%{ucrt64_target}-"; \
+  for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \
+    x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
+    declare -x $x="$i" ; export $x; \
+  done; \
+  unset _PREFIX; \
+  CC="${UCRT64_CC:-%ucrt64_cc}"; export CC; \
+  CFLAGS="${UCRT64_CFLAGS-%ucrt64_cflags}"; export CFLAGS; \
+  CPPFLAGS="${UCRT64_CPPFLAGS-%ucrt64_cppflags}"; export CPPFLAGS; \
+  if [ -x "%{_bindir}/%{ucrt64_cxx}" ]; then \
+    CXX="${UCRT64_CXX:-%ucrt64_cxx}"; export CXX; \
+    CXXFLAGS="${UCRT64_CXXFLAGS-%ucrt64_cflags}"; export CXXFLAGS; \
+  else \
+    CXX=; export CXX; \
+    ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \
+    CXXFLAGS=; export CXXFLAGS; \
+  fi; \
+  LDFLAGS="${UCRT64_LDFLAGS:-%ucrt64_ldflags}"; export LDFLAGS; \
+  for i in `ls %{ucrt64_bindir}/*|grep -- "-config\$"` ; do \
+    x=`basename $i|tr "a-z+-." "A-ZX_"`; \
+    declare -x $x="$i" ; export $x; \
+  done; \
+  unset x i
+
+%ucrt64_pkg_config %{ucrt64_target}-pkg-config "$@"
+%ucrt64_pkgconfig_personalitydir %{mingw32_datadir}/pkgconfig/personality.d
+
+%ucrt64_configure %{ucrt64_env} ; \
+  __ucrt64_topdir=.; if ! test -x configure; then __ucrt64_topdir=..; fi; \\\
+  $__ucrt64_topdir/configure \\\
+	--host=%{ucrt64_host} \\\
+	--build=%_build \\\
+	--target=%{ucrt64_target} \\\
+	--prefix=%{ucrt64_prefix} \\\
+	--exec-prefix=%{ucrt64_exec_prefix} \\\
+	--bindir=%{ucrt64_bindir} \\\
+	--sbindir=%{ucrt64_sbindir} \\\
+	--sysconfdir=%{ucrt64_sysconfdir} \\\
+	--datadir=%{ucrt64_datadir} \\\
+	--includedir=%{ucrt64_includedir} \\\
+	--libdir=%{ucrt64_libdir} \\\
+	--libexecdir=%{ucrt64_libexecdir} \\\
+	--localstatedir=%{ucrt64_localstatedir} \\\
+	--sharedstatedir=%{ucrt64_sharedstatedir} \\\
+	--mandir=%{ucrt64_mandir} \\\
+	--infodir=%{ucrt64_infodir} \\\
+	${MINGW_CONFIGURE_ARGS} \\\
+	${UCRT64_CONFIGURE_ARGS} "$@"
+
+%ucrt64_make %{ucrt64_env} ; \
+  make \\\
+	prefix=%{ucrt64_prefix} \\\
+	exec_prefix=%{ucrt64_exec_prefix} \\\
+	bindir=%{ucrt64_bindir} \\\
+	sbindir=%{ucrt64_sbindir} \\\
+	sysconfdir=%{ucrt64_sysconfdir} \\\
+	datadir=%{ucrt64_datadir} \\\
+	includedir=%{ucrt64_includedir} \\\
+	libdir=%{ucrt64_libdir} \\\
+	libexecdir=%{ucrt64_libexecdir} \\\
+	localstatedir=%{ucrt64_localstatedir} \\\
+	sharedstatedir=%{ucrt64_sharedstatedir} \\\
+	mandir=%{ucrt64_mandir} \\\
+	infodir=%{ucrt64_infodir} "$@"
+
+%ucrt64_cmake_generic %{ucrt64_env} ; \
+  PKG_CONFIG_LIBDIR="%{ucrt64_libdir}/pkgconfig:%{ucrt64_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
+  if test -f CMakeLists.txt; then __ucrt64_topdir=.; \\\
+  elif test -f ../CMakeLists.txt; then __ucrt64_topdir=..; \\\
+  else __ucrt64_topdir=""; fi; \\\
+  if test "${MINGW_CMAKE_NO_VERBOSE}" == "" ; then \
+    UCRT64_CMAKE_ARGS="${UCRT64_CMAKE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON" \
+  fi \
+  PATH=%{_prefix}/%{ucrt64_target}/bin:$PATH %__cmake \\\
+        -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32ucrt64.cmake \\\
+        -DBUILD_SHARED_LIBS:BOOL=ON \\\
+        -DSYSCONF_INSTALL_DIR:PATH=%{ucrt64_sysconfdir} \\\
+        -DSHARE_INSTALL_PREFIX:PATH=%{ucrt64_datadir} \\\
+        -DCMAKE_INSTALL_PREFIX:PATH=%{ucrt64_prefix} \\\
+        -DCMAKE_INSTALL_LIBDIR:PATH=%{ucrt64_libdir} \\\
+        ${MINGW_CMAKE_ARGS} \\\
+        ${UCRT64_CMAKE_ARGS} \\\
+        "$@" $__ucrt64_topdir
+
+%ucrt64_cmake \
+  UCRT64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{ucrt64_includedir} ${UCRT64_CMAKE_ARGS}" \
+  %ucrt64_cmake_generic
+
+%ucrt64_cmake_kde4 \
+  UCRT64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{ucrt64_includedir}/kde4 ${UCRT64_CMAKE_ARGS}" \
+  %ucrt64_cmake_generic
+
+%ucrt64_qmake_qt5 /usr/bin/ucrt64-qmake-qt5
+
+%ucrt64_meson %{ucrt64_env} ; \
+  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
+  CFLAGS="${UCRT64_CFLAGS-%ucrt64_cflags}"; export CFLAGS; \\\
+  CPPFLAGS="${UCRT64_CPPFLAGS-%ucrt64_cppflags}"; export CPPFLAGS; \\\
+  LDFLAGS="${UCRT64_LDFLAGS:-%ucrt64_ldflags}"; export LDFLAGS; \\\
+  if test -f meson.build; then __ucrt64_topdir=.; \\\
+  elif test -f ../meson.build; then __ucrt64_topdir=..; \\\
+  else __ucrt64_topdir=""; fi; \\\
+  %__meson \\\
+        --cross-file /usr/share/mingw/toolchain-mingw32ucrt64.meson \\\
+        --default-library shared \\\
+        --prefix %{ucrt64_prefix} \\\
+        --bindir %{ucrt64_bindir} \\\
+        --sbindir %{ucrt64_sbindir} \\\
+        --sysconfdir %{ucrt64_sysconfdir} \\\
+        --datadir %{ucrt64_datadir} \\\
+        --includedir %{ucrt64_includedir} \\\
+        --libdir %{ucrt64_libdir} \\\
+        --libexecdir %{ucrt64_libexecdir} \\\
+        --localstatedir %{ucrt64_localstatedir} \\\
+        --sharedstatedir %{ucrt64_sharedstatedir} \\\
+        --mandir %{ucrt64_mandir} \\\
+        --infodir %{ucrt64_infodir} \\\
+        ${MINGW_MESON_ARGS} \\\
+        ${UCRT64_MESON_ARGS} \\\
+        "$@" $__ucrt64_topdir
+
+%ucrt64_description This is the cross-compiled version of this library / tool.\
+You should only install this package if you want to cross-compile programs for \
+Win64 (64 bit Windows).
+
+%ucrt64_debug_package                                                   \
+%package -n %{ucrt64_pkg_name}-debuginfo                                \
+Summary: Debug information for package %{ucrt64_pkg_name}               \
+Group: Development/Debug                                                 \
+BuildArch: noarch                                                        \
+%description -n %{ucrt64_pkg_name}-debuginfo                            \
+This package provides debug information for package %{ucrt64_pkg_name}. \
+Debug information is useful when developing applications that use this   \
+package or when debugging this package.                                  \
+%files -n %{ucrt64_pkg_name}-debuginfo -f ucrt64-debugfiles.list       \
+%defattr(-,root,root,-)                                                  \
+%{nil}
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index acea6f2..b642c45 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        132
+Version:        133
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -18,27 +18,35 @@ Source0:        COPYING
 Source1:        macros.mingw
 Source2:        macros.mingw32
 Source3:        macros.mingw64
-Source4:        mingw32.sh
-Source5:        mingw64.sh
-Source6:        mingw-find-debuginfo.sh
-Source7:        mingw.req
-Source8:        mingw.prov
-Source9:        mingw-scripts.sh
-Source10:       mingw-rpmlint.config
-Source11:       toolchain-mingw32.cmake
-Source12:       toolchain-mingw64.cmake
-Source13:       mingw-find-lang.sh
-Source14:       mingw32.attr
-Source15:       mingw64.attr
+Source4:        macros.ucrt64
+Source5:        mingw32.sh
+Source6:        mingw64.sh
+Source7:        ucrt64.sh
+Source8:        mingw-find-debuginfo.sh
+Source9:        mingw.req
+Source10:       mingw.prov
+Source11:       mingw-scripts.sh
+Source12:       mingw-rpmlint.config
+Source13:       toolchain-mingw32.cmake
+Source14:       toolchain-mingw64.cmake
+Source15:       toolchain-ucrt64.cmake
+Source16:       mingw-find-lang.sh
+Source17:       mingw32.attr
+Source18:       mingw64.attr
+Source19:       ucrt64.attr
 # generated with:
 # (rpm -ql mingw32-crt | grep '\.a$' | while read f ; do i686-w64-mingw32-dlltool   -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-mingw32
-Source16:       standard-dlls-mingw32
+Source20:       standard-dlls-mingw32
 # (rpm -ql mingw64-crt | grep '\.a$' | while read f ; do x86_64-w64-mingw32-dlltool -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-mingw64
-Source17:       standard-dlls-mingw64
-Source18:       toolchain-mingw32.meson
-Source19:       toolchain-mingw64.meson
-Source20:       pkgconf-personality-mingw32
-Source21:       pkgconf-personality-mingw64
+Source21:       standard-dlls-mingw64
+# (rpm -ql ucrt64-crt | grep '\.a$' | while read f ; do x86_64-w64-mingw32ucrt-dlltool -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-mingw32ucrt64
+Source22:       standard-dlls-ucrt64
+Source23:       toolchain-mingw32.meson
+Source24:       toolchain-mingw64.meson
+Source25:       toolchain-ucrt64.meson
+Source26:       pkgconf-personality-mingw32
+Source27:       pkgconf-personality-mingw64
+Source28:       pkgconf-personality-ucrt64
 
 # Taken from the Fedora filesystem package
 Source101:      https://fedorahosted.org/filesystem/browser/lang-exceptions
@@ -60,7 +68,7 @@ This environment is maintained by the Fedora MinGW SIG at:
 
 
 %package base
-Summary:        Generic files which are needed for both mingw32-filesystem and mingw64-filesystem
+Summary:        Generic files which are needed for {mingw32,mingw64,ucrt64}-filesystem
 
 Requires:       redhat-rpm-config
 # Obsolete the packages from the test repo
@@ -102,7 +110,7 @@ Provides:       mingw32-pkg-config = 0.28-17
 # proprietary DLLs in our find-requires checking script - essentially
 # it comes out the same either way.
 #
-Provides:       %(sed "s/\(.*\)/mingw32(\1) /g" %{SOURCE16} | tr "\n" " ")
+Provides:       %(sed "s/\(.*\)/mingw32(\1) /g" %{SOURCE20} | tr "\n" " ")
 Provides:       mingw32(mscoree.dll)
 
 %description -n mingw32-filesystem
@@ -122,7 +130,7 @@ Conflicts:      mingw64-pkg-config < 0.28-17
 Obsoletes:      mingw64-pkg-config < 0.28-17
 Provides:       mingw64-pkg-config = 0.28-17
 
-Provides:       %(sed "s/\(.*\)/mingw64(\1) /g" %{SOURCE17} | tr "\n" " ")
+Provides:       %(sed "s/\(.*\)/mingw64(\1) /g" %{SOURCE21} | tr "\n" " ")
 Provides:       mingw64(mscoree.dll)
 
 %description -n mingw64-filesystem
@@ -133,6 +141,24 @@ This environment is maintained by the Fedora MinGW SIG at:
 
   http://fedoraproject.org/wiki/SIGs/MinGW
 
+%package -n ucrt64-filesystem
+Summary:        MinGW cross compiler base filesystem and environment for the win64 UCRT target
+Requires:       %{name}-base = %{version}-%{release}
+# Replace ucrt64-pkg-config
+Conflicts:      ucrt64-pkg-config < 0.28-17
+Obsoletes:      ucrt64-pkg-config < 0.28-17
+Provides:       ucrt64-pkg-config = 0.28-17
+
+Provides:       %(sed "s/\(.*\)/ucrt64(\1) /g" %{SOURCE22} | tr "\n" " ")
+Provides:       ucrt64(mscoree.dll)
+
+%description -n ucrt64-filesystem
+This package contains the base filesystem layout, RPM macros and
+environment for all Fedora MinGW packages.
+
+This environment is maintained by the Fedora MinGW SIG at:
+
+  http://fedoraproject.org/wiki/SIGs/MinGW
 
 %prep
 %setup -q -c -T
@@ -147,31 +173,35 @@ cp %{SOURCE0} COPYING
 mkdir -p %{buildroot}
 
 mkdir -p %{buildroot}%{_libexecdir}
-install -m 755 %{SOURCE9} %{buildroot}%{_libexecdir}/mingw-scripts
+install -m 755 %{SOURCE11} %{buildroot}%{_libexecdir}/mingw-scripts
 
 mkdir -p %{buildroot}%{_bindir}
 pushd %{buildroot}%{_bindir}
 for i in mingw32-configure mingw32-cmake mingw32-make mingw32-meson mingw32-pkg-config \
-         mingw64-configure mingw64-cmake mingw64-make mingw64-meson mingw64-pkg-config ; do
+         mingw64-configure mingw64-cmake mingw64-make mingw64-meson mingw64-pkg-config \
+         ucrt64-configure ucrt64-cmake ucrt64-make ucrt64-meson ucrt64-pkg-config ; do
   ln -s %{_libexecdir}/mingw-scripts $i
 done
 for i in i686-w64-mingw32-pkg-config  \
-         x86_64-w64-mingw32-pkg-config ; do
+         x86_64-w64-mingw32-pkg-config \
+         x86_64-w64-mingw32ucrt-pkg-config ; do
   ln -s %{_bindir}/pkgconf $i
 done
 popd
 
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/
 install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/profile.d/
+install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/profile.d/
+install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/
 
 mkdir -p %{buildroot}%{macrosdir}
 install -m 644 %{SOURCE1} %{buildroot}%{macrosdir}/macros.mingw
 install -m 644 %{SOURCE2} %{buildroot}%{macrosdir}/macros.mingw32
 install -m 644 %{SOURCE3} %{buildroot}%{macrosdir}/macros.mingw64
+install -m 644 %{SOURCE4} %{buildroot}%{macrosdir}/macros.ucrt64
 
 mkdir -p %{buildroot}%{_sysconfdir}/rpmlint
-install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/rpmlint/
+install -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/rpmlint/
 
 # Create the folders required for gcc and binutils
 mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32
@@ -180,6 +210,9 @@ mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/lib
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/bin
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/lib
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/bin
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/lib
 
 # The MinGW system root which will contain Windows native binaries
 # and Windows-specific header files, pkgconfig, etc.
@@ -203,6 +236,16 @@ mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/cmake
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/sbin
 
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/bin
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/etc
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/include
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/include
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/lib
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/lib/pkgconfig
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/lib/cmake
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/sbin
+
 # We don't normally package manual pages and info files, except
 # where those are not supplied by a Fedora native package.  So we
 # need to create the directories.
@@ -235,8 +278,21 @@ mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/xml
 
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/doc
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/info
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/man
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/aclocal
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/themes
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/cmake
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/locale
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/pkgconfig
+mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/xml
+
 mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/i686-w64-mingw32
 mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32
+mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 # Own folders for all locales
 # Snippet taken from the Fedora filesystem package
@@ -253,6 +309,7 @@ grep -v "^$" %{buildroot}/iso_639.tab | grep -v "^#" | while read a b c d ; do
     fi
     echo "%lang(${locale}) %{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale/${locale}" >> filelist_mingw32
     echo "%lang(${locale}) %{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale/${locale}" >> filelist_mingw64
+    echo "%lang(${locale}) %{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/locale/${locale}" >> filelist_ucrt
 done
 
 cat %{SOURCE101} | grep -v "^#" | grep -v "^$" | while read loc ; do
@@ -274,40 +331,46 @@ cat %{SOURCE101} | grep -v "^#" | grep -v "^$" | while read loc ; do
     fi
     echo "%lang(${locale}) %{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw32
     echo "%lang(${locale}) %{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw64
+    echo "%lang(${locale}) %{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/locale/${loc}" >> filelist_ucrt
 done
 
 rm -f %{buildroot}/iso_639.tab
 rm -f %{buildroot}/iso_3166.tab
 
-cat filelist_mingw32 filelist_mingw64 | grep "locale" | while read a b ; do
+cat filelist_mingw32 filelist_mingw64 filelist_ucrt | grep "locale" | while read a b ; do
     mkdir -p -m 755 %{buildroot}/$b/LC_MESSAGES
 done
 
 # NB. NOT _libdir
 mkdir -p %{buildroot}/usr/lib/rpm
-install -m 0755 %{SOURCE6} %{buildroot}%{_rpmconfigdir}
-install -m 0755 %{SOURCE7} %{buildroot}%{_rpmconfigdir}
 install -m 0755 %{SOURCE8} %{buildroot}%{_rpmconfigdir}
-install -m 0755 %{SOURCE13} %{buildroot}%{_rpmconfigdir}
+install -m 0755 %{SOURCE9} %{buildroot}%{_rpmconfigdir}
+install -m 0755 %{SOURCE10} %{buildroot}%{_rpmconfigdir}
+install -m 0755 %{SOURCE16} %{buildroot}%{_rpmconfigdir}
 
 mkdir -p %{buildroot}/usr/lib/rpm/fileattrs
-install -m 0644 %{SOURCE14} %{buildroot}%{_rpmconfigdir}/fileattrs/
-install -m 0644 %{SOURCE15} %{buildroot}%{_rpmconfigdir}/fileattrs/
+install -m 0644 %{SOURCE17} %{buildroot}%{_rpmconfigdir}/fileattrs/
+install -m 0644 %{SOURCE18} %{buildroot}%{_rpmconfigdir}/fileattrs/
+install -m 0644 %{SOURCE19} %{buildroot}%{_rpmconfigdir}/fileattrs/
 
 mkdir -p %{buildroot}%{_datadir}/mingw
-install -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/mingw/
-install -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/mingw/
-install -m 0644 %{SOURCE18} %{buildroot}%{_datadir}/mingw/
-install -m 0644 %{SOURCE19} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE23} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE24} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE25} %{buildroot}%{_datadir}/mingw/
 
 mkdir -p %{buildroot}%{pkgconfig_personalitydir}
-install -m 0644 %{SOURCE20} %{buildroot}%{pkgconfig_personalitydir}/i686-w64-mingw32.personality
-install -m 0644 %{SOURCE21} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
+install -m 0644 %{SOURCE26} %{buildroot}%{pkgconfig_personalitydir}/i686-w64-mingw32.personality
+install -m 0644 %{SOURCE27} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
+install -m 0644 %{SOURCE28} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32ucrt.personality
 
 # Link mingw-pkg-config man pages to pkgconf(1)
 mkdir -p %{buildroot}%{_mandir}/man1/
 echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/i686-w64-mingw32-pkg-config.1
 echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1
+echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-pkg-config.1
 
 
 %files base
@@ -357,7 +420,28 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32
 
 
+%files -n ucrt64-filesystem
+%{macrosdir}/macros.ucrt64
+%config(noreplace) %{_sysconfdir}/profile.d/ucrt64.sh
+%{_bindir}/ucrt64-configure
+%{_bindir}/ucrt64-cmake
+%{_bindir}/ucrt64-make
+%{_bindir}/ucrt64-meson
+%{_bindir}/ucrt64-pkg-config
+%{_bindir}/x86_64-w64-mingw32ucrt-pkg-config
+%{_prefix}/x86_64-w64-mingw32ucrt
+%{_rpmconfigdir}/fileattrs/ucrt64.attr
+%{_datadir}/mingw/toolchain-ucrt64.cmake
+%{_datadir}/mingw/toolchain-ucrt64.meson
+%{pkgconfig_personalitydir}/x86_64-w64-mingw32ucrt.personality
+%{_mandir}/man1/x86_64-w64-mingw32ucrt-pkg-config.1*
+%dir %{_prefix}/lib/debug/%{_prefix}
+%dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
+
 %changelog
+* Tue Feb 22 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 133-1
+- Add ucrt64 target. Related to rhbz#2055254.
+
 * Mon Feb 21 2022 Sandro Mani <manisandro@gmail.com> - 132-1
 - Create build_winXX directories with mkdir -p
 
diff --git a/mingw-scripts.sh b/mingw-scripts.sh
index 503d5cb..4dc98d2 100755
--- a/mingw-scripts.sh
+++ b/mingw-scripts.sh
@@ -26,6 +26,8 @@ if [ "`basename $0`" = "i686-w64-mingw32-pkg-config" ] ; then
     NAME="mingw32_pkg_config"
 elif [ "`basename $0`" = "x86_64-w64-mingw32-pkg-config" ] ; then
     NAME="mingw64_pkg_config"
+elif [ "`basename $0`" = "x86_64-w64-mingw32ucrt-pkg-config" ] ; then
+    NAME="ucrt64_pkg_config"
 else
     NAME="`basename $0|tr -- - _`"
 fi
@@ -37,6 +39,8 @@ if [[ $NAME == *cmake* ]] ; then
     MINGW32_CXXFLAGS=${MINGW32_CXXFLAGS:-""}
     MINGW64_CFLAGS=${MINGW64_CFLAGS:-""}
     MINGW64_CXXFLAGS=${MINGW64_CXXFLAGS:-""}
+    UCRT64_CFLAGS=${UCRT64_CFLAGS:-""}
+    UCRT64_CXXFLAGS=${UCRT64_CXXFLAGS:-""}
 fi
 
 # NOTE: The use of 'eval' in combination with '$@' in the evaluated rpm macro is
diff --git a/mingw.prov b/mingw.prov
index 1bcb2da..b877e16 100755
--- a/mingw.prov
+++ b/mingw.prov
@@ -5,7 +5,7 @@
 
 targets=$@
 if [ -z "$targets" ] ; then
-    echo "Usage: $0 [ mingw32 ] [ mingw64 ]"
+    echo "Usage: $0 [ mingw32 ] [ mingw64 ] [ ucrt64 ]"
     exit 1
 fi
 
diff --git a/mingw.req b/mingw.req
index b7bb6d4..da2106d 100755
--- a/mingw.req
+++ b/mingw.req
@@ -7,7 +7,7 @@
 
 targets=$@
 if [ -z "$targets" ] ; then
-    echo "Usage: $0 [ mingw32 ] [ mingw64 ]"
+    echo "Usage: $0 [ mingw32 ] [ mingw64 ] [ ucrt64 ]"
     exit 1
 fi
 
diff --git a/pkgconf-personality-ucrt64 b/pkgconf-personality-ucrt64
new file mode 100644
index 0000000..7dcf5b3
--- /dev/null
+++ b/pkgconf-personality-ucrt64
@@ -0,0 +1,6 @@
+# MinGW UCRT 64-bit x86 Windows target
+Triplet: x86_64-w64-mingw32ucrt
+SysrootDir: /usr/x86_64-w64-mingw32ucrt/sys-root/mingw
+DefaultSearchPaths: /usr/x86_64-w64-mingw32ucrt/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32ucrt/sys-root/mingw/share/pkgconfig
+SystemIncludePaths: /usr/x86_64-w64-mingw32ucrt/sys-root/mingw/include
+SystemLibraryPaths: /usr/x86_64-w64-mingw32ucrt/sys-root/mingw/lib
diff --git a/standard-dlls-ucrt64 b/standard-dlls-ucrt64
new file mode 120000
index 0000000..bc4ebdd
--- /dev/null
+++ b/standard-dlls-ucrt64
@@ -0,0 +1 @@
+standard-dlls-mingw64
\ No newline at end of file
diff --git a/toolchain-ucrt64.cmake b/toolchain-ucrt64.cmake
new file mode 100644
index 0000000..7d3c2f3
--- /dev/null
+++ b/toolchain-ucrt64.cmake
@@ -0,0 +1,37 @@
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(CMAKE_SYSTEM_PROCESSOR x86_64)
+
+# specify the cross compiler
+IF(NOT DEFINED ENV{CC})
+    SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32ucrt-gcc)
+ENDIF()
+IF(NOT DEFINED ENV{CXX})
+    SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32ucrt-g++)
+ENDIF()
+IF(NOT DEFINED ENV{FC})
+    SET(CMAKE_Fortran_COMPILER /usr/bin/x86_64-w64-mingw32ucrt-gfortran)
+ENDIF()
+
+# where is the target environment
+SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32ucrt/sys-root/mingw)
+
+# search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+# Make sure Qt can be detected by CMake
+SET(QT_BINARY_DIR /usr/x86_64-w64-mingw32ucrt/bin /usr/bin)
+
+# set the resource compiler (RHBZ #652435)
+IF(NOT $ENV{RC})
+    SET(CMAKE_RC_COMPILER /usr/bin/x86_64-w64-mingw32ucrt-windres)
+ENDIF()
+
+# These are needed for compiling lapack (RHBZ #753906)
+SET(CMAKE_AR:FILEPATH /usr/bin/x86_64-w64-mingw32ucrt-ar)
+SET(CMAKE_RANLIB:FILEPATH /usr/bin/x86_64-w64-mingw32ucrt-ranlib)
+
+# Workaround failure to detect boost (see #2037724)
+SET(Boost_ARCHITECTURE "-x64")
diff --git a/toolchain-ucrt64.meson b/toolchain-ucrt64.meson
new file mode 100644
index 0000000..8eb172b
--- /dev/null
+++ b/toolchain-ucrt64.meson
@@ -0,0 +1,22 @@
+[binaries]
+c = 'x86_64-w64-mingw32ucrt-gcc'
+cpp = 'x86_64-w64-mingw32ucrt-g++'
+fortran = 'x86_64-w64-mingw32ucrt-gfortran'
+rust = ['rustc', '--target', 'x86_64-pc-windows-msvc', '-C', 'linker=/usr/bin/x86_64-w64-mingw32ucrt-gcc']
+ar = '/usr/bin/x86_64-w64-mingw32ucrt-ar'
+pkgconfig = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config'
+ranlib = '/usr/bin/x86_64-w64-mingw32ucrt-ranlib'
+strip = '/usr/bin/x86_64-w64-mingw32ucrt-strip'
+windres = '/usr/bin/x86_64-w64-mingw32ucrt-windres'
+dlltool = '/usr/bin/x86_64-w64-mingw32ucrt-dlltool'
+libgcrypt-config = '/usr/x86_64-w64-mingw32ucrt/sys-root/mingw/bin/libgcrypt-config'
+
+[properties]
+root = '/usr/x86_64-w64-mingw32ucrt/sys-root/mingw'
+needs_exe_wrapper = true
+
+[host_machine]
+system = 'windows'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'
diff --git a/ucrt64.attr b/ucrt64.attr
new file mode 100644
index 0000000..26f6a79
--- /dev/null
+++ b/ucrt64.attr
@@ -0,0 +1,3 @@
+%__ucrt64_provides     %{_rpmconfigdir}/mingw.prov ucrt64
+%__ucrt64_requires     %{_rpmconfigdir}/mingw.req ucrt64
+%__ucrt64_path		^%{ucrt64_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee]|[Pp][Yy][Dd]?|[Pp][Cc])$
diff --git a/ucrt64.sh b/ucrt64.sh
new file mode 100644
index 0000000..5723ffb
--- /dev/null
+++ b/ucrt64.sh
@@ -0,0 +1,3 @@
+# Environment variables for cross compilers.
+
+alias ucrt64-env='eval `rpm --eval %{ucrt64_env}`'

From b9ffd1b6a5e6963e47605328fe1997cbaa6fa47a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Thu, 24 Feb 2022 17:53:59 +0400
Subject: [PATCH 53/90] Fix ucrt64 toolchain filenames.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 macros.ucrt64         | 4 ++--
 mingw-filesystem.spec | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/macros.ucrt64 b/macros.ucrt64
index f4880cc..acbde9e 100644
--- a/macros.ucrt64
+++ b/macros.ucrt64
@@ -130,7 +130,7 @@
     UCRT64_CMAKE_ARGS="${UCRT64_CMAKE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON" \
   fi \
   PATH=%{_prefix}/%{ucrt64_target}/bin:$PATH %__cmake \\\
-        -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32ucrt64.cmake \\\
+        -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-ucrt64.cmake \\\
         -DBUILD_SHARED_LIBS:BOOL=ON \\\
         -DSYSCONF_INSTALL_DIR:PATH=%{ucrt64_sysconfdir} \\\
         -DSHARE_INSTALL_PREFIX:PATH=%{ucrt64_datadir} \\\
@@ -159,7 +159,7 @@
   elif test -f ../meson.build; then __ucrt64_topdir=..; \\\
   else __ucrt64_topdir=""; fi; \\\
   %__meson \\\
-        --cross-file /usr/share/mingw/toolchain-mingw32ucrt64.meson \\\
+        --cross-file /usr/share/mingw/toolchain-ucrt64.meson \\\
         --default-library shared \\\
         --prefix %{ucrt64_prefix} \\\
         --bindir %{ucrt64_bindir} \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index b642c45..5889231 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        133
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -439,6 +439,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu Feb 24 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 133-2
+- Fix ucrt64 toolchain filenames.
+
 * Tue Feb 22 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 133-1
 - Add ucrt64 target. Related to rhbz#2055254.
 

From a723557d96ce2bb1c6f367a565ce07df93cf09c5 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 28 Apr 2022 12:33:47 +0200
Subject: [PATCH 54/90] Regenerate standard-dlls

---
 mingw-filesystem.spec |   9 +-
 mingw.req             |   2 +-
 standard-dlls-mingw32 | 206 ++++++++-
 standard-dlls-mingw64 | 649 +++++++++------------------
 standard-dlls-ucrt64  | 988 +++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 1400 insertions(+), 454 deletions(-)
 mode change 120000 => 100644 standard-dlls-ucrt64

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 5889231..91b702d 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        133
-Release:        2%{?dist}
+Version:        134
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -39,7 +39,7 @@ Source19:       ucrt64.attr
 Source20:       standard-dlls-mingw32
 # (rpm -ql mingw64-crt | grep '\.a$' | while read f ; do x86_64-w64-mingw32-dlltool -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-mingw64
 Source21:       standard-dlls-mingw64
-# (rpm -ql ucrt64-crt | grep '\.a$' | while read f ; do x86_64-w64-mingw32ucrt-dlltool -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-mingw32ucrt64
+# (rpm -ql ucrt64-crt | grep '\.a$' | while read f ; do x86_64-w64-mingw32ucrt-dlltool -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-ucrt64
 Source22:       standard-dlls-ucrt64
 Source23:       toolchain-mingw32.meson
 Source24:       toolchain-mingw64.meson
@@ -439,6 +439,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu Apr 28 2022 Sandro Mani <manisandro@gmail.com> - 134-1
+- Regenerate standard-dlls
+
 * Thu Feb 24 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 133-2
 - Fix ucrt64 toolchain filenames.
 
diff --git a/mingw.req b/mingw.req
index da2106d..ef2e065 100755
--- a/mingw.req
+++ b/mingw.req
@@ -25,7 +25,7 @@ for target in $targets; do
 	for f in $dlls; do
 		if [[ $f =~ .*$host_triplet.* ]]; then
 			$OBJDUMP -p $f | grep 'DLL Name' | grep -Eio '[-._\+[:alnum:]]+\.dll' |
-				grep -v 'api-ms-win' | tr '[:upper:]' '[:lower:]' |
+				tr '[:upper:]' '[:lower:]' |
 				sed "s/\(.*\)/$target(\1)/"
 			dll_found=true
 		fi
diff --git a/standard-dlls-mingw32 b/standard-dlls-mingw32
index 2606332..244e30b 100644
--- a/standard-dlls-mingw32
+++ b/standard-dlls-mingw32
@@ -3,11 +3,177 @@ activeds.dll
 adsldpc.dll
 advapi32.dll
 apcups.dll
+api-ms-win-appmodel-runtime-l1-1-0.dll
+api-ms-win-appmodel-runtime-l1-1-1.dll
+api-ms-win-core-com-l1-1-0.dll
+api-ms-win-core-com-l1-1-1.dll
+api-ms-win-core-com-l2-1-1.dll
+api-ms-win-core-com-midlproxystub-l1-1-0.dll
+api-ms-win-core-comm-l1-1-0.dll
+api-ms-win-core-comm-l1-1-1.dll
+api-ms-win-core-comm-l1-1-2.dll
+api-ms-win-core-console-l1-1-0.dll
+api-ms-win-core-console-l1-2-0.dll
+api-ms-win-core-console-l2-1-0.dll
+api-ms-win-core-console-l2-2-0.dll
+api-ms-win-core-console-l3-2-0.dll
+api-ms-win-core-datetime-l1-1-0.dll
+api-ms-win-core-datetime-l1-1-1.dll
+api-ms-win-core-datetime-l1-1-2.dll
+api-ms-win-core-debug-l1-1-0.dll
+api-ms-win-core-debug-l1-1-1.dll
+api-ms-win-core-delayload-l1-1-1.dll
+api-ms-win-core-enclave-l1-1-0.dll
+api-ms-win-core-errorhandling-l1-1-0.dll
+api-ms-win-core-errorhandling-l1-1-1.dll
+api-ms-win-core-errorhandling-l1-1-3.dll
+api-ms-win-core-featurestaging-l1-1-0.dll
+api-ms-win-core-featurestaging-l1-1-1.dll
+api-ms-win-core-fibers-l1-1-1.dll
+api-ms-win-core-fibers-l2-1-1.dll
+api-ms-win-core-file-ansi-l1-1-0.dll
+api-ms-win-core-file-ansi-l2-1-0.dll
+api-ms-win-core-file-fromapp-l1-1-0.dll
+api-ms-win-core-file-l1-1-0.dll
+api-ms-win-core-file-l1-2-1.dll
+api-ms-win-core-file-l1-2-2.dll
+api-ms-win-core-file-l2-1-0.dll
+api-ms-win-core-file-l2-1-1.dll
+api-ms-win-core-file-l2-1-2.dll
+api-ms-win-core-firmware-l1-1-0.dll
+api-ms-win-core-handle-l1-1-0.dll
+api-ms-win-core-heap-l1-2-0.dll
+api-ms-win-core-heap-l2-1-0.dll
+api-ms-win-core-heap-obsolete-l1-1-0.dll
+api-ms-win-core-interlocked-l1-1-0.dll
+api-ms-win-core-interlocked-l1-2-0.dll
+api-ms-win-core-io-l1-1-0.dll
+api-ms-win-core-io-l1-1-1.dll
+api-ms-win-core-kernel32-legacy-ansi-l1-1-0.dll
+api-ms-win-core-kernel32-legacy-l1-1-0.dll
+api-ms-win-core-kernel32-legacy-l1-1-1.dll
+api-ms-win-core-largeinteger-l1-1-0.dll
+api-ms-win-core-libraryloader-l1-2-0.dll
+api-ms-win-core-libraryloader-l1-2-1.dll
+api-ms-win-core-libraryloader-l2-1-0.dll
+api-ms-win-core-localization-ansi-l1-1-0.dll
+api-ms-win-core-localization-l1-2-0.dll
+api-ms-win-core-localization-l1-2-1.dll
+api-ms-win-core-localization-l1-2-2.dll
+api-ms-win-core-localization-l2-1-0.dll
+api-ms-win-core-localization-obsolete-l1-2-0.dll
+api-ms-win-core-memory-l1-1-0.dll
+api-ms-win-core-memory-l1-1-1.dll
+api-ms-win-core-memory-l1-1-2.dll
+api-ms-win-core-memory-l1-1-3.dll
+api-ms-win-core-memory-l1-1-5.dll
+api-ms-win-core-memory-l1-1-6.dll
+api-ms-win-core-memory-l1-1-7.dll
+api-ms-win-core-namedpipe-ansi-l1-1-0.dll
+api-ms-win-core-namedpipe-ansi-l1-1-1.dll
+api-ms-win-core-namedpipe-l1-1-0.dll
+api-ms-win-core-namedpipe-l1-2-1.dll
+api-ms-win-core-namedpipe-l1-2-2.dll
+api-ms-win-core-namespace-ansi-l1-1-0.dll
+api-ms-win-core-namespace-l1-1-0.dll
+api-ms-win-core-normalization-l1-1-0.dll
+api-ms-win-core-path-l1-1-0.dll
+api-ms-win-core-processenvironment-l1-1-0.dll
+api-ms-win-core-processenvironment-l1-2-0.dll
+api-ms-win-core-processthreads-l1-1-0.dll
+api-ms-win-core-processthreads-l1-1-1.dll
+api-ms-win-core-processthreads-l1-1-2.dll
+api-ms-win-core-processthreads-l1-1-3.dll
+api-ms-win-core-processtopology-obsolete-l1-1-0.dll
+api-ms-win-core-profile-l1-1-0.dll
+api-ms-win-core-psapi-ansi-l1-1-0.dll
+api-ms-win-core-psapi-l1-1-0.dll
+api-ms-win-core-psm-appnotify-l1-1-0.dll
+api-ms-win-core-realtime-l1-1-0.dll
+api-ms-win-core-realtime-l1-1-1.dll
+api-ms-win-core-realtime-l1-1-2.dll
+api-ms-win-core-rtlsupport-l1-2-0.dll
+api-ms-win-core-slapi-l1-1-0.dll
+api-ms-win-core-string-l1-1-0.dll
+api-ms-win-core-synch-ansi-l1-1-0.dll
+api-ms-win-core-synch-l1-1-0.dll
+api-ms-win-core-synch-l1-2-0.dll
+api-ms-win-core-synch-l1-2-1.dll
+api-ms-win-core-sysinfo-l1-1-0.dll
+api-ms-win-core-sysinfo-l1-2-0.dll
+api-ms-win-core-sysinfo-l1-2-1.dll
+api-ms-win-core-sysinfo-l1-2-3.dll
+api-ms-win-core-threadpool-l1-2-0.dll
+api-ms-win-core-timezone-l1-1-0.dll
+api-ms-win-core-timezone-l1-1-1.dll
+api-ms-win-core-url-l1-1-0.dll
+api-ms-win-core-util-l1-1-0.dll
+api-ms-win-core-versionansi-l1-1-0.dll
+api-ms-win-core-version-l1-1-0.dll
+api-ms-win-core-version-l1-1-1.dll
+api-ms-win-core-windowsceip-l1-1-0.dll
+api-ms-win-core-windowserrorreporting-l1-1-0.dll
+api-ms-win-core-windowserrorreporting-l1-1-1.dll
+api-ms-win-core-windowserrorreporting-l1-1-2.dll
+api-ms-win-core-winrt-error-l1-1-0.dll
+api-ms-win-core-winrt-error-l1-1-1.dll
+api-ms-win-core-winrt-l1-1-0.dll
+api-ms-win-core-winrt-registration-l1-1-0.dll
+api-ms-win-core-winrt-robuffer-l1-1-0.dll
+api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll
+api-ms-win-core-winrt-string-l1-1-0.dll
+api-ms-win-core-wow64-l1-1-0.dll
+api-ms-win-core-wow64-l1-1-1.dll
+api-ms-win-core-xstate-l2-1-0.dll
+api-ms-win-crt-conio-l1-1-0.dll
+api-ms-win-crt-convert-l1-1-0.dll
+api-ms-win-crt-environment-l1-1-0.dll
+api-ms-win-crt-filesystem-l1-1-0.dll
+api-ms-win-crt-heap-l1-1-0.dll
+api-ms-win-crt-locale-l1-1-0.dll
+api-ms-win-crt-math-l1-1-0.dll
+api-ms-win-crt-multibyte-l1-1-0.dll
+api-ms-win-crt-private-l1-1-0.dll
+api-ms-win-crt-process-l1-1-0.dll
+api-ms-win-crt-runtime-l1-1-0.dll
+api-ms-win-crt-stdio-l1-1-0.dll
+api-ms-win-crt-string-l1-1-0.dll
+api-ms-win-crt-time-l1-1-0.dll
+api-ms-win-crt-utility-l1-1-0.dll
+api-ms-win-devices-config-l1-1-1.dll
+api-ms-win-devices-config-l1-1-2.dll
+api-ms-win-eventing-classicprovider-l1-1-0.dll
+api-ms-win-eventing-consumer-l1-1-0.dll
+api-ms-win-eventing-controller-l1-1-0.dll
+api-ms-win-eventing-legacy-l1-1-0.dll
+api-ms-win-eventing-provider-l1-1-0.dll
+api-ms-win-gaming-deviceinformation-l1-1-0.dll
+api-ms-win-gaming-expandedresources-l1-1-0.dll
+api-ms-win-gaming-tcui-l1-1-0.dll
+api-ms-win-gaming-tcui-l1-1-2.dll
+api-ms-win-gaming-tcui-l1-1-3.dll
+api-ms-win-gaming-tcui-l1-1-4.dll
+api-ms-win-ro-typeresolution-l1-1-0.dll
+api-ms-win-ro-typeresolution-l1-1-1.dll
+api-ms-win-security-base-l1-1-0.dll
+api-ms-win-security-base-l1-2-0.dll
+api-ms-win-security-base-l1-2-1.dll
+api-ms-win-security-cryptoapi-l1-1-0.dll
+api-ms-win-security-isolatedcontainer-l1-1-0.dll
+api-ms-win-security-lsalookup-ansi-l2-1-0.dll
+api-ms-win-security-lsalookup-l2-1-0.dll
+api-ms-win-security-provider-ansi-l1-1-0.dll
+api-ms-win-security-provider-l1-1-0.dll
+api-ms-win-security-sddl-ansi-l1-1-0.dll
+api-ms-win-security-sddl-l1-1-0.dll
+api-ms-win-shcore-obsolete-l1-1-0.dll
+api-ms-win-shcore-stream-winrt-l1-1-0.dll
 authz.dll
 avicap32.dll
 avifil32.dll
 avrt.dll
 bcrypt.dll
+bluetoothapis.dll
 bootvid.dll
 browcli.dll
 bthprops.cpl
@@ -30,7 +196,9 @@ cryptxml.dll
 cscapi.dll
 ctl3d32.dll
 d2d1.dll
+d3d10.dll
 d3d11.dll
+d3d12.dll
 d3d8.dll
 d3d9.dll
 d3dcompiler_37.dll
@@ -87,6 +255,7 @@ davclnt.dll
 davhlpr.dll
 dbgeng.dll
 dbghelp.dll
+dcomp.dll
 ddraw.dll
 devmgr.dll
 devobj.dll
@@ -97,8 +266,10 @@ dhcpcsvc.dll
 dhcpsapi.dll
 dinput8.dll
 dinput.dll
+dismapi.dll
 dlcapi.dll
 dnsapi.dll
+dpapi.dll
 dplayx.dll
 dpnaddr.dll
 dpnet.dll
@@ -120,7 +291,10 @@ elscore.dll
 esent.dll
 evr.dll
 faultrep.dll
+feclient.dll
+fontsub.dll
 fwpuclnt.dll
+gamemode.dll
 gdi32.dll
 gdiplus.dll
 genericui.dll
@@ -133,6 +307,7 @@ gpedit.dll
 gpscript.dll
 gptext.dll
 hal.dll
+hhctrl.ocx
 hidclass.sys
 hid.dll
 hidparse.sys
@@ -144,6 +319,7 @@ imm32.dll
 iphlpapi.dll
 iscsidsc.dll
 kernel32.dll
+ksecdd.sys
 ksproxy.ax
 ks.sys
 ksuser.dll
@@ -152,10 +328,15 @@ logoncli.dll
 lz32.dll
 mapi32.dll
 mcd.sys
+mfcore.dll
 mfcuia32.dll
 mf.dll
 mfplat.dll
+mfplay.dll
+mfreadwrite.dll
+mfsensorgroup.dll
 mgmtapi.dll
+mmdevapi.dll
 mprapi.dll
 mpr.dll
 mqrt.dll
@@ -168,15 +349,23 @@ mshtml.dll
 mshtmled.dll
 msi.dll
 msimg32.dll
+msoledbsql.dll
 mstask.dll
+msvcp120_app.dll
 msvcp60.dll
 msvcr100.dll
 msvcr110.dll
+msvcr120_app.dll
 msvcr120d.dll
 msvcr120.dll
+msvcr70.dll
+msvcr71.dll
 msvcr80.dll
 msvcr90d.dll
 msvcr90.dll
+msvcrt10.dll
+msvcrt20.dll
+msvcrt40.dll
 msvcrt.dll
 msvfw32.dll
 mswsock.dll
@@ -185,6 +374,7 @@ nddeapi.dll
 ndfapi.dll
 ndis.sys
 netapi32.dll
+netio.sys
 netjoin.dll
 netutils.dll
 newdev.dll
@@ -203,6 +393,7 @@ oledlg.dll
 olepro32.dll
 olesvr32.dll
 olethk32.dll
+opends60.dll
 opengl32.dll
 p2pcollab.dll
 p2p.dll
@@ -214,8 +405,11 @@ penwin32.dll
 pkpd32.dll
 polprocl.dll
 powrprof.dll
+prntvpt.dll
+propsys.dll
 psapi.dll
 quartz.dll
+query.dll
 qutil.dll
 qwave.dll
 rapi.dll
@@ -231,10 +425,13 @@ rstrtmgr.dll
 rtm.dll
 rtutils.dll
 samcli.dll
+schannel.dll
 schedcli.dll
 scsiport.sys
 secur32.dll
+security.dll
 setupapi.dll
+shcore.dll
 shell32.dll
 shfolder.dll
 shlwapi.dll
@@ -252,8 +449,8 @@ tapi32.dll
 tbs.dll
 tdh.dll
 tdi.sys
-thirdpartyeapdispatcher.dll
 txfw32.dll
+ucrtbase.dll
 url.dll
 urlmon.dll
 usbcamd2.sys
@@ -264,13 +461,13 @@ user32.dll
 userenv.dll
 usp10.dll
 uxtheme.dll
+vcruntime140_app.dll
 vdmdbg.dll
 version.dll
 videoprt.sys
 virtdisk.dll
 vssapi.dll
 vss_ps.dll
-vsstrace.dll
 wdsclientapi.dll
 wdsclient.dll
 wdscore.dll
@@ -279,13 +476,17 @@ wdsimage.dll
 wdstptc.dll
 wdsupgcompl.dll
 wdsutil.dll
+webauthn.dll
+websocket.dll
 wecapi.dll
 wer.dll
 wevtapi.dll
 wevtfwd.dll
 wiadss.dll
+wimgapi.dll
 win32k.sys
 win32spl.dll
+windowscodecs.dll
 winhttp.dll
 wininet.dll
 winmm.dll
@@ -300,6 +501,7 @@ wlanui.dll
 wlanutil.dll
 wldap32.dll
 wmilib.sys
+wofutil.dll
 wow32.dll
 ws2_32.dll
 wsdapi.dll
diff --git a/standard-dlls-mingw64 b/standard-dlls-mingw64
index 496a4a7..1242771 100644
--- a/standard-dlls-mingw64
+++ b/standard-dlls-mingw64
@@ -1,38 +1,184 @@
-6to4svc.dll
-aaaamon.dll
 acledit.dll
 aclui.dll
-active.dll
 activeds.dll
 admparse.dll
 admwprox.dll
 adptif.dll
-adrot.dll
-adsiis.dll
 adsiisex.dll
 adsldpc.dll
-adsldp.dll
-adsmsext.dll
-adsnt.dll
 advapi32.dll
 advpack.dll
-aelupsvc.dll
 agentanm.dll
-agentctl.dll
-agentdp2.dll
-agentdpv.dll
-agentmpx.dll
-agentpsh.dll
-agentsr.dll
-agrmco64.dll
-agtintl.dll
 aksclass.dll
 alrsvc.dll
-amstream.dll
 apcups.dll
+api-ms-win-appmodel-runtime-l1-1-0.dll
+api-ms-win-appmodel-runtime-l1-1-1.dll
+api-ms-win-core-com-l1-1-0.dll
+api-ms-win-core-com-l1-1-1.dll
+api-ms-win-core-com-l2-1-1.dll
+api-ms-win-core-com-midlproxystub-l1-1-0.dll
+api-ms-win-core-comm-l1-1-0.dll
+api-ms-win-core-comm-l1-1-1.dll
+api-ms-win-core-comm-l1-1-2.dll
+api-ms-win-core-console-l1-1-0.dll
+api-ms-win-core-console-l1-2-0.dll
+api-ms-win-core-console-l2-1-0.dll
+api-ms-win-core-console-l2-2-0.dll
+api-ms-win-core-console-l3-2-0.dll
+api-ms-win-core-datetime-l1-1-0.dll
+api-ms-win-core-datetime-l1-1-1.dll
+api-ms-win-core-datetime-l1-1-2.dll
+api-ms-win-core-debug-l1-1-0.dll
+api-ms-win-core-debug-l1-1-1.dll
+api-ms-win-core-delayload-l1-1-1.dll
+api-ms-win-core-enclave-l1-1-0.dll
+api-ms-win-core-errorhandling-l1-1-0.dll
+api-ms-win-core-errorhandling-l1-1-1.dll
+api-ms-win-core-errorhandling-l1-1-3.dll
+api-ms-win-core-featurestaging-l1-1-0.dll
+api-ms-win-core-featurestaging-l1-1-1.dll
+api-ms-win-core-fibers-l1-1-1.dll
+api-ms-win-core-fibers-l2-1-1.dll
+api-ms-win-core-file-ansi-l1-1-0.dll
+api-ms-win-core-file-ansi-l2-1-0.dll
+api-ms-win-core-file-fromapp-l1-1-0.dll
+api-ms-win-core-file-l1-1-0.dll
+api-ms-win-core-file-l1-2-1.dll
+api-ms-win-core-file-l1-2-2.dll
+api-ms-win-core-file-l2-1-0.dll
+api-ms-win-core-file-l2-1-1.dll
+api-ms-win-core-file-l2-1-2.dll
+api-ms-win-core-firmware-l1-1-0.dll
+api-ms-win-core-handle-l1-1-0.dll
+api-ms-win-core-heap-l1-2-0.dll
+api-ms-win-core-heap-l2-1-0.dll
+api-ms-win-core-heap-obsolete-l1-1-0.dll
+api-ms-win-core-interlocked-l1-1-0.dll
+api-ms-win-core-interlocked-l1-2-0.dll
+api-ms-win-core-io-l1-1-0.dll
+api-ms-win-core-io-l1-1-1.dll
+api-ms-win-core-kernel32-legacy-ansi-l1-1-0.dll
+api-ms-win-core-kernel32-legacy-l1-1-0.dll
+api-ms-win-core-kernel32-legacy-l1-1-1.dll
+api-ms-win-core-largeinteger-l1-1-0.dll
+api-ms-win-core-libraryloader-l1-2-0.dll
+api-ms-win-core-libraryloader-l1-2-1.dll
+api-ms-win-core-libraryloader-l2-1-0.dll
+api-ms-win-core-localization-ansi-l1-1-0.dll
+api-ms-win-core-localization-l1-2-0.dll
+api-ms-win-core-localization-l1-2-1.dll
+api-ms-win-core-localization-l1-2-2.dll
+api-ms-win-core-localization-l2-1-0.dll
+api-ms-win-core-localization-obsolete-l1-2-0.dll
+api-ms-win-core-memory-l1-1-0.dll
+api-ms-win-core-memory-l1-1-1.dll
+api-ms-win-core-memory-l1-1-2.dll
+api-ms-win-core-memory-l1-1-3.dll
+api-ms-win-core-memory-l1-1-5.dll
+api-ms-win-core-memory-l1-1-6.dll
+api-ms-win-core-memory-l1-1-7.dll
+api-ms-win-core-namedpipe-ansi-l1-1-0.dll
+api-ms-win-core-namedpipe-ansi-l1-1-1.dll
+api-ms-win-core-namedpipe-l1-1-0.dll
+api-ms-win-core-namedpipe-l1-2-1.dll
+api-ms-win-core-namedpipe-l1-2-2.dll
+api-ms-win-core-namespace-ansi-l1-1-0.dll
+api-ms-win-core-namespace-l1-1-0.dll
+api-ms-win-core-normalization-l1-1-0.dll
+api-ms-win-core-path-l1-1-0.dll
+api-ms-win-core-processenvironment-l1-1-0.dll
+api-ms-win-core-processenvironment-l1-2-0.dll
+api-ms-win-core-processthreads-l1-1-0.dll
+api-ms-win-core-processthreads-l1-1-1.dll
+api-ms-win-core-processthreads-l1-1-2.dll
+api-ms-win-core-processthreads-l1-1-3.dll
+api-ms-win-core-processtopology-obsolete-l1-1-0.dll
+api-ms-win-core-profile-l1-1-0.dll
+api-ms-win-core-psapi-ansi-l1-1-0.dll
+api-ms-win-core-psapi-l1-1-0.dll
+api-ms-win-core-psm-appnotify-l1-1-0.dll
+api-ms-win-core-realtime-l1-1-0.dll
+api-ms-win-core-realtime-l1-1-1.dll
+api-ms-win-core-realtime-l1-1-2.dll
+api-ms-win-core-rtlsupport-l1-2-0.dll
+api-ms-win-core-slapi-l1-1-0.dll
+api-ms-win-core-string-l1-1-0.dll
+api-ms-win-core-synch-ansi-l1-1-0.dll
+api-ms-win-core-synch-l1-1-0.dll
+api-ms-win-core-synch-l1-2-0.dll
+api-ms-win-core-synch-l1-2-1.dll
+api-ms-win-core-sysinfo-l1-1-0.dll
+api-ms-win-core-sysinfo-l1-2-0.dll
+api-ms-win-core-sysinfo-l1-2-1.dll
+api-ms-win-core-sysinfo-l1-2-3.dll
+api-ms-win-core-threadpool-l1-2-0.dll
+api-ms-win-core-timezone-l1-1-0.dll
+api-ms-win-core-timezone-l1-1-1.dll
+api-ms-win-core-url-l1-1-0.dll
+api-ms-win-core-util-l1-1-0.dll
+api-ms-win-core-versionansi-l1-1-0.dll
+api-ms-win-core-version-l1-1-0.dll
+api-ms-win-core-version-l1-1-1.dll
+api-ms-win-core-windowsceip-l1-1-0.dll
+api-ms-win-core-windowserrorreporting-l1-1-0.dll
+api-ms-win-core-windowserrorreporting-l1-1-1.dll
+api-ms-win-core-windowserrorreporting-l1-1-2.dll
+api-ms-win-core-winrt-error-l1-1-0.dll
+api-ms-win-core-winrt-error-l1-1-1.dll
+api-ms-win-core-winrt-l1-1-0.dll
+api-ms-win-core-winrt-registration-l1-1-0.dll
+api-ms-win-core-winrt-robuffer-l1-1-0.dll
+api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll
+api-ms-win-core-winrt-string-l1-1-0.dll
+api-ms-win-core-wow64-l1-1-0.dll
+api-ms-win-core-wow64-l1-1-1.dll
+api-ms-win-core-xstate-l2-1-0.dll
+api-ms-win-crt-conio-l1-1-0.dll
+api-ms-win-crt-convert-l1-1-0.dll
+api-ms-win-crt-environment-l1-1-0.dll
+api-ms-win-crt-filesystem-l1-1-0.dll
+api-ms-win-crt-heap-l1-1-0.dll
+api-ms-win-crt-locale-l1-1-0.dll
+api-ms-win-crt-math-l1-1-0.dll
+api-ms-win-crt-multibyte-l1-1-0.dll
+api-ms-win-crt-private-l1-1-0.dll
+api-ms-win-crt-process-l1-1-0.dll
+api-ms-win-crt-runtime-l1-1-0.dll
+api-ms-win-crt-stdio-l1-1-0.dll
+api-ms-win-crt-string-l1-1-0.dll
+api-ms-win-crt-time-l1-1-0.dll
+api-ms-win-crt-utility-l1-1-0.dll
+api-ms-win-devices-config-l1-1-1.dll
+api-ms-win-devices-config-l1-1-2.dll
+api-ms-win-eventing-classicprovider-l1-1-0.dll
+api-ms-win-eventing-consumer-l1-1-0.dll
+api-ms-win-eventing-controller-l1-1-0.dll
+api-ms-win-eventing-legacy-l1-1-0.dll
+api-ms-win-eventing-provider-l1-1-0.dll
+api-ms-win-gaming-deviceinformation-l1-1-0.dll
+api-ms-win-gaming-expandedresources-l1-1-0.dll
+api-ms-win-gaming-tcui-l1-1-0.dll
+api-ms-win-gaming-tcui-l1-1-2.dll
+api-ms-win-gaming-tcui-l1-1-3.dll
+api-ms-win-gaming-tcui-l1-1-4.dll
+api-ms-win-ro-typeresolution-l1-1-0.dll
+api-ms-win-ro-typeresolution-l1-1-1.dll
+api-ms-win-security-base-l1-1-0.dll
+api-ms-win-security-base-l1-2-0.dll
+api-ms-win-security-base-l1-2-1.dll
+api-ms-win-security-cryptoapi-l1-1-0.dll
+api-ms-win-security-isolatedcontainer-l1-1-0.dll
+api-ms-win-security-lsalookup-ansi-l2-1-0.dll
+api-ms-win-security-lsalookup-l2-1-0.dll
+api-ms-win-security-provider-ansi-l1-1-0.dll
+api-ms-win-security-provider-l1-1-0.dll
+api-ms-win-security-sddl-ansi-l1-1-0.dll
+api-ms-win-security-sddl-l1-1-0.dll
+api-ms-win-shcore-obsolete-l1-1-0.dll
+api-ms-win-shcore-stream-winrt-l1-1-0.dll
 apphelp.dll
 appmgmts.dll
-aqadmin.dll
 aqueue.dll
 asp.dll
 aspperf.dll
@@ -49,49 +195,26 @@ avicap32.dll
 avifil32.dll
 avrt.dll
 azroles.dll
-azroleui.dll
 basesrv.dll
 batmeter.dll
 batt.dll
 bcrypt.dll
-bidispl.dll
-bitsprx2.dll
-bitsprx3.dll
-bnts.dll
+bluetoothapis.dll
 bootvid.dll
-bprovider.dll
-browscap.dll
 browser.dll
-browseui.dll
-brp_sysinfo.dll
-bthpanux.dll
 bthprops.cpl
-bthserv.dll
 cabinet.dll
 cabview.dll
-camocx.dll
 cards.dll
 catsrv.dll
-catsrvps.dll
 catsrvut.dll
 cdfview.dll
 cdm.dll
-cdosys.dll
 certcli.dll
-certmgr.dll
-certobj.dll
 cfgbkend.dll
 cfgmgr32.dll
-c_gb18030.dll
-chsbrkr.dll
-chtbrkr.dll
-ciadmin.dll
-cic.dll
 cimwin32.dll
 cintime.dll
-ciodm.dll
-c_is2022.dll
-c_iscii.dll
 classpnp.sys
 clbcatq.dll
 clb.dll
@@ -101,34 +224,25 @@ clusapi.dll
 cmcfg32.dll
 cmdial32.dll
 cmpbk32.dll
-cmprops.dll
-cmsetacl.dll
 cmutil.dll
-cnbjmon.dll
 cnetcfg.dll
 coadmin.dll
 colbact.dll
-colbcat.dll
-comaddin.dll
-comadmin.dll
-comcat.dll
 comctl32.dll
 comdlg32.dll
-compatui.dll
 compstui.dll
-comrepl.dll
+computecore.dll
+computenetwork.dll
+computestorage.dll
 comres.dll
 comsetup.dll
 comsnap.dll
 comsvcs.dll
 comuid.dll
-confmsp.dll
 connect.dll
 console.dll
-controt.dll
 corpol.dll
 credui.dll
-crtdll.dll
 crypt32.dll
 cryptdlg.dll
 cryptdll.dll
@@ -144,7 +258,9 @@ cscui.dll
 csrsrv.dll
 cufat.dll
 d2d1.dll
+d3d10.dll
 d3d11.dll
+d3d12.dll
 d3d8thk.dll
 d3d9.dll
 d3dcompiler_37.dll
@@ -193,75 +309,46 @@ d3dx9_41.dll
 d3dx9_42.dll
 d3dx9_43.dll
 d3dxof.dll
-danim.dll
-dataclen.dll
-datime.dll
 davclnt.dll
-davcprox.dll
 dbgeng.dll
 dbghelp.dll
 dbnetlib.dll
 dbnmpntw.dll
 dciman32.dll
+dcomp.dll
 ddraw.dll
-ddrawex.dll
-deskadp.dll
-deskmon.dll
-deskperf.dll
-devenum.dll
 devmgr.dll
 devobj.dll
 devrtl.dll
-dfrgifcps.dll
-dfrgsnap.dll
-dfrgui.dll
-dfsshlex.dll
-dgnet.dll
 dhcpcsvc6.dll
 dhcpcsvc.dll
-dhcpmon.dll
 dhcpsapi.dll
-diactfrm.dll
 digest.dll
-dimap.dll
 dimsntfy.dll
 dimsroam.dll
 dinput8.dll
 dinput.dll
-directdb.dll
 diskcopy.dll
-dispex.dll
+dismapi.dll
 dmconfig.dll
-dmdlgs.dll
 dmdskmgr.dll
-dmintf.dll
 dmivcitf.dll
-dmocx.dll
-dmserver.dll
 dmutil.dll
 dnsapi.dll
 dnsrslvr.dll
-docprop2.dll
-docprop.dll
+dpapi.dll
 dpnaddr.dll
 dpnet.dll
-dpnhpast.dll
 dpnhupnp.dll
 dpnlobby.dll
-dpvacm.dll
 dpvoice.dll
-dpvvox.dll
 drprov.dll
 ds32gt.dll
 dsauth.dll
-dsdmo.dll
-dsdmoprp.dll
 dskquota.dll
-dskquoui.dll
 dsound3d.dll
 dsound.dll
 dsprop.dll
-dsprov.dll
 dsquery.dll
 dssec.dll
 dssenh.dll
@@ -269,58 +356,37 @@ dsuiext.dll
 duser.dll
 dwmapi.dll
 dwrite.dll
-dxdiagn.dll
 dxgi.dll
-dxtmsft.dll
-dxtrans.dll
 dxva2.dll
 eappcfg.dll
 eapphost.dll
 eappprxy.dll
 efsadu.dll
-els.dll
-encapi.dll
-ersvc.dll
 es.dll
 esent.dll
 esentprf.dll
-esscli.dll
-eventcls.dll
 eventlog.dll
-evntrprv.dll
 evr.dll
-evtgprov.dll
 exports.dll
 exprfdll.dll
 exstrace.dll
-extmgr.dll
-f3ahvoas.dll
 fastprox.dll
 faultrep.dll
 fcachdll.dll
-fde.dll
 fdeploy.dll
 feclient.dll
 filemgmt.dll
 fldrclnr.dll
 fltlib.dll
 fmifs.dll
-fontext.dll
 fontsub.dll
 framedyn.dll
-fsusd.dll
 ftpctrs2.dll
 ftpmib.dll
-ftpsvc2.dll
-fwcfg.dll
 fwpuclnt.dll
-fx.dll
 fxsapi.dll
 fxscfgwz.dll
-fxscom.dll
-fxscomex.dll
 fxsdrv.dll
-fxsmon.dll
 fxsocm.dll
 fxsperf.dll
 fxsroute.dll
@@ -329,7 +395,7 @@ fxst30.dll
 fxstiff.dll
 fxsui.dll
 fxswzrd.dll
-gcdef.dll
+gamemode.dll
 gdi32.dll
 gdiplus.dll
 genericui.dll
@@ -340,23 +406,19 @@ gpedit.dll
 gpkcsp.dll
 gptext.dll
 guitrn.dll
-gzip.dll
-h323msp.dll
 hal.dll
 hbaapi.dll
 hgfs.dll
-hhsetup.dll
+hhctrl.ocx
 hidclass.sys
 hid.dll
 hidparse.sys
 hlink.dll
 hmmapi.dll
 hnetcfg.dll
-hnetmon.dll
 hnetwiz.dll
 hostmib.dll
 hotplug.dll
-hticons.dll
 htrn_jis.dll
 httpapi.dll
 httpext.dll
@@ -364,14 +426,9 @@ httpmib.dll
 httpodbc.dll
 htui.dll
 hypertrm.dll
-iasacct.dll
-iasads.dll
 iashlpr.dll
-iasnap.dll
 iaspolcy.dll
-iasrad.dll
 iassam.dll
-iassdo.dll
 iassvcs.dll
 icaapi.dll
 icfgnt.dll
@@ -380,41 +437,27 @@ icmp.dll
 icmui.dll
 icwconn.dll
 icwdl.dll
-icwhelp.dll
 icwphbk.dll
 icwutil.dll
 idq.dll
 ieakeng.dll
-ieaksie.dll
 iedkcs32.dll
-iepeers.dll
 iernonce.dll
 iesetup.dll
-ifmon.dll
-ifsutil.dll
 igmpagnt.dll
 iisadmin.dll
 iiscfg.dll
-iisclex4.dll
 iis.dll
-iisext.dll
-iislog.dll
-iismap.dll
 iisprov.dll
-iisrstap.dll
 iisrtl.dll
 iisui.dll
-iisuiobj.dll
 iisutil.dll
-iisw3adm.dll
 imagehlp.dll
 imedic.dll
 imejpcus.dll
-imekrcic.dll
 imeshare.dll
 imeskdic.dll
 imeskdic.dll
-imeskf.dll
 imgutil.dll
 imjp81k.dll
 imjputyc.dll
@@ -422,10 +465,7 @@ imm32.dll
 imsinsnt.dll
 inetcfg.dll
 inetcomm.dll
-inetmgr.dll
 inetmib1.dll
-inetpp.dll
-inetppui.dll
 infoadmn.dll
 infocomm.dll
 infoctrs.dll
@@ -436,184 +476,42 @@ inseng.dll
 iphlpapi.dll
 ipmontr.dll
 ipnathlp.dll
-ippromon.dll
-iprip.dll
 iprop.dll
 iprtprio.dll
 iprtrmgr.dll
-ipsecsnp.dll
 ipsecspd.dll
-ipsmsnap.dll
-ipv6mon.dll
 ipxsap.dll
 irclass.dll
-isapips.dll
 isapitst.dll
 isatq.dll
 iscomlog.dll
 iscsidsc.dll
 isignup2.dll
-itlocal.dll
-itss.dll
-ixsso.dll
 iyuv_32.dll
 jet500.dll
-jscript.dll
 jsproxy.dll
-kbd101a.dll
-kbd101b.dll
-kbd101c.dll
-kbd101.dll
-kbd103.dll
-kbd106.dll
-kbd106n.dll
-kbda1.dll
-kbda2.dll
-kbda3.dll
-kbdal.dll
-kbdarme.dll
-kbdarmw.dll
-kbdax2.dll
-kbdaze.dll
-kbdazel.dll
-kbdbe.dll
-kbdbene.dll
-kbdblr.dll
-kbdbr.dll
-kbdbu.dll
-kbdca.dll
-kbdcan.dll
-kbdcr.dll
-kbdcz1.dll
-kbdcz2.dll
-kbdcz.dll
-kbdda.dll
-kbddiv1.dll
-kbddiv2.dll
-kbddv.dll
-kbdes.dll
-kbdest.dll
-kbdfa.dll
-kbdfc.dll
-kbdfi.dll
-kbdfo.dll
-kbdfr.dll
-kbdgae.dll
-kbdgeo.dll
-kbdgkl.dll
-kbdgr1.dll
-kbdgr.dll
-kbdhe220.dll
-kbdhe319.dll
-kbdheb.dll
-kbdhe.dll
-kbdhela2.dll
-kbdhela3.dll
-kbdhept.dll
-kbdhu1.dll
-kbdhu.dll
-kbdibm02.dll
-kbdic.dll
-kbdindev.dll
-kbdinguj.dll
-kbdinhin.dll
-kbdinkan.dll
-kbdinmar.dll
-kbdinpun.dll
-kbdintam.dll
-kbdintel.dll
-kbdir.dll
-kbdit142.dll
-kbdit.dll
-kbdkaz.dll
-kbdkor.dll
-kbdkyr.dll
-kbdla.dll
-kbdlayout.dll
-kbdlk41a.dll
-kbdlk41j.dll
-kbdlt1.dll
-kbdlt.dll
-kbdlv1.dll
-kbdlv.dll
-kbdmac.dll
-kbdmon.dll
-kbdnec95.dll
-kbdnecat.dll
-kbdnec.dll
-kbdnecnt.dll
-kbdne.dll
-kbdno.dll
-kbdpl1.dll
-kbdpl.dll
-kbdpo.dll
-kbdro.dll
-kbdru1.dll
-kbdru.dll
-kbdsf.dll
-kbdsg.dll
-kbdsl1.dll
-kbdsl.dll
-kbdsp.dll
-kbdsw.dll
-kbdsyr1.dll
-kbdsyr2.dll
-kbdtat.dll
-kbdth0.dll
-kbdth1.dll
-kbdth2.dll
-kbdth3.dll
-kbdtuf.dll
-kbdtuq.dll
-kbduk.dll
-kbdur.dll
-kbdurdu.dll
-kbdusa.dll
-kbdus.dll
-kbdusl.dll
-kbdusr.dll
-kbdusx.dll
-kbduzb.dll
-kbdvntc.dll
-kbdycc.dll
-kbdycl.dll
 kd1394.dll
 kdcom.dll
 kerberos.dll
 kernel32.dll
 keymgr.dll
-korwbrkr.dll
-krnlprov.dll
+ksecdd.sys
 ks.sys
 ksuser.dll
 ktmw32.dll
-langwrbk.dll
-licdll.dll
-licmgr.dll
-licwmi.dll
 linkinfo.dll
-lmhsvc.exe
 lmmib2.dll
-lmrt.dll
 loadperf.dll
-localsec.dll
 localspl.dll
-localui.dll
 log.dll
 loghours.dll
-logscript.dll
 lonsint.dll
-lpdsvc.dll
 lpk.dll
 lprhelp.dll
-lprmon.dll
-lprui.dll
 lsasrv.dll
 lz32.dll
 mag_hook.dll
-mailmsg.dll
 mapi32.dll
-marscore.dll
 mcastmib.dll
 mcd32.dll
 mcdsrv32.dll
@@ -624,27 +522,25 @@ mciole32.dll
 mciqtz32.dll
 mciseq.dll
 mciwave.dll
-mdhcp.dll
 mdminst.dll
-metadata.dll
 mf3216.dll
 mfc42.dll
 mfc42u.dll
-mfcsubs.dll
+mfcore.dll
 mf.dll
 mfplat.dll
+mfplay.dll
+mfreadwrite.dll
+mfsensorgroup.dll
 mgmtapi.dll
 midimap.dll
 migism.dll
 miglibnt.dll
-mimefilt.dll
 mlang.dll
 mll_hp.dll
 mll_mtf.dll
 mll_qic.dll
-mmcbase.dll
-mmcndmgr.dll
-mmcshext.dll
+mmdevapi.dll
 mmfutil.dll
 mmutilse.dll
 mobsync.dll
@@ -652,45 +548,28 @@ modemui.dll
 mofd.dll
 mprapi.dll
 mprddm.dll
-mprdim.dll
 mpr.dll
 mprui.dll
 mqad.dll
 mqcertui.dll
 mqdscli.dll
-mqgentr.dll
 mqise.dll
-mqoa.dll
 mqperf.dll
-mqqm.dll
 mqrtdep.dll
 mqrt.dll
 mqsec.dll
-mqsnap.dll
 mqupgrd.dll
 mqutil.dll
-msaatext.dll
 msacm32.dll
 msadcs.dll
-msadds.dll
 msado15.dll
-msadomd.dll
-msador15.dll
-msadox.dll
-msadrh15.dll
 msafd.dll
 msasn1.dll
-mscandui.dll
 mscat32.dll
 mscms.dll
 msctf.dll
-msctfp.dll
 msdadiag.dll
-msdaosp.dll
-msdaps.dll
 msdart.dll
-msdatl3.dll
-msdfmap.dll
 msdmo.dll
 msdrm.dll
 msdtclog.dll
@@ -702,48 +581,36 @@ msgina.dll
 msgr3en.dll
 msgsvc.dll
 mshtml.dll
-mshtmled.dll
-msident.dll
 msi.dll
-msieftp.dll
-msihnd.dll
 msimg32.dll
 msimtf.dll
-msinfo32.dll
-msiprov.dll
 msir3jp.dll
 msisip.dll
-msjtes40.dll
 mslbui.dll
 msls31.dll
-mslwvtts.dll
 msmqocm.dll
-msobcomm.dll
 msobdl.dll
 msobmain.dll
-msobshel.dll
-msobweb.dll
 msoeacct.dll
 msoe.dll
 msoert2.dll
+msoledbsql.dll
 mspatcha.dll
-mspmspsn.dll
 msports.dll
 msrating.dll
-msremote.dll
 msrle32.dll
 mssign32.dll
 mssip32.dll
 mstask.dll
-mstime.dll
 mstlsapi.dll
-mstscax.dll
 msutb.dll
 msv1_0.dll
 msvcirt.dll
+msvcp120_app.dll
 msvcp60.dll
 msvcr100.dll
 msvcr110.dll
+msvcr120_app.dll
 msvcr120d.dll
 msvcr120.dll
 msvcr80.dll
@@ -752,22 +619,15 @@ msvcr90.dll
 msvcrt.dll
 msvfw32.dll
 msvidc32.dll
-msvidctl.dll
 msw3prt.dll
 mswsock.dll
-msxactps.dll
-msxml3.dll
 msyuv.dll
 mtxclu.dll
 mtxdm.dll
 mtxex.dll
 mtxoci.dll
-mycomput.dll
 mydocs.dll
-narrhook.dll
-navdgf.dll
 ncobjapi.dll
-ncprov.dll
 ncrypt.dll
 ncxp.dll
 nddeapi.dll
@@ -778,9 +638,9 @@ ndis.sys
 netapi32.dll
 netcfgx.dll
 netid.dll
+netio.sys
 netlogon.dll
 netman.dll
-netobjs.dll
 netoc.dll
 netplwiz.dll
 netrap.dll
@@ -789,11 +649,7 @@ netui0.dll
 netui1.dll
 netui2.dll
 newdev.dll
-nextlink.dll
-nlhtml.dll
-nntpadm.dll
 nntpapi.dll
-nntpsnap.dll
 normaliz.dll
 npptools.dll
 nshipsec.dll
@@ -801,17 +657,11 @@ ntdll.dll
 ntdsapi.dll
 ntdsbcli.dll
 ntdtcsetup.dll
-ntevt.dll
-ntfsdrv.dll
 ntlanman.dll
 ntlanui.dll
 ntlsapi.dll
 ntmarta.dll
 ntmsapi.dll
-ntmsdba.dll
-ntmsevt.dll
-ntmsmgr.dll
-ntmssvc.dll
 ntoc.dll
 ntoskrnl.exe
 ntprint.dll
@@ -819,7 +669,6 @@ ntshrui.dll
 ntvdm64.dll
 nwprovau.dll
 oakley.dll
-objsel.dll
 occache.dll
 ocmanage.dll
 ocmsn.dll
@@ -833,26 +682,21 @@ odbccr32.dll
 odbctrac.dll
 oeimport.dll
 oemiglib.dll
-offfilt.dll
 ole32.dll
 oleacc.dll
 oleaut32.dll
 olecli32.dll
 olecnv32.dll
 oledb32.dll
-oledb32r.dll
 oledlg.dll
-oleprn.dll
 olesvr32.dll
+opends60.dll
 opengl32.dll
 osuninst.dll
-ovprintmondll.dll
 p2pcollab.dll
 p2p.dll
 p2pgraph.dll
-panmap.dll
 pautoenr.dll
-pchsvc.dll
 pcwum.dll
 pdh.dll
 perfctrs.dll
@@ -861,35 +705,24 @@ perfnet.dll
 perfos.dll
 perfproc.dll
 perfts.dll
-persist.dll
 photowiz.dll
-pid.dll
 pidgen.dll
-pjlmon.dll
-pngfilter.dll
 policman.dll
 polstore.dll
 powrprof.dll
 printui.dll
+prntvpt.dll
 profmap.dll
 proppage.dll
-provthrd.dll
+propsys.dll
 ps5ui.dll
 psapi.dll
 psbase.dll
 pschdprf.dll
 pscript5.dll
-ps.dll
-psnppagn.dll
 pstorec.dll
 pstorsvc.dll
-qasf.dll
-qcap.dll
-qdvd.dll
-qdv.dll
-qedit.dll
 qmgr.dll
-qmgrprxy.dll
 qosname.dll
 quartz.dll
 query.dll
@@ -909,19 +742,13 @@ rasppp.dll
 rasrad.dll
 rassapi.dll
 rasser.dll
-rassistance.dll
 rastapi.dll
 rastls.dll
-rcbdyctl.dll
-rdchost.dll
 rdpcfgex.dll
 rdpsnd.dll
 rdpwsx.dll
 regapi.dll
 regsvc.dll
-regwizctrl.dll
-remotepage.dll
-rend.dll
 resutils.dll
 riched20.dll
 rnr20.dll
@@ -930,25 +757,17 @@ routetab.dll
 rpcdiag.dll
 rpchttp.dll
 rpcns4.dll
-rpcnsh.dll
 rpcref.dll
 rpcrt4.dll
 rpcss.dll
 rsaenh.dll
-rshx32.dll
-rsmps.dll
 rstrtmgr.dll
 rtm.dll
 rtutils.dll
-rwnh.dll
-safrcfiledlg.dll
-safrdm.dll
-safrslv.dll
 samlib.dll
 samsrv.dll
 scarddlg.dll
 sccbase.dll
-sccsccp.dll
 scecli.dll
 scesrv.dll
 schannel.dll
@@ -956,103 +775,64 @@ schedsvc.dll
 sclgntfy.dll
 scredir.dll
 script.dll
-scripto.dll
-scriptpw.dll
 scrobj.dll
-scrptutl.dll
 scrrun.dll
 sdhcinst.dll
-sdpblb.dll
 seclogon.dll
 secur32.dll
 security.dll
-sendcmsg.dll
-sendmail.dll
 sensapi.dll
 senscfg.dll
 sens.dll
 seo.dll
-seos.dll
 serialui.dll
-servdeps.dll
 serwvdrv.dll
 setupapi.dll
 setupqry.dll
 sfc.dll
 sfcfiles.dll
 sfc_os.dll
-sfilter2.dll
 sfmapi.dll
+shcore.dll
 shdocvw.dll
 shell32.dll
 shfolder.dll
-shgina.dll
 shimeng.dll
 shimgvw.dll
 shlwapi.dll
-shmedia.dll
 shscrap.dll
 shsvcs.dll
 sigtab.dll
-simptcp.exe
-simx.dll
 sisbkup.dll
 skdll.dll
-slayerxp.dll
 slbcsp.dll
-slbiop.dll
 slc.dll
 slcext.dll
 slwga.dll
-smlogcfg.dll
-smtpadm.dll
 smtpapi.dll
-smtpcons.dll
 smtpctrs.dll
-smtpsnap.dll
-smtpsvc.dll
 snapin.dll
-sniffpol.dll
 snmpapi.dll
-snmpcl.dll
 snmpelea.dll
-snmpincl.dll
 snmpmib.exe
-snmpsmir.dll
-snmpsnap.dll
-snmpstup.dll
-snmpthrd.dll
 softpub.dll
-spcommon.dll
 spoolss.dll
-sptip.dll
-spttseng.dll
 sqlsrv32.dll
 sqlxmlx.dll
 srchctls.dll
-srchui.dll
 srclient.dll
 srrstr.dll
-srsvc.dll
 srvsvc.dll
 ssdpapi.dll
-ssdpsrv.dll
 ssinc.dll
 sspicli.dll
-sstub.dll
 staxmem.dll
-stclient.dll
-stdprov.dll
 sti_ci.dll
 sti.dll
-stobject.dll
 streamci.dll
 strmfilt.dll
 subauth.dll
-svcext.dll
 svcpack.dll
-sweeprx.dll
-swprv.dll
 sxs.dll
 synceng.dll
 syncui.dll
@@ -1061,35 +841,18 @@ sysmod.dll
 syssetup.dll
 t2embed.dll
 tapi32.dll
-tapi3.dll
 tapiperf.dll
-tapisrv.dll
 tbs.dll
 tcpmib.dll
-tcpmon.dll
-tcpmonui.dll
 tdh.dll
-termmgr.dll
-termsrv.dll
-thawbrkr.dll
-themeui.dll
-tlntsvrps.dll
 traffic.dll
-trialoc.dll
-trigobjs.dll
-trkwks.dll
 tsappcmp.dll
 tsbyuv.dll
-tscfgwmi.dll
 tsd32.dll
-tshoot.dll
 tsoc.dll
-twext.dll
-txflogdll.dll
 txfw32.dll
+ucrtbase.dll
 ufat.dll
-uihelper.dll
-ulib.dll
 umandlg.dll
 umdmxfrm.dll
 umpnpmgr.dll
@@ -1100,51 +863,37 @@ unimdmat.dll
 uniplat.dll
 untfs.dll
 upnp.dll
-upnphost.dll
 upnpui.dll
-ureg.dll
 urlauth.dll
 url.dll
 urlmon.dll
 usbcamd2.sys
 usbd.sys
-usbmon.dll
 usbport.sys
 user32.dll
 userenv.dll
 usp10.dll
 utildll.dll
 uxtheme.dll
-vbscript.dll
-vdsdyndr.dll
-vds_ps.dll
+vcruntime140_app.dll
 vdsutil.dll
-vdswmi.dll
 verifier.dll
 version.dll
 vgx.dll
-viewprov.dll
+virtdisk.dll
 vmx_mode.dll
 vssapi.dll
-vss_ps.dll
-vsstrace.dll
-vsswmi.dll
 w32time.dll
 w32topl.dll
-w3cache.dll
-w3comlog.dll
 w3core.dll
-w3ctrlps.dll
 w3ctrs.dll
 w3dt.dll
-w3ext.dll
 w3isapi.dll
 w3ssl.dll
 w3tp.dll
 wab32.dll
 wabimp.dll
 wamreg.dll
-wamregps.dll
 wbemcore.dll
 wbemupgd.dll
 wdigest.dll
@@ -1157,9 +906,11 @@ wdsimage.dll
 wdstptc.dll
 wdsupgcompl.dll
 wdsutil.dll
+webauthn.dll
 webcheck.dll
 webclnt.dll
 webhits.dll
+websocket.dll
 wecapi.dll
 wer.dll
 wevtapi.dll
@@ -1168,9 +919,12 @@ wiadss.dll
 wiarpc.dll
 wiaservc.dll
 wiashext.dll
-win32spl.dll
+wimgapi.dll
+windowscodecs.dll
 winfax.dll
 winhttp.dll
+winhvemulation.dll
+winhvplatform.dll
 wininet.dll
 winipsec.dll
 winmm.dll
@@ -1194,6 +948,7 @@ wmi.dll
 wmilib.sys
 wmiprop.dll
 wmisvc.dll
+wofutil.dll
 wow64cpu.dll
 wow64.dll
 wow64mib.dll
@@ -1201,11 +956,12 @@ wow64win.dll
 wpd_ci.dll
 ws2_32.dll
 ws2help.dll
+wscapi.dll
 wscsvc.dll
 wsdapi.dll
 wshatm.dll
 wshbth.dll
-wshcon.dll
+wslapi.dll
 wsock32.dll
 wtsapi32.dll
 x3daudio1_2.dll
@@ -1223,7 +979,6 @@ xapofx1_4.dll
 xapofx1_5.dll
 xapofxd1_5.dll
 xaudio2_8.dll
-xfiles.dll
 xinput1_1.dll
 xinput1_2.dll
 xinput1_3.dll
diff --git a/standard-dlls-ucrt64 b/standard-dlls-ucrt64
deleted file mode 120000
index bc4ebdd..0000000
--- a/standard-dlls-ucrt64
+++ /dev/null
@@ -1 +0,0 @@
-standard-dlls-mingw64
\ No newline at end of file
diff --git a/standard-dlls-ucrt64 b/standard-dlls-ucrt64
new file mode 100644
index 0000000..1242771
--- /dev/null
+++ b/standard-dlls-ucrt64
@@ -0,0 +1,987 @@
+acledit.dll
+aclui.dll
+activeds.dll
+admparse.dll
+admwprox.dll
+adptif.dll
+adsiisex.dll
+adsldpc.dll
+advapi32.dll
+advpack.dll
+agentanm.dll
+aksclass.dll
+alrsvc.dll
+apcups.dll
+api-ms-win-appmodel-runtime-l1-1-0.dll
+api-ms-win-appmodel-runtime-l1-1-1.dll
+api-ms-win-core-com-l1-1-0.dll
+api-ms-win-core-com-l1-1-1.dll
+api-ms-win-core-com-l2-1-1.dll
+api-ms-win-core-com-midlproxystub-l1-1-0.dll
+api-ms-win-core-comm-l1-1-0.dll
+api-ms-win-core-comm-l1-1-1.dll
+api-ms-win-core-comm-l1-1-2.dll
+api-ms-win-core-console-l1-1-0.dll
+api-ms-win-core-console-l1-2-0.dll
+api-ms-win-core-console-l2-1-0.dll
+api-ms-win-core-console-l2-2-0.dll
+api-ms-win-core-console-l3-2-0.dll
+api-ms-win-core-datetime-l1-1-0.dll
+api-ms-win-core-datetime-l1-1-1.dll
+api-ms-win-core-datetime-l1-1-2.dll
+api-ms-win-core-debug-l1-1-0.dll
+api-ms-win-core-debug-l1-1-1.dll
+api-ms-win-core-delayload-l1-1-1.dll
+api-ms-win-core-enclave-l1-1-0.dll
+api-ms-win-core-errorhandling-l1-1-0.dll
+api-ms-win-core-errorhandling-l1-1-1.dll
+api-ms-win-core-errorhandling-l1-1-3.dll
+api-ms-win-core-featurestaging-l1-1-0.dll
+api-ms-win-core-featurestaging-l1-1-1.dll
+api-ms-win-core-fibers-l1-1-1.dll
+api-ms-win-core-fibers-l2-1-1.dll
+api-ms-win-core-file-ansi-l1-1-0.dll
+api-ms-win-core-file-ansi-l2-1-0.dll
+api-ms-win-core-file-fromapp-l1-1-0.dll
+api-ms-win-core-file-l1-1-0.dll
+api-ms-win-core-file-l1-2-1.dll
+api-ms-win-core-file-l1-2-2.dll
+api-ms-win-core-file-l2-1-0.dll
+api-ms-win-core-file-l2-1-1.dll
+api-ms-win-core-file-l2-1-2.dll
+api-ms-win-core-firmware-l1-1-0.dll
+api-ms-win-core-handle-l1-1-0.dll
+api-ms-win-core-heap-l1-2-0.dll
+api-ms-win-core-heap-l2-1-0.dll
+api-ms-win-core-heap-obsolete-l1-1-0.dll
+api-ms-win-core-interlocked-l1-1-0.dll
+api-ms-win-core-interlocked-l1-2-0.dll
+api-ms-win-core-io-l1-1-0.dll
+api-ms-win-core-io-l1-1-1.dll
+api-ms-win-core-kernel32-legacy-ansi-l1-1-0.dll
+api-ms-win-core-kernel32-legacy-l1-1-0.dll
+api-ms-win-core-kernel32-legacy-l1-1-1.dll
+api-ms-win-core-largeinteger-l1-1-0.dll
+api-ms-win-core-libraryloader-l1-2-0.dll
+api-ms-win-core-libraryloader-l1-2-1.dll
+api-ms-win-core-libraryloader-l2-1-0.dll
+api-ms-win-core-localization-ansi-l1-1-0.dll
+api-ms-win-core-localization-l1-2-0.dll
+api-ms-win-core-localization-l1-2-1.dll
+api-ms-win-core-localization-l1-2-2.dll
+api-ms-win-core-localization-l2-1-0.dll
+api-ms-win-core-localization-obsolete-l1-2-0.dll
+api-ms-win-core-memory-l1-1-0.dll
+api-ms-win-core-memory-l1-1-1.dll
+api-ms-win-core-memory-l1-1-2.dll
+api-ms-win-core-memory-l1-1-3.dll
+api-ms-win-core-memory-l1-1-5.dll
+api-ms-win-core-memory-l1-1-6.dll
+api-ms-win-core-memory-l1-1-7.dll
+api-ms-win-core-namedpipe-ansi-l1-1-0.dll
+api-ms-win-core-namedpipe-ansi-l1-1-1.dll
+api-ms-win-core-namedpipe-l1-1-0.dll
+api-ms-win-core-namedpipe-l1-2-1.dll
+api-ms-win-core-namedpipe-l1-2-2.dll
+api-ms-win-core-namespace-ansi-l1-1-0.dll
+api-ms-win-core-namespace-l1-1-0.dll
+api-ms-win-core-normalization-l1-1-0.dll
+api-ms-win-core-path-l1-1-0.dll
+api-ms-win-core-processenvironment-l1-1-0.dll
+api-ms-win-core-processenvironment-l1-2-0.dll
+api-ms-win-core-processthreads-l1-1-0.dll
+api-ms-win-core-processthreads-l1-1-1.dll
+api-ms-win-core-processthreads-l1-1-2.dll
+api-ms-win-core-processthreads-l1-1-3.dll
+api-ms-win-core-processtopology-obsolete-l1-1-0.dll
+api-ms-win-core-profile-l1-1-0.dll
+api-ms-win-core-psapi-ansi-l1-1-0.dll
+api-ms-win-core-psapi-l1-1-0.dll
+api-ms-win-core-psm-appnotify-l1-1-0.dll
+api-ms-win-core-realtime-l1-1-0.dll
+api-ms-win-core-realtime-l1-1-1.dll
+api-ms-win-core-realtime-l1-1-2.dll
+api-ms-win-core-rtlsupport-l1-2-0.dll
+api-ms-win-core-slapi-l1-1-0.dll
+api-ms-win-core-string-l1-1-0.dll
+api-ms-win-core-synch-ansi-l1-1-0.dll
+api-ms-win-core-synch-l1-1-0.dll
+api-ms-win-core-synch-l1-2-0.dll
+api-ms-win-core-synch-l1-2-1.dll
+api-ms-win-core-sysinfo-l1-1-0.dll
+api-ms-win-core-sysinfo-l1-2-0.dll
+api-ms-win-core-sysinfo-l1-2-1.dll
+api-ms-win-core-sysinfo-l1-2-3.dll
+api-ms-win-core-threadpool-l1-2-0.dll
+api-ms-win-core-timezone-l1-1-0.dll
+api-ms-win-core-timezone-l1-1-1.dll
+api-ms-win-core-url-l1-1-0.dll
+api-ms-win-core-util-l1-1-0.dll
+api-ms-win-core-versionansi-l1-1-0.dll
+api-ms-win-core-version-l1-1-0.dll
+api-ms-win-core-version-l1-1-1.dll
+api-ms-win-core-windowsceip-l1-1-0.dll
+api-ms-win-core-windowserrorreporting-l1-1-0.dll
+api-ms-win-core-windowserrorreporting-l1-1-1.dll
+api-ms-win-core-windowserrorreporting-l1-1-2.dll
+api-ms-win-core-winrt-error-l1-1-0.dll
+api-ms-win-core-winrt-error-l1-1-1.dll
+api-ms-win-core-winrt-l1-1-0.dll
+api-ms-win-core-winrt-registration-l1-1-0.dll
+api-ms-win-core-winrt-robuffer-l1-1-0.dll
+api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll
+api-ms-win-core-winrt-string-l1-1-0.dll
+api-ms-win-core-wow64-l1-1-0.dll
+api-ms-win-core-wow64-l1-1-1.dll
+api-ms-win-core-xstate-l2-1-0.dll
+api-ms-win-crt-conio-l1-1-0.dll
+api-ms-win-crt-convert-l1-1-0.dll
+api-ms-win-crt-environment-l1-1-0.dll
+api-ms-win-crt-filesystem-l1-1-0.dll
+api-ms-win-crt-heap-l1-1-0.dll
+api-ms-win-crt-locale-l1-1-0.dll
+api-ms-win-crt-math-l1-1-0.dll
+api-ms-win-crt-multibyte-l1-1-0.dll
+api-ms-win-crt-private-l1-1-0.dll
+api-ms-win-crt-process-l1-1-0.dll
+api-ms-win-crt-runtime-l1-1-0.dll
+api-ms-win-crt-stdio-l1-1-0.dll
+api-ms-win-crt-string-l1-1-0.dll
+api-ms-win-crt-time-l1-1-0.dll
+api-ms-win-crt-utility-l1-1-0.dll
+api-ms-win-devices-config-l1-1-1.dll
+api-ms-win-devices-config-l1-1-2.dll
+api-ms-win-eventing-classicprovider-l1-1-0.dll
+api-ms-win-eventing-consumer-l1-1-0.dll
+api-ms-win-eventing-controller-l1-1-0.dll
+api-ms-win-eventing-legacy-l1-1-0.dll
+api-ms-win-eventing-provider-l1-1-0.dll
+api-ms-win-gaming-deviceinformation-l1-1-0.dll
+api-ms-win-gaming-expandedresources-l1-1-0.dll
+api-ms-win-gaming-tcui-l1-1-0.dll
+api-ms-win-gaming-tcui-l1-1-2.dll
+api-ms-win-gaming-tcui-l1-1-3.dll
+api-ms-win-gaming-tcui-l1-1-4.dll
+api-ms-win-ro-typeresolution-l1-1-0.dll
+api-ms-win-ro-typeresolution-l1-1-1.dll
+api-ms-win-security-base-l1-1-0.dll
+api-ms-win-security-base-l1-2-0.dll
+api-ms-win-security-base-l1-2-1.dll
+api-ms-win-security-cryptoapi-l1-1-0.dll
+api-ms-win-security-isolatedcontainer-l1-1-0.dll
+api-ms-win-security-lsalookup-ansi-l2-1-0.dll
+api-ms-win-security-lsalookup-l2-1-0.dll
+api-ms-win-security-provider-ansi-l1-1-0.dll
+api-ms-win-security-provider-l1-1-0.dll
+api-ms-win-security-sddl-ansi-l1-1-0.dll
+api-ms-win-security-sddl-l1-1-0.dll
+api-ms-win-shcore-obsolete-l1-1-0.dll
+api-ms-win-shcore-stream-winrt-l1-1-0.dll
+apphelp.dll
+appmgmts.dll
+aqueue.dll
+asp.dll
+aspperf.dll
+asycfilt.dll
+atkctrs.dll
+atl.dll
+atmlib.dll
+atrace.dll
+audiosrv.dll
+authz.dll
+autodial.dll
+autodisc.dll
+avicap32.dll
+avifil32.dll
+avrt.dll
+azroles.dll
+basesrv.dll
+batmeter.dll
+batt.dll
+bcrypt.dll
+bluetoothapis.dll
+bootvid.dll
+browser.dll
+bthprops.cpl
+cabinet.dll
+cabview.dll
+cards.dll
+catsrv.dll
+catsrvut.dll
+cdfview.dll
+cdm.dll
+certcli.dll
+cfgbkend.dll
+cfgmgr32.dll
+cimwin32.dll
+cintime.dll
+classpnp.sys
+clbcatq.dll
+clb.dll
+clfsw32.dll
+cliconfg.dll
+clusapi.dll
+cmcfg32.dll
+cmdial32.dll
+cmpbk32.dll
+cmutil.dll
+cnetcfg.dll
+coadmin.dll
+colbact.dll
+comctl32.dll
+comdlg32.dll
+compstui.dll
+computecore.dll
+computenetwork.dll
+computestorage.dll
+comres.dll
+comsetup.dll
+comsnap.dll
+comsvcs.dll
+comuid.dll
+connect.dll
+console.dll
+corpol.dll
+credui.dll
+crypt32.dll
+cryptdlg.dll
+cryptdll.dll
+cryptext.dll
+cryptnet.dll
+cryptsp.dll
+cryptsvc.dll
+cryptui.dll
+cryptxml.dll
+cscapi.dll
+cscdll.dll
+cscui.dll
+csrsrv.dll
+cufat.dll
+d2d1.dll
+d3d10.dll
+d3d11.dll
+d3d12.dll
+d3d8thk.dll
+d3d9.dll
+d3dcompiler_37.dll
+d3dcompiler_38.dll
+d3dcompiler_39.dll
+d3dcompiler_40.dll
+d3dcompiler_41.dll
+d3dcompiler_42.dll
+d3dcompiler_43.dll
+d3dcompiler_46.dll
+d3dcompiler_47.dll
+d3dcompiler.dll
+d3dcsx_46.dll
+d3dcsxd_43.dll
+d3dx10_33.dll
+d3dx10_34.dll
+d3dx10_35.dll
+d3dx10_36.dll
+d3dx10_37.dll
+d3dx10_38.dll
+d3dx10_39.dll
+d3dx10_40.dll
+d3dx10_41.dll
+d3dx10_42.dll
+d3dx10_43.dll
+d3dx11_42.dll
+d3dx11_43.dll
+d3dx9_24.dll
+d3dx9_25.dll
+d3dx9_26.dll
+d3dx9_27.dll
+d3dx9_28.dll
+d3dx9_29.dll
+d3dx9_30.dll
+d3dx9_31.dll
+d3dx9_32.dll
+d3dx9_33.dll
+d3dx9_34.dll
+d3dx9_35.dll
+d3dx9_36.dll
+d3dx9_37.dll
+d3dx9_38.dll
+d3dx9_39.dll
+d3dx9_40.dll
+d3dx9_41.dll
+d3dx9_42.dll
+d3dx9_43.dll
+d3dxof.dll
+davclnt.dll
+dbgeng.dll
+dbghelp.dll
+dbnetlib.dll
+dbnmpntw.dll
+dciman32.dll
+dcomp.dll
+ddraw.dll
+devmgr.dll
+devobj.dll
+devrtl.dll
+dhcpcsvc6.dll
+dhcpcsvc.dll
+dhcpsapi.dll
+digest.dll
+dimsntfy.dll
+dimsroam.dll
+dinput8.dll
+dinput.dll
+diskcopy.dll
+dismapi.dll
+dmconfig.dll
+dmdskmgr.dll
+dmivcitf.dll
+dmutil.dll
+dnsapi.dll
+dnsrslvr.dll
+dpapi.dll
+dpnaddr.dll
+dpnet.dll
+dpnhupnp.dll
+dpnlobby.dll
+dpvoice.dll
+drprov.dll
+ds32gt.dll
+dsauth.dll
+dskquota.dll
+dsound3d.dll
+dsound.dll
+dsprop.dll
+dsquery.dll
+dssec.dll
+dssenh.dll
+dsuiext.dll
+duser.dll
+dwmapi.dll
+dwrite.dll
+dxgi.dll
+dxva2.dll
+eappcfg.dll
+eapphost.dll
+eappprxy.dll
+efsadu.dll
+es.dll
+esent.dll
+esentprf.dll
+eventlog.dll
+evr.dll
+exports.dll
+exprfdll.dll
+exstrace.dll
+fastprox.dll
+faultrep.dll
+fcachdll.dll
+fdeploy.dll
+feclient.dll
+filemgmt.dll
+fldrclnr.dll
+fltlib.dll
+fmifs.dll
+fontsub.dll
+framedyn.dll
+ftpctrs2.dll
+ftpmib.dll
+fwpuclnt.dll
+fxsapi.dll
+fxscfgwz.dll
+fxsdrv.dll
+fxsocm.dll
+fxsperf.dll
+fxsroute.dll
+fxsst.dll
+fxst30.dll
+fxstiff.dll
+fxsui.dll
+fxswzrd.dll
+gamemode.dll
+gdi32.dll
+gdiplus.dll
+genericui.dll
+getuname.dll
+glmf32.dll
+glu32.dll
+gpedit.dll
+gpkcsp.dll
+gptext.dll
+guitrn.dll
+hal.dll
+hbaapi.dll
+hgfs.dll
+hhctrl.ocx
+hidclass.sys
+hid.dll
+hidparse.sys
+hlink.dll
+hmmapi.dll
+hnetcfg.dll
+hnetwiz.dll
+hostmib.dll
+hotplug.dll
+htrn_jis.dll
+httpapi.dll
+httpext.dll
+httpmib.dll
+httpodbc.dll
+htui.dll
+hypertrm.dll
+iashlpr.dll
+iaspolcy.dll
+iassam.dll
+iassvcs.dll
+icaapi.dll
+icfgnt.dll
+icm32.dll
+icmp.dll
+icmui.dll
+icwconn.dll
+icwdl.dll
+icwphbk.dll
+icwutil.dll
+idq.dll
+ieakeng.dll
+iedkcs32.dll
+iernonce.dll
+iesetup.dll
+igmpagnt.dll
+iisadmin.dll
+iiscfg.dll
+iis.dll
+iisprov.dll
+iisrtl.dll
+iisui.dll
+iisutil.dll
+imagehlp.dll
+imedic.dll
+imejpcus.dll
+imeshare.dll
+imeskdic.dll
+imeskdic.dll
+imgutil.dll
+imjp81k.dll
+imjputyc.dll
+imm32.dll
+imsinsnt.dll
+inetcfg.dll
+inetcomm.dll
+inetmib1.dll
+infoadmn.dll
+infocomm.dll
+infoctrs.dll
+infosoft.dll
+initpki.dll
+input.dll
+inseng.dll
+iphlpapi.dll
+ipmontr.dll
+ipnathlp.dll
+iprop.dll
+iprtprio.dll
+iprtrmgr.dll
+ipsecspd.dll
+ipxsap.dll
+irclass.dll
+isapitst.dll
+isatq.dll
+iscomlog.dll
+iscsidsc.dll
+isignup2.dll
+iyuv_32.dll
+jet500.dll
+jsproxy.dll
+kd1394.dll
+kdcom.dll
+kerberos.dll
+kernel32.dll
+keymgr.dll
+ksecdd.sys
+ks.sys
+ksuser.dll
+ktmw32.dll
+linkinfo.dll
+lmmib2.dll
+loadperf.dll
+localspl.dll
+log.dll
+loghours.dll
+lonsint.dll
+lpk.dll
+lprhelp.dll
+lsasrv.dll
+lz32.dll
+mag_hook.dll
+mapi32.dll
+mcastmib.dll
+mcd32.dll
+mcdsrv32.dll
+mchgrcoi.dll
+mciavi32.dll
+mcicda.dll
+mciole32.dll
+mciqtz32.dll
+mciseq.dll
+mciwave.dll
+mdminst.dll
+mf3216.dll
+mfc42.dll
+mfc42u.dll
+mfcore.dll
+mf.dll
+mfplat.dll
+mfplay.dll
+mfreadwrite.dll
+mfsensorgroup.dll
+mgmtapi.dll
+midimap.dll
+migism.dll
+miglibnt.dll
+mlang.dll
+mll_hp.dll
+mll_mtf.dll
+mll_qic.dll
+mmdevapi.dll
+mmfutil.dll
+mmutilse.dll
+mobsync.dll
+modemui.dll
+mofd.dll
+mprapi.dll
+mprddm.dll
+mpr.dll
+mprui.dll
+mqad.dll
+mqcertui.dll
+mqdscli.dll
+mqise.dll
+mqperf.dll
+mqrtdep.dll
+mqrt.dll
+mqsec.dll
+mqupgrd.dll
+mqutil.dll
+msacm32.dll
+msadcs.dll
+msado15.dll
+msafd.dll
+msasn1.dll
+mscat32.dll
+mscms.dll
+msctf.dll
+msdadiag.dll
+msdart.dll
+msdmo.dll
+msdrm.dll
+msdtclog.dll
+msdtcprx.dll
+msdtctm.dll
+msdtcuiu.dll
+msftedit.dll
+msgina.dll
+msgr3en.dll
+msgsvc.dll
+mshtml.dll
+msi.dll
+msimg32.dll
+msimtf.dll
+msir3jp.dll
+msisip.dll
+mslbui.dll
+msls31.dll
+msmqocm.dll
+msobdl.dll
+msobmain.dll
+msoeacct.dll
+msoe.dll
+msoert2.dll
+msoledbsql.dll
+mspatcha.dll
+msports.dll
+msrating.dll
+msrle32.dll
+mssign32.dll
+mssip32.dll
+mstask.dll
+mstlsapi.dll
+msutb.dll
+msv1_0.dll
+msvcirt.dll
+msvcp120_app.dll
+msvcp60.dll
+msvcr100.dll
+msvcr110.dll
+msvcr120_app.dll
+msvcr120d.dll
+msvcr120.dll
+msvcr80.dll
+msvcr90d.dll
+msvcr90.dll
+msvcrt.dll
+msvfw32.dll
+msvidc32.dll
+msw3prt.dll
+mswsock.dll
+msyuv.dll
+mtxclu.dll
+mtxdm.dll
+mtxex.dll
+mtxoci.dll
+mydocs.dll
+ncobjapi.dll
+ncrypt.dll
+ncxp.dll
+nddeapi.dll
+nddenb32.dll
+ndfapi.dll
+ndisnpp.dll
+ndis.sys
+netapi32.dll
+netcfgx.dll
+netid.dll
+netio.sys
+netlogon.dll
+netman.dll
+netoc.dll
+netplwiz.dll
+netrap.dll
+netshell.dll
+netui0.dll
+netui1.dll
+netui2.dll
+newdev.dll
+nntpapi.dll
+normaliz.dll
+npptools.dll
+nshipsec.dll
+ntdll.dll
+ntdsapi.dll
+ntdsbcli.dll
+ntdtcsetup.dll
+ntlanman.dll
+ntlanui.dll
+ntlsapi.dll
+ntmarta.dll
+ntmsapi.dll
+ntoc.dll
+ntoskrnl.exe
+ntprint.dll
+ntshrui.dll
+ntvdm64.dll
+nwprovau.dll
+oakley.dll
+occache.dll
+ocmanage.dll
+ocmsn.dll
+ocsbs.dll
+odbc32.dll
+odbc32gt.dll
+odbcbcp.dll
+odbcconf.dll
+odbccp32.dll
+odbccr32.dll
+odbctrac.dll
+oeimport.dll
+oemiglib.dll
+ole32.dll
+oleacc.dll
+oleaut32.dll
+olecli32.dll
+olecnv32.dll
+oledb32.dll
+oledlg.dll
+olesvr32.dll
+opends60.dll
+opengl32.dll
+osuninst.dll
+p2pcollab.dll
+p2p.dll
+p2pgraph.dll
+pautoenr.dll
+pcwum.dll
+pdh.dll
+perfctrs.dll
+perfdisk.dll
+perfnet.dll
+perfos.dll
+perfproc.dll
+perfts.dll
+photowiz.dll
+pidgen.dll
+policman.dll
+polstore.dll
+powrprof.dll
+printui.dll
+prntvpt.dll
+profmap.dll
+proppage.dll
+propsys.dll
+ps5ui.dll
+psapi.dll
+psbase.dll
+pschdprf.dll
+pscript5.dll
+pstorec.dll
+pstorsvc.dll
+qmgr.dll
+qosname.dll
+quartz.dll
+query.dll
+qutil.dll
+qwave.dll
+rasadhlp.dll
+rasapi32.dll
+rasauto.dll
+raschap.dll
+rasctrs.dll
+rasdlg.dll
+rasman.dll
+rasmans.dll
+rasmontr.dll
+rasmxs.dll
+rasppp.dll
+rasrad.dll
+rassapi.dll
+rasser.dll
+rastapi.dll
+rastls.dll
+rdpcfgex.dll
+rdpsnd.dll
+rdpwsx.dll
+regapi.dll
+regsvc.dll
+resutils.dll
+riched20.dll
+rnr20.dll
+routemsg.dll
+routetab.dll
+rpcdiag.dll
+rpchttp.dll
+rpcns4.dll
+rpcref.dll
+rpcrt4.dll
+rpcss.dll
+rsaenh.dll
+rstrtmgr.dll
+rtm.dll
+rtutils.dll
+samlib.dll
+samsrv.dll
+scarddlg.dll
+sccbase.dll
+scecli.dll
+scesrv.dll
+schannel.dll
+schedsvc.dll
+sclgntfy.dll
+scredir.dll
+script.dll
+scrobj.dll
+scrrun.dll
+sdhcinst.dll
+seclogon.dll
+secur32.dll
+security.dll
+sensapi.dll
+senscfg.dll
+sens.dll
+seo.dll
+serialui.dll
+serwvdrv.dll
+setupapi.dll
+setupqry.dll
+sfc.dll
+sfcfiles.dll
+sfc_os.dll
+sfmapi.dll
+shcore.dll
+shdocvw.dll
+shell32.dll
+shfolder.dll
+shimeng.dll
+shimgvw.dll
+shlwapi.dll
+shscrap.dll
+shsvcs.dll
+sigtab.dll
+sisbkup.dll
+skdll.dll
+slbcsp.dll
+slc.dll
+slcext.dll
+slwga.dll
+smtpapi.dll
+smtpctrs.dll
+snapin.dll
+snmpapi.dll
+snmpelea.dll
+snmpmib.exe
+softpub.dll
+spoolss.dll
+sqlsrv32.dll
+sqlxmlx.dll
+srchctls.dll
+srclient.dll
+srrstr.dll
+srvsvc.dll
+ssdpapi.dll
+ssinc.dll
+sspicli.dll
+staxmem.dll
+sti_ci.dll
+sti.dll
+streamci.dll
+strmfilt.dll
+subauth.dll
+svcpack.dll
+sxs.dll
+synceng.dll
+syncui.dll
+sysinv.dll
+sysmod.dll
+syssetup.dll
+t2embed.dll
+tapi32.dll
+tapiperf.dll
+tbs.dll
+tcpmib.dll
+tdh.dll
+traffic.dll
+tsappcmp.dll
+tsbyuv.dll
+tsd32.dll
+tsoc.dll
+txfw32.dll
+ucrtbase.dll
+ufat.dll
+umandlg.dll
+umdmxfrm.dll
+umpnpmgr.dll
+unidrv.dll
+unidrvui.dll
+uniime.dll
+unimdmat.dll
+uniplat.dll
+untfs.dll
+upnp.dll
+upnpui.dll
+urlauth.dll
+url.dll
+urlmon.dll
+usbcamd2.sys
+usbd.sys
+usbport.sys
+user32.dll
+userenv.dll
+usp10.dll
+utildll.dll
+uxtheme.dll
+vcruntime140_app.dll
+vdsutil.dll
+verifier.dll
+version.dll
+vgx.dll
+virtdisk.dll
+vmx_mode.dll
+vssapi.dll
+w32time.dll
+w32topl.dll
+w3core.dll
+w3ctrs.dll
+w3dt.dll
+w3isapi.dll
+w3ssl.dll
+w3tp.dll
+wab32.dll
+wabimp.dll
+wamreg.dll
+wbemcore.dll
+wbemupgd.dll
+wdigest.dll
+wdmaud.drv
+wdsclientapi.dll
+wdsclient.dll
+wdscore.dll
+wdscsl.dll
+wdsimage.dll
+wdstptc.dll
+wdsupgcompl.dll
+wdsutil.dll
+webauthn.dll
+webcheck.dll
+webclnt.dll
+webhits.dll
+websocket.dll
+wecapi.dll
+wer.dll
+wevtapi.dll
+wevtfwd.dll
+wiadss.dll
+wiarpc.dll
+wiaservc.dll
+wiashext.dll
+wimgapi.dll
+windowscodecs.dll
+winfax.dll
+winhttp.dll
+winhvemulation.dll
+winhvplatform.dll
+wininet.dll
+winipsec.dll
+winmm.dll
+winrnr.dll
+winscard.dll
+winspool.drv
+winsrv.dll
+winsta.dll
+wintrust.dll
+winusb.dll
+wkssvc.dll
+wlanapi.dll
+wlanui.dll
+wlanutil.dll
+wldap32.dll
+wlnotify.dll
+wlstore.dll
+wmi2xml.dll
+wmiaprpl.dll
+wmi.dll
+wmilib.sys
+wmiprop.dll
+wmisvc.dll
+wofutil.dll
+wow64cpu.dll
+wow64.dll
+wow64mib.dll
+wow64win.dll
+wpd_ci.dll
+ws2_32.dll
+ws2help.dll
+wscapi.dll
+wscsvc.dll
+wsdapi.dll
+wshatm.dll
+wshbth.dll
+wslapi.dll
+wsock32.dll
+wtsapi32.dll
+x3daudio1_2.dll
+x3daudio1_3.dll
+x3daudio1_4.dll
+x3daudio1_5.dll
+x3daudio1_6.dll
+x3daudio1_7.dll
+x3daudiod1_7.dll
+xapofx1_0.dll
+xapofx1_1.dll
+xapofx1_2.dll
+xapofx1_3.dll
+xapofx1_4.dll
+xapofx1_5.dll
+xapofxd1_5.dll
+xaudio2_8.dll
+xinput1_1.dll
+xinput1_2.dll
+xinput1_3.dll
+xinput1_4.dll
+xinput9_1_0.dll
+zoneoc.dll

From 38c14c17cd100a7bf9d5a3b96a4b44f55d0ed264 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 3 May 2022 15:46:35 +0200
Subject: [PATCH 55/90] Add host lib dirs to ld.so.conf

---
 mingw-filesystem.spec | 13 ++++++++++++-
 mingw32-hostlib.conf  |  1 +
 mingw64-hostlib.conf  |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 mingw32-hostlib.conf
 create mode 100644 mingw64-hostlib.conf

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 91b702d..22bc10c 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        134
+Version:        135
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -47,6 +47,8 @@ Source25:       toolchain-ucrt64.meson
 Source26:       pkgconf-personality-mingw32
 Source27:       pkgconf-personality-mingw64
 Source28:       pkgconf-personality-ucrt64
+Source29:       mingw32-hostlib.conf
+Source30:       mingw64-hostlib.conf
 
 # Taken from the Fedora filesystem package
 Source101:      https://fedorahosted.org/filesystem/browser/lang-exceptions
@@ -366,6 +368,10 @@ install -m 0644 %{SOURCE26} %{buildroot}%{pkgconfig_personalitydir}/i686-w64-min
 install -m 0644 %{SOURCE27} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
 install -m 0644 %{SOURCE28} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32ucrt.personality
 
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+install -m 0644 %{SOURCE29} %{buildroot}%{_sysconfdir}/ld.so.conf.d/mingw32-hostlib.conf
+install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/ld.so.conf.d/mingw64-hostlib.conf
+
 # Link mingw-pkg-config man pages to pkgconf(1)
 mkdir -p %{buildroot}%{_mandir}/man1/
 echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/i686-w64-mingw32-pkg-config.1
@@ -397,6 +403,7 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %{_datadir}/mingw/toolchain-mingw32.meson
 %{pkgconfig_personalitydir}/i686-w64-mingw32.personality
 %{_mandir}/man1/i686-w64-mingw32-pkg-config.1*
+%{_sysconfdir}/ld.so.conf.d/mingw32-hostlib.conf
 %dir %{_prefix}/lib/debug/%{_prefix}
 %dir %{_prefix}/lib/debug/%{_prefix}/i686-w64-mingw32
 
@@ -416,6 +423,7 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %{_datadir}/mingw/toolchain-mingw64.meson
 %{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
 %{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1*
+%{_sysconfdir}/ld.so.conf.d/mingw64-hostlib.conf
 %dir %{_prefix}/lib/debug/%{_prefix}
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32
 
@@ -439,6 +447,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Tue May 03 2022 Sandro Mani <manisandro@gmail.com> - 135-1
+- Add host lib dirs to ld.so.conf
+
 * Thu Apr 28 2022 Sandro Mani <manisandro@gmail.com> - 134-1
 - Regenerate standard-dlls
 
diff --git a/mingw32-hostlib.conf b/mingw32-hostlib.conf
new file mode 100644
index 0000000..c00dd5d
--- /dev/null
+++ b/mingw32-hostlib.conf
@@ -0,0 +1 @@
+/usr/i686-w64-mingw32/lib/
diff --git a/mingw64-hostlib.conf b/mingw64-hostlib.conf
new file mode 100644
index 0000000..0defb02
--- /dev/null
+++ b/mingw64-hostlib.conf
@@ -0,0 +1 @@
+/usr/x86_64-w64-mingw32/lib/

From 6e51f453f3c9168193eb0515b879df0c386927b2 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 4 May 2022 00:16:02 +0200
Subject: [PATCH 56/90] Drop standard DLL provides, moved to mingw-crt

---
 mingw-filesystem.spec | 187 +++-----
 standard-dlls-mingw32 | 531 -----------------------
 standard-dlls-mingw64 | 987 ------------------------------------------
 standard-dlls-ucrt64  | 987 ------------------------------------------
 4 files changed, 53 insertions(+), 2639 deletions(-)
 delete mode 100644 standard-dlls-mingw32
 delete mode 100644 standard-dlls-mingw64
 delete mode 100644 standard-dlls-ucrt64

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 22bc10c..5455cb7 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        135
+Version:        136
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -34,21 +34,14 @@ Source16:       mingw-find-lang.sh
 Source17:       mingw32.attr
 Source18:       mingw64.attr
 Source19:       ucrt64.attr
-# generated with:
-# (rpm -ql mingw32-crt | grep '\.a$' | while read f ; do i686-w64-mingw32-dlltool   -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-mingw32
-Source20:       standard-dlls-mingw32
-# (rpm -ql mingw64-crt | grep '\.a$' | while read f ; do x86_64-w64-mingw32-dlltool -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-mingw64
-Source21:       standard-dlls-mingw64
-# (rpm -ql ucrt64-crt | grep '\.a$' | while read f ; do x86_64-w64-mingw32ucrt-dlltool -I $f 2>/dev/null ; done) | sort | uniq | tr A-Z a-z > standard-dlls-ucrt64
-Source22:       standard-dlls-ucrt64
-Source23:       toolchain-mingw32.meson
-Source24:       toolchain-mingw64.meson
-Source25:       toolchain-ucrt64.meson
-Source26:       pkgconf-personality-mingw32
-Source27:       pkgconf-personality-mingw64
-Source28:       pkgconf-personality-ucrt64
-Source29:       mingw32-hostlib.conf
-Source30:       mingw64-hostlib.conf
+Source20:       toolchain-mingw32.meson
+Source21:       toolchain-mingw64.meson
+Source22:       toolchain-ucrt64.meson
+Source23:       pkgconf-personality-mingw32
+Source24:       pkgconf-personality-mingw64
+Source25:       pkgconf-personality-ucrt64
+Source26:       mingw32-hostlib.conf
+Source27:       mingw64-hostlib.conf
 
 # Taken from the Fedora filesystem package
 Source101:      https://fedorahosted.org/filesystem/browser/lang-exceptions
@@ -98,23 +91,6 @@ Conflicts:      mingw32-pkg-config < 0.28-17
 Obsoletes:      mingw32-pkg-config < 0.28-17
 Provides:       mingw32-pkg-config = 0.28-17
 
-# Note about 'Provides: mingw32(foo.dll)'
-# ------------------------------------------------------------
-#
-# We want to be able to build & install mingw32 libraries without
-# necessarily needing to install wine.  (And certainly not needing to
-# install Windows!)  There is no requirement to have wine installed in
-# order to use the mingw toolchain to develop software (ie. to
-# compile more stuff on top of it), so why require that?
-#
-# So for expediency, this base package provides the "missing" DLLs
-# from Windows.  Another way to do it would be to exclude these
-# proprietary DLLs in our find-requires checking script - essentially
-# it comes out the same either way.
-#
-Provides:       %(sed "s/\(.*\)/mingw32(\1) /g" %{SOURCE20} | tr "\n" " ")
-Provides:       mingw32(mscoree.dll)
-
 %description -n mingw32-filesystem
 This package contains the base filesystem layout, RPM macros and
 environment for all Fedora MinGW packages.
@@ -132,8 +108,6 @@ Conflicts:      mingw64-pkg-config < 0.28-17
 Obsoletes:      mingw64-pkg-config < 0.28-17
 Provides:       mingw64-pkg-config = 0.28-17
 
-Provides:       %(sed "s/\(.*\)/mingw64(\1) /g" %{SOURCE21} | tr "\n" " ")
-Provides:       mingw64(mscoree.dll)
 
 %description -n mingw64-filesystem
 This package contains the base filesystem layout, RPM macros and
@@ -151,8 +125,6 @@ Conflicts:      ucrt64-pkg-config < 0.28-17
 Obsoletes:      ucrt64-pkg-config < 0.28-17
 Provides:       ucrt64-pkg-config = 0.28-17
 
-Provides:       %(sed "s/\(.*\)/ucrt64(\1) /g" %{SOURCE22} | tr "\n" " ")
-Provides:       ucrt64(mscoree.dll)
 
 %description -n ucrt64-filesystem
 This package contains the base filesystem layout, RPM macros and
@@ -162,6 +134,7 @@ This environment is maintained by the Fedora MinGW SIG at:
 
   http://fedoraproject.org/wiki/SIGs/MinGW
 
+
 %prep
 %setup -q -c -T
 cp %{SOURCE0} COPYING
@@ -172,8 +145,6 @@ cp %{SOURCE0} COPYING
 
 
 %install
-mkdir -p %{buildroot}
-
 mkdir -p %{buildroot}%{_libexecdir}
 install -m 755 %{SOURCE11} %{buildroot}%{_libexecdir}/mingw-scripts
 
@@ -205,96 +176,41 @@ install -m 644 %{SOURCE4} %{buildroot}%{macrosdir}/macros.ucrt64
 mkdir -p %{buildroot}%{_sysconfdir}/rpmlint
 install -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/rpmlint/
 
-# Create the folders required for gcc and binutils
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/bin
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/lib
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/bin
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/lib
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/bin
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/lib
+for target in i686-w64-mingw32 x86_64-w64-mingw32 x86_64-w64-mingw32ucrt; do
+  # Create the folders required for gcc and binutils
+  mkdir -p %{buildroot}%{_prefix}/$target
+  mkdir -p %{buildroot}%{_prefix}/$target/bin
+  mkdir -p %{buildroot}%{_prefix}/$target/lib
 
-# The MinGW system root which will contain Windows native binaries
-# and Windows-specific header files, pkgconfig, etc.
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/bin
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/etc
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/include
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/include/sys
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/cmake
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/sbin
+  # The MinGW system root which will contain Windows native binaries
+  # and Windows-specific header files, pkgconfig, etc.
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/bin
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/etc
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/include
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/include/sys
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib/pkgconfig
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib/cmake
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/sbin
 
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/bin
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/etc
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/cmake
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/sbin
+  # We don't normally package manual pages and info files, except
+  # where those are not supplied by a Fedora native package.  So we
+  # need to create the directories.
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/doc
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/info
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/man
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/aclocal
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/themes
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/cmake
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/locale
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/pkgconfig
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/xml
 
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/bin
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/etc
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/include
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/include
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/lib
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/lib/pkgconfig
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/lib/cmake
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/sbin
-
-# We don't normally package manual pages and info files, except
-# where those are not supplied by a Fedora native package.  So we
-# need to create the directories.
-#
-# Note that some packages try to install stuff in
-#   /usr/x86_64-pc-mingw32/sys-root/man and
-#   /usr/x86_64-pc-mingw32/sys-root/doc
-# but those are both packaging bugs.
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/doc
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/info
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/aclocal
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/themes
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/cmake
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/pkgconfig
-mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/xml
-
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/doc
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/info
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/aclocal
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/themes
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/cmake
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/xml
-
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/doc
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/info
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/man
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n}
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/aclocal
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/themes
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/cmake
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/locale
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/pkgconfig
-mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32ucrt/sys-root/mingw/share/xml
-
-mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/i686-w64-mingw32
-mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32
-mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
+  mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/$target
+done
 
 # Own folders for all locales
 # Snippet taken from the Fedora filesystem package
@@ -359,18 +275,18 @@ mkdir -p %{buildroot}%{_datadir}/mingw
 install -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/mingw/
 install -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/mingw/
 install -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/mingw/
-install -m 0644 %{SOURCE23} %{buildroot}%{_datadir}/mingw/
-install -m 0644 %{SOURCE24} %{buildroot}%{_datadir}/mingw/
-install -m 0644 %{SOURCE25} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE20} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE21} %{buildroot}%{_datadir}/mingw/
+install -m 0644 %{SOURCE22} %{buildroot}%{_datadir}/mingw/
 
 mkdir -p %{buildroot}%{pkgconfig_personalitydir}
-install -m 0644 %{SOURCE26} %{buildroot}%{pkgconfig_personalitydir}/i686-w64-mingw32.personality
-install -m 0644 %{SOURCE27} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
-install -m 0644 %{SOURCE28} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32ucrt.personality
+install -m 0644 %{SOURCE23} %{buildroot}%{pkgconfig_personalitydir}/i686-w64-mingw32.personality
+install -m 0644 %{SOURCE24} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
+install -m 0644 %{SOURCE25} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32ucrt.personality
 
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-install -m 0644 %{SOURCE29} %{buildroot}%{_sysconfdir}/ld.so.conf.d/mingw32-hostlib.conf
-install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/ld.so.conf.d/mingw64-hostlib.conf
+install -m 0644 %{SOURCE26} %{buildroot}%{_sysconfdir}/ld.so.conf.d/mingw32-hostlib.conf
+install -m 0644 %{SOURCE27} %{buildroot}%{_sysconfdir}/ld.so.conf.d/mingw64-hostlib.conf
 
 # Link mingw-pkg-config man pages to pkgconf(1)
 mkdir -p %{buildroot}%{_mandir}/man1/
@@ -447,6 +363,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Tue May 03 2022 Sandro Mani <manisandro@gmail.com> - 136-1
+- Drop standard DLL provides, moved to mingw-crt
+
 * Tue May 03 2022 Sandro Mani <manisandro@gmail.com> - 135-1
 - Add host lib dirs to ld.so.conf
 
diff --git a/standard-dlls-mingw32 b/standard-dlls-mingw32
deleted file mode 100644
index 244e30b..0000000
--- a/standard-dlls-mingw32
+++ /dev/null
@@ -1,531 +0,0 @@
-aclui.dll
-activeds.dll
-adsldpc.dll
-advapi32.dll
-apcups.dll
-api-ms-win-appmodel-runtime-l1-1-0.dll
-api-ms-win-appmodel-runtime-l1-1-1.dll
-api-ms-win-core-com-l1-1-0.dll
-api-ms-win-core-com-l1-1-1.dll
-api-ms-win-core-com-l2-1-1.dll
-api-ms-win-core-com-midlproxystub-l1-1-0.dll
-api-ms-win-core-comm-l1-1-0.dll
-api-ms-win-core-comm-l1-1-1.dll
-api-ms-win-core-comm-l1-1-2.dll
-api-ms-win-core-console-l1-1-0.dll
-api-ms-win-core-console-l1-2-0.dll
-api-ms-win-core-console-l2-1-0.dll
-api-ms-win-core-console-l2-2-0.dll
-api-ms-win-core-console-l3-2-0.dll
-api-ms-win-core-datetime-l1-1-0.dll
-api-ms-win-core-datetime-l1-1-1.dll
-api-ms-win-core-datetime-l1-1-2.dll
-api-ms-win-core-debug-l1-1-0.dll
-api-ms-win-core-debug-l1-1-1.dll
-api-ms-win-core-delayload-l1-1-1.dll
-api-ms-win-core-enclave-l1-1-0.dll
-api-ms-win-core-errorhandling-l1-1-0.dll
-api-ms-win-core-errorhandling-l1-1-1.dll
-api-ms-win-core-errorhandling-l1-1-3.dll
-api-ms-win-core-featurestaging-l1-1-0.dll
-api-ms-win-core-featurestaging-l1-1-1.dll
-api-ms-win-core-fibers-l1-1-1.dll
-api-ms-win-core-fibers-l2-1-1.dll
-api-ms-win-core-file-ansi-l1-1-0.dll
-api-ms-win-core-file-ansi-l2-1-0.dll
-api-ms-win-core-file-fromapp-l1-1-0.dll
-api-ms-win-core-file-l1-1-0.dll
-api-ms-win-core-file-l1-2-1.dll
-api-ms-win-core-file-l1-2-2.dll
-api-ms-win-core-file-l2-1-0.dll
-api-ms-win-core-file-l2-1-1.dll
-api-ms-win-core-file-l2-1-2.dll
-api-ms-win-core-firmware-l1-1-0.dll
-api-ms-win-core-handle-l1-1-0.dll
-api-ms-win-core-heap-l1-2-0.dll
-api-ms-win-core-heap-l2-1-0.dll
-api-ms-win-core-heap-obsolete-l1-1-0.dll
-api-ms-win-core-interlocked-l1-1-0.dll
-api-ms-win-core-interlocked-l1-2-0.dll
-api-ms-win-core-io-l1-1-0.dll
-api-ms-win-core-io-l1-1-1.dll
-api-ms-win-core-kernel32-legacy-ansi-l1-1-0.dll
-api-ms-win-core-kernel32-legacy-l1-1-0.dll
-api-ms-win-core-kernel32-legacy-l1-1-1.dll
-api-ms-win-core-largeinteger-l1-1-0.dll
-api-ms-win-core-libraryloader-l1-2-0.dll
-api-ms-win-core-libraryloader-l1-2-1.dll
-api-ms-win-core-libraryloader-l2-1-0.dll
-api-ms-win-core-localization-ansi-l1-1-0.dll
-api-ms-win-core-localization-l1-2-0.dll
-api-ms-win-core-localization-l1-2-1.dll
-api-ms-win-core-localization-l1-2-2.dll
-api-ms-win-core-localization-l2-1-0.dll
-api-ms-win-core-localization-obsolete-l1-2-0.dll
-api-ms-win-core-memory-l1-1-0.dll
-api-ms-win-core-memory-l1-1-1.dll
-api-ms-win-core-memory-l1-1-2.dll
-api-ms-win-core-memory-l1-1-3.dll
-api-ms-win-core-memory-l1-1-5.dll
-api-ms-win-core-memory-l1-1-6.dll
-api-ms-win-core-memory-l1-1-7.dll
-api-ms-win-core-namedpipe-ansi-l1-1-0.dll
-api-ms-win-core-namedpipe-ansi-l1-1-1.dll
-api-ms-win-core-namedpipe-l1-1-0.dll
-api-ms-win-core-namedpipe-l1-2-1.dll
-api-ms-win-core-namedpipe-l1-2-2.dll
-api-ms-win-core-namespace-ansi-l1-1-0.dll
-api-ms-win-core-namespace-l1-1-0.dll
-api-ms-win-core-normalization-l1-1-0.dll
-api-ms-win-core-path-l1-1-0.dll
-api-ms-win-core-processenvironment-l1-1-0.dll
-api-ms-win-core-processenvironment-l1-2-0.dll
-api-ms-win-core-processthreads-l1-1-0.dll
-api-ms-win-core-processthreads-l1-1-1.dll
-api-ms-win-core-processthreads-l1-1-2.dll
-api-ms-win-core-processthreads-l1-1-3.dll
-api-ms-win-core-processtopology-obsolete-l1-1-0.dll
-api-ms-win-core-profile-l1-1-0.dll
-api-ms-win-core-psapi-ansi-l1-1-0.dll
-api-ms-win-core-psapi-l1-1-0.dll
-api-ms-win-core-psm-appnotify-l1-1-0.dll
-api-ms-win-core-realtime-l1-1-0.dll
-api-ms-win-core-realtime-l1-1-1.dll
-api-ms-win-core-realtime-l1-1-2.dll
-api-ms-win-core-rtlsupport-l1-2-0.dll
-api-ms-win-core-slapi-l1-1-0.dll
-api-ms-win-core-string-l1-1-0.dll
-api-ms-win-core-synch-ansi-l1-1-0.dll
-api-ms-win-core-synch-l1-1-0.dll
-api-ms-win-core-synch-l1-2-0.dll
-api-ms-win-core-synch-l1-2-1.dll
-api-ms-win-core-sysinfo-l1-1-0.dll
-api-ms-win-core-sysinfo-l1-2-0.dll
-api-ms-win-core-sysinfo-l1-2-1.dll
-api-ms-win-core-sysinfo-l1-2-3.dll
-api-ms-win-core-threadpool-l1-2-0.dll
-api-ms-win-core-timezone-l1-1-0.dll
-api-ms-win-core-timezone-l1-1-1.dll
-api-ms-win-core-url-l1-1-0.dll
-api-ms-win-core-util-l1-1-0.dll
-api-ms-win-core-versionansi-l1-1-0.dll
-api-ms-win-core-version-l1-1-0.dll
-api-ms-win-core-version-l1-1-1.dll
-api-ms-win-core-windowsceip-l1-1-0.dll
-api-ms-win-core-windowserrorreporting-l1-1-0.dll
-api-ms-win-core-windowserrorreporting-l1-1-1.dll
-api-ms-win-core-windowserrorreporting-l1-1-2.dll
-api-ms-win-core-winrt-error-l1-1-0.dll
-api-ms-win-core-winrt-error-l1-1-1.dll
-api-ms-win-core-winrt-l1-1-0.dll
-api-ms-win-core-winrt-registration-l1-1-0.dll
-api-ms-win-core-winrt-robuffer-l1-1-0.dll
-api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll
-api-ms-win-core-winrt-string-l1-1-0.dll
-api-ms-win-core-wow64-l1-1-0.dll
-api-ms-win-core-wow64-l1-1-1.dll
-api-ms-win-core-xstate-l2-1-0.dll
-api-ms-win-crt-conio-l1-1-0.dll
-api-ms-win-crt-convert-l1-1-0.dll
-api-ms-win-crt-environment-l1-1-0.dll
-api-ms-win-crt-filesystem-l1-1-0.dll
-api-ms-win-crt-heap-l1-1-0.dll
-api-ms-win-crt-locale-l1-1-0.dll
-api-ms-win-crt-math-l1-1-0.dll
-api-ms-win-crt-multibyte-l1-1-0.dll
-api-ms-win-crt-private-l1-1-0.dll
-api-ms-win-crt-process-l1-1-0.dll
-api-ms-win-crt-runtime-l1-1-0.dll
-api-ms-win-crt-stdio-l1-1-0.dll
-api-ms-win-crt-string-l1-1-0.dll
-api-ms-win-crt-time-l1-1-0.dll
-api-ms-win-crt-utility-l1-1-0.dll
-api-ms-win-devices-config-l1-1-1.dll
-api-ms-win-devices-config-l1-1-2.dll
-api-ms-win-eventing-classicprovider-l1-1-0.dll
-api-ms-win-eventing-consumer-l1-1-0.dll
-api-ms-win-eventing-controller-l1-1-0.dll
-api-ms-win-eventing-legacy-l1-1-0.dll
-api-ms-win-eventing-provider-l1-1-0.dll
-api-ms-win-gaming-deviceinformation-l1-1-0.dll
-api-ms-win-gaming-expandedresources-l1-1-0.dll
-api-ms-win-gaming-tcui-l1-1-0.dll
-api-ms-win-gaming-tcui-l1-1-2.dll
-api-ms-win-gaming-tcui-l1-1-3.dll
-api-ms-win-gaming-tcui-l1-1-4.dll
-api-ms-win-ro-typeresolution-l1-1-0.dll
-api-ms-win-ro-typeresolution-l1-1-1.dll
-api-ms-win-security-base-l1-1-0.dll
-api-ms-win-security-base-l1-2-0.dll
-api-ms-win-security-base-l1-2-1.dll
-api-ms-win-security-cryptoapi-l1-1-0.dll
-api-ms-win-security-isolatedcontainer-l1-1-0.dll
-api-ms-win-security-lsalookup-ansi-l2-1-0.dll
-api-ms-win-security-lsalookup-l2-1-0.dll
-api-ms-win-security-provider-ansi-l1-1-0.dll
-api-ms-win-security-provider-l1-1-0.dll
-api-ms-win-security-sddl-ansi-l1-1-0.dll
-api-ms-win-security-sddl-l1-1-0.dll
-api-ms-win-shcore-obsolete-l1-1-0.dll
-api-ms-win-shcore-stream-winrt-l1-1-0.dll
-authz.dll
-avicap32.dll
-avifil32.dll
-avrt.dll
-bcrypt.dll
-bluetoothapis.dll
-bootvid.dll
-browcli.dll
-bthprops.cpl
-cabinet.dll
-cap.dll
-cfgmgr32.dll
-classpnp.sys
-clfsw32.dll
-clusapi.dll
-cmutil.dll
-comctl32.dll
-comdlg32.dll
-connect.dll
-credui.dll
-crtdll.dll
-crypt32.dll
-cryptnet.dll
-cryptsp.dll
-cryptxml.dll
-cscapi.dll
-ctl3d32.dll
-d2d1.dll
-d3d10.dll
-d3d11.dll
-d3d12.dll
-d3d8.dll
-d3d9.dll
-d3dcompiler_37.dll
-d3dcompiler_38.dll
-d3dcompiler_39.dll
-d3dcompiler_40.dll
-d3dcompiler_41.dll
-d3dcompiler_42.dll
-d3dcompiler_43.dll
-d3dcompiler_46.dll
-d3dcompiler_47.dll
-d3dcompiler.dll
-d3dcsx_46.dll
-d3dcsxd_43.dll
-d3dim.dll
-d3drm.dll
-d3dx10_33.dll
-d3dx10_34.dll
-d3dx10_35.dll
-d3dx10_36.dll
-d3dx10_37.dll
-d3dx10_38.dll
-d3dx10_39.dll
-d3dx10_40.dll
-d3dx10_41.dll
-d3dx10_42.dll
-d3dx10_43.dll
-d3dx11_42.dll
-d3dx11_43.dll
-d3dx8d.dll
-d3dx9_24.dll
-d3dx9_25.dll
-d3dx9_26.dll
-d3dx9_27.dll
-d3dx9_28.dll
-d3dx9_29.dll
-d3dx9_30.dll
-d3dx9_31.dll
-d3dx9_32.dll
-d3dx9_33.dll
-d3dx9_34.dll
-d3dx9_35.dll
-d3dx9_36.dll
-d3dx9_37.dll
-d3dx9_38.dll
-d3dx9_39.dll
-d3dx9_40.dll
-d3dx9_41.dll
-d3dx9_42.dll
-d3dx9_43.dll
-d3dx9d.dll
-d3dxof.dll
-davclnt.dll
-davhlpr.dll
-dbgeng.dll
-dbghelp.dll
-dcomp.dll
-ddraw.dll
-devmgr.dll
-devobj.dll
-devrtl.dll
-dfscli.dll
-dhcpcsvc6.dll
-dhcpcsvc.dll
-dhcpsapi.dll
-dinput8.dll
-dinput.dll
-dismapi.dll
-dlcapi.dll
-dnsapi.dll
-dpapi.dll
-dplayx.dll
-dpnaddr.dll
-dpnet.dll
-dpnlobby.def
-dpvoice.dll
-dsetup.dll
-dsound.dll
-dsrole.dll
-dssec.dll
-dwmapi.dll
-dwrite.dll
-dxapi.sys
-dxgi.dll
-dxva2.dll
-eappcfg.dll
-eapphost.dll
-eappprxy.dll
-elscore.dll
-esent.dll
-evr.dll
-faultrep.dll
-feclient.dll
-fontsub.dll
-fwpuclnt.dll
-gamemode.dll
-gdi32.dll
-gdiplus.dll
-genericui.dll
-glaux.dll
-glu32.dll
-glut32.dll
-glut.dll
-gpapi.dll
-gpedit.dll
-gpscript.dll
-gptext.dll
-hal.dll
-hhctrl.ocx
-hidclass.sys
-hid.dll
-hidparse.sys
-httpapi.dll
-icmui.dll
-igmpagnt.dll
-imagehlp.dll
-imm32.dll
-iphlpapi.dll
-iscsidsc.dll
-kernel32.dll
-ksecdd.sys
-ksproxy.ax
-ks.sys
-ksuser.dll
-ktmw32.dll
-logoncli.dll
-lz32.dll
-mapi32.dll
-mcd.sys
-mfcore.dll
-mfcuia32.dll
-mf.dll
-mfplat.dll
-mfplay.dll
-mfreadwrite.dll
-mfsensorgroup.dll
-mgmtapi.dll
-mmdevapi.dll
-mprapi.dll
-mpr.dll
-mqrt.dll
-msacm32.dll
-mscms.dll
-msctf.dll
-msdmo.dll
-msdrm.dll
-mshtml.dll
-mshtmled.dll
-msi.dll
-msimg32.dll
-msoledbsql.dll
-mstask.dll
-msvcp120_app.dll
-msvcp60.dll
-msvcr100.dll
-msvcr110.dll
-msvcr120_app.dll
-msvcr120d.dll
-msvcr120.dll
-msvcr70.dll
-msvcr71.dll
-msvcr80.dll
-msvcr90d.dll
-msvcr90.dll
-msvcrt10.dll
-msvcrt20.dll
-msvcrt40.dll
-msvcrt.dll
-msvfw32.dll
-mswsock.dll
-ncrypt.dll
-nddeapi.dll
-ndfapi.dll
-ndis.sys
-netapi32.dll
-netio.sys
-netjoin.dll
-netutils.dll
-newdev.dll
-normaliz.dll
-ntdll.dll
-ntdsapi.dll
-ntmsapi.dll
-ntoskrnl.exe
-odbc32.dll
-odbccp32.dll
-ole32.dll
-oleacc.dll
-oleaut32.dll
-olecli32.dll
-oledlg.dll
-olepro32.dll
-olesvr32.dll
-olethk32.dll
-opends60.dll
-opengl32.dll
-p2pcollab.dll
-p2p.dll
-p2pgraph.dll
-pcwum.dll
-pdh.dll
-pdhui.dll
-penwin32.dll
-pkpd32.dll
-polprocl.dll
-powrprof.dll
-prntvpt.dll
-propsys.dll
-psapi.dll
-quartz.dll
-query.dll
-qutil.dll
-qwave.dll
-rapi.dll
-rasapi32.dll
-rasdlg.dll
-resutils.dll
-rpcdce4.dll
-rpcdiag.dll
-rpchttp.dll
-rpcns4.dll
-rpcrt4.dll
-rstrtmgr.dll
-rtm.dll
-rtutils.dll
-samcli.dll
-schannel.dll
-schedcli.dll
-scsiport.sys
-secur32.dll
-security.dll
-setupapi.dll
-shcore.dll
-shell32.dll
-shfolder.dll
-shlwapi.dll
-slc.dll
-slcext.dll
-slwga.dll
-snmpapi.dll
-spoolss.dll
-srvcli.dll
-sspicli.dll
-svrapi.dll
-sxs.dll
-t2embed.dll
-tapi32.dll
-tbs.dll
-tdh.dll
-tdi.sys
-txfw32.dll
-ucrtbase.dll
-url.dll
-urlmon.dll
-usbcamd2.sys
-usbcamd.sys
-usbd.sys
-usbport.sys
-user32.dll
-userenv.dll
-usp10.dll
-uxtheme.dll
-vcruntime140_app.dll
-vdmdbg.dll
-version.dll
-videoprt.sys
-virtdisk.dll
-vssapi.dll
-vss_ps.dll
-wdsclientapi.dll
-wdsclient.dll
-wdscore.dll
-wdscsl.dll
-wdsimage.dll
-wdstptc.dll
-wdsupgcompl.dll
-wdsutil.dll
-webauthn.dll
-websocket.dll
-wecapi.dll
-wer.dll
-wevtapi.dll
-wevtfwd.dll
-wiadss.dll
-wimgapi.dll
-win32k.sys
-win32spl.dll
-windowscodecs.dll
-winhttp.dll
-wininet.dll
-winmm.dll
-winscard.dll
-winspool.drv
-winstrm.dll
-wintrust.dll
-winusb.dll
-wkscli.dll
-wlanapi.dll
-wlanui.dll
-wlanutil.dll
-wldap32.dll
-wmilib.sys
-wofutil.dll
-wow32.dll
-ws2_32.dll
-wsdapi.dll
-wsnmp32.dll
-wsock32.dll
-wst.dll
-wtsapi32.dll
-x3daudio1_2.dll
-x3daudio1_3.dll
-x3daudio1_4.dll
-x3daudio1_5.dll
-x3daudio1_6.dll
-x3daudio1_7.dll
-x3daudiod1_7.dll
-xapofx1_0.dll
-xapofx1_1.dll
-xapofx1_2.dll
-xapofx1_3.dll
-xapofx1_4.dll
-xapofx1_5.dll
-xapofxd1_5.dll
-xaudio2_8.dll
-xinput1_1.dll
-xinput1_2.dll
-xinput1_3.dll
-xinput1_4.dll
-xinput9_1_0.dll
diff --git a/standard-dlls-mingw64 b/standard-dlls-mingw64
deleted file mode 100644
index 1242771..0000000
--- a/standard-dlls-mingw64
+++ /dev/null
@@ -1,987 +0,0 @@
-acledit.dll
-aclui.dll
-activeds.dll
-admparse.dll
-admwprox.dll
-adptif.dll
-adsiisex.dll
-adsldpc.dll
-advapi32.dll
-advpack.dll
-agentanm.dll
-aksclass.dll
-alrsvc.dll
-apcups.dll
-api-ms-win-appmodel-runtime-l1-1-0.dll
-api-ms-win-appmodel-runtime-l1-1-1.dll
-api-ms-win-core-com-l1-1-0.dll
-api-ms-win-core-com-l1-1-1.dll
-api-ms-win-core-com-l2-1-1.dll
-api-ms-win-core-com-midlproxystub-l1-1-0.dll
-api-ms-win-core-comm-l1-1-0.dll
-api-ms-win-core-comm-l1-1-1.dll
-api-ms-win-core-comm-l1-1-2.dll
-api-ms-win-core-console-l1-1-0.dll
-api-ms-win-core-console-l1-2-0.dll
-api-ms-win-core-console-l2-1-0.dll
-api-ms-win-core-console-l2-2-0.dll
-api-ms-win-core-console-l3-2-0.dll
-api-ms-win-core-datetime-l1-1-0.dll
-api-ms-win-core-datetime-l1-1-1.dll
-api-ms-win-core-datetime-l1-1-2.dll
-api-ms-win-core-debug-l1-1-0.dll
-api-ms-win-core-debug-l1-1-1.dll
-api-ms-win-core-delayload-l1-1-1.dll
-api-ms-win-core-enclave-l1-1-0.dll
-api-ms-win-core-errorhandling-l1-1-0.dll
-api-ms-win-core-errorhandling-l1-1-1.dll
-api-ms-win-core-errorhandling-l1-1-3.dll
-api-ms-win-core-featurestaging-l1-1-0.dll
-api-ms-win-core-featurestaging-l1-1-1.dll
-api-ms-win-core-fibers-l1-1-1.dll
-api-ms-win-core-fibers-l2-1-1.dll
-api-ms-win-core-file-ansi-l1-1-0.dll
-api-ms-win-core-file-ansi-l2-1-0.dll
-api-ms-win-core-file-fromapp-l1-1-0.dll
-api-ms-win-core-file-l1-1-0.dll
-api-ms-win-core-file-l1-2-1.dll
-api-ms-win-core-file-l1-2-2.dll
-api-ms-win-core-file-l2-1-0.dll
-api-ms-win-core-file-l2-1-1.dll
-api-ms-win-core-file-l2-1-2.dll
-api-ms-win-core-firmware-l1-1-0.dll
-api-ms-win-core-handle-l1-1-0.dll
-api-ms-win-core-heap-l1-2-0.dll
-api-ms-win-core-heap-l2-1-0.dll
-api-ms-win-core-heap-obsolete-l1-1-0.dll
-api-ms-win-core-interlocked-l1-1-0.dll
-api-ms-win-core-interlocked-l1-2-0.dll
-api-ms-win-core-io-l1-1-0.dll
-api-ms-win-core-io-l1-1-1.dll
-api-ms-win-core-kernel32-legacy-ansi-l1-1-0.dll
-api-ms-win-core-kernel32-legacy-l1-1-0.dll
-api-ms-win-core-kernel32-legacy-l1-1-1.dll
-api-ms-win-core-largeinteger-l1-1-0.dll
-api-ms-win-core-libraryloader-l1-2-0.dll
-api-ms-win-core-libraryloader-l1-2-1.dll
-api-ms-win-core-libraryloader-l2-1-0.dll
-api-ms-win-core-localization-ansi-l1-1-0.dll
-api-ms-win-core-localization-l1-2-0.dll
-api-ms-win-core-localization-l1-2-1.dll
-api-ms-win-core-localization-l1-2-2.dll
-api-ms-win-core-localization-l2-1-0.dll
-api-ms-win-core-localization-obsolete-l1-2-0.dll
-api-ms-win-core-memory-l1-1-0.dll
-api-ms-win-core-memory-l1-1-1.dll
-api-ms-win-core-memory-l1-1-2.dll
-api-ms-win-core-memory-l1-1-3.dll
-api-ms-win-core-memory-l1-1-5.dll
-api-ms-win-core-memory-l1-1-6.dll
-api-ms-win-core-memory-l1-1-7.dll
-api-ms-win-core-namedpipe-ansi-l1-1-0.dll
-api-ms-win-core-namedpipe-ansi-l1-1-1.dll
-api-ms-win-core-namedpipe-l1-1-0.dll
-api-ms-win-core-namedpipe-l1-2-1.dll
-api-ms-win-core-namedpipe-l1-2-2.dll
-api-ms-win-core-namespace-ansi-l1-1-0.dll
-api-ms-win-core-namespace-l1-1-0.dll
-api-ms-win-core-normalization-l1-1-0.dll
-api-ms-win-core-path-l1-1-0.dll
-api-ms-win-core-processenvironment-l1-1-0.dll
-api-ms-win-core-processenvironment-l1-2-0.dll
-api-ms-win-core-processthreads-l1-1-0.dll
-api-ms-win-core-processthreads-l1-1-1.dll
-api-ms-win-core-processthreads-l1-1-2.dll
-api-ms-win-core-processthreads-l1-1-3.dll
-api-ms-win-core-processtopology-obsolete-l1-1-0.dll
-api-ms-win-core-profile-l1-1-0.dll
-api-ms-win-core-psapi-ansi-l1-1-0.dll
-api-ms-win-core-psapi-l1-1-0.dll
-api-ms-win-core-psm-appnotify-l1-1-0.dll
-api-ms-win-core-realtime-l1-1-0.dll
-api-ms-win-core-realtime-l1-1-1.dll
-api-ms-win-core-realtime-l1-1-2.dll
-api-ms-win-core-rtlsupport-l1-2-0.dll
-api-ms-win-core-slapi-l1-1-0.dll
-api-ms-win-core-string-l1-1-0.dll
-api-ms-win-core-synch-ansi-l1-1-0.dll
-api-ms-win-core-synch-l1-1-0.dll
-api-ms-win-core-synch-l1-2-0.dll
-api-ms-win-core-synch-l1-2-1.dll
-api-ms-win-core-sysinfo-l1-1-0.dll
-api-ms-win-core-sysinfo-l1-2-0.dll
-api-ms-win-core-sysinfo-l1-2-1.dll
-api-ms-win-core-sysinfo-l1-2-3.dll
-api-ms-win-core-threadpool-l1-2-0.dll
-api-ms-win-core-timezone-l1-1-0.dll
-api-ms-win-core-timezone-l1-1-1.dll
-api-ms-win-core-url-l1-1-0.dll
-api-ms-win-core-util-l1-1-0.dll
-api-ms-win-core-versionansi-l1-1-0.dll
-api-ms-win-core-version-l1-1-0.dll
-api-ms-win-core-version-l1-1-1.dll
-api-ms-win-core-windowsceip-l1-1-0.dll
-api-ms-win-core-windowserrorreporting-l1-1-0.dll
-api-ms-win-core-windowserrorreporting-l1-1-1.dll
-api-ms-win-core-windowserrorreporting-l1-1-2.dll
-api-ms-win-core-winrt-error-l1-1-0.dll
-api-ms-win-core-winrt-error-l1-1-1.dll
-api-ms-win-core-winrt-l1-1-0.dll
-api-ms-win-core-winrt-registration-l1-1-0.dll
-api-ms-win-core-winrt-robuffer-l1-1-0.dll
-api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll
-api-ms-win-core-winrt-string-l1-1-0.dll
-api-ms-win-core-wow64-l1-1-0.dll
-api-ms-win-core-wow64-l1-1-1.dll
-api-ms-win-core-xstate-l2-1-0.dll
-api-ms-win-crt-conio-l1-1-0.dll
-api-ms-win-crt-convert-l1-1-0.dll
-api-ms-win-crt-environment-l1-1-0.dll
-api-ms-win-crt-filesystem-l1-1-0.dll
-api-ms-win-crt-heap-l1-1-0.dll
-api-ms-win-crt-locale-l1-1-0.dll
-api-ms-win-crt-math-l1-1-0.dll
-api-ms-win-crt-multibyte-l1-1-0.dll
-api-ms-win-crt-private-l1-1-0.dll
-api-ms-win-crt-process-l1-1-0.dll
-api-ms-win-crt-runtime-l1-1-0.dll
-api-ms-win-crt-stdio-l1-1-0.dll
-api-ms-win-crt-string-l1-1-0.dll
-api-ms-win-crt-time-l1-1-0.dll
-api-ms-win-crt-utility-l1-1-0.dll
-api-ms-win-devices-config-l1-1-1.dll
-api-ms-win-devices-config-l1-1-2.dll
-api-ms-win-eventing-classicprovider-l1-1-0.dll
-api-ms-win-eventing-consumer-l1-1-0.dll
-api-ms-win-eventing-controller-l1-1-0.dll
-api-ms-win-eventing-legacy-l1-1-0.dll
-api-ms-win-eventing-provider-l1-1-0.dll
-api-ms-win-gaming-deviceinformation-l1-1-0.dll
-api-ms-win-gaming-expandedresources-l1-1-0.dll
-api-ms-win-gaming-tcui-l1-1-0.dll
-api-ms-win-gaming-tcui-l1-1-2.dll
-api-ms-win-gaming-tcui-l1-1-3.dll
-api-ms-win-gaming-tcui-l1-1-4.dll
-api-ms-win-ro-typeresolution-l1-1-0.dll
-api-ms-win-ro-typeresolution-l1-1-1.dll
-api-ms-win-security-base-l1-1-0.dll
-api-ms-win-security-base-l1-2-0.dll
-api-ms-win-security-base-l1-2-1.dll
-api-ms-win-security-cryptoapi-l1-1-0.dll
-api-ms-win-security-isolatedcontainer-l1-1-0.dll
-api-ms-win-security-lsalookup-ansi-l2-1-0.dll
-api-ms-win-security-lsalookup-l2-1-0.dll
-api-ms-win-security-provider-ansi-l1-1-0.dll
-api-ms-win-security-provider-l1-1-0.dll
-api-ms-win-security-sddl-ansi-l1-1-0.dll
-api-ms-win-security-sddl-l1-1-0.dll
-api-ms-win-shcore-obsolete-l1-1-0.dll
-api-ms-win-shcore-stream-winrt-l1-1-0.dll
-apphelp.dll
-appmgmts.dll
-aqueue.dll
-asp.dll
-aspperf.dll
-asycfilt.dll
-atkctrs.dll
-atl.dll
-atmlib.dll
-atrace.dll
-audiosrv.dll
-authz.dll
-autodial.dll
-autodisc.dll
-avicap32.dll
-avifil32.dll
-avrt.dll
-azroles.dll
-basesrv.dll
-batmeter.dll
-batt.dll
-bcrypt.dll
-bluetoothapis.dll
-bootvid.dll
-browser.dll
-bthprops.cpl
-cabinet.dll
-cabview.dll
-cards.dll
-catsrv.dll
-catsrvut.dll
-cdfview.dll
-cdm.dll
-certcli.dll
-cfgbkend.dll
-cfgmgr32.dll
-cimwin32.dll
-cintime.dll
-classpnp.sys
-clbcatq.dll
-clb.dll
-clfsw32.dll
-cliconfg.dll
-clusapi.dll
-cmcfg32.dll
-cmdial32.dll
-cmpbk32.dll
-cmutil.dll
-cnetcfg.dll
-coadmin.dll
-colbact.dll
-comctl32.dll
-comdlg32.dll
-compstui.dll
-computecore.dll
-computenetwork.dll
-computestorage.dll
-comres.dll
-comsetup.dll
-comsnap.dll
-comsvcs.dll
-comuid.dll
-connect.dll
-console.dll
-corpol.dll
-credui.dll
-crypt32.dll
-cryptdlg.dll
-cryptdll.dll
-cryptext.dll
-cryptnet.dll
-cryptsp.dll
-cryptsvc.dll
-cryptui.dll
-cryptxml.dll
-cscapi.dll
-cscdll.dll
-cscui.dll
-csrsrv.dll
-cufat.dll
-d2d1.dll
-d3d10.dll
-d3d11.dll
-d3d12.dll
-d3d8thk.dll
-d3d9.dll
-d3dcompiler_37.dll
-d3dcompiler_38.dll
-d3dcompiler_39.dll
-d3dcompiler_40.dll
-d3dcompiler_41.dll
-d3dcompiler_42.dll
-d3dcompiler_43.dll
-d3dcompiler_46.dll
-d3dcompiler_47.dll
-d3dcompiler.dll
-d3dcsx_46.dll
-d3dcsxd_43.dll
-d3dx10_33.dll
-d3dx10_34.dll
-d3dx10_35.dll
-d3dx10_36.dll
-d3dx10_37.dll
-d3dx10_38.dll
-d3dx10_39.dll
-d3dx10_40.dll
-d3dx10_41.dll
-d3dx10_42.dll
-d3dx10_43.dll
-d3dx11_42.dll
-d3dx11_43.dll
-d3dx9_24.dll
-d3dx9_25.dll
-d3dx9_26.dll
-d3dx9_27.dll
-d3dx9_28.dll
-d3dx9_29.dll
-d3dx9_30.dll
-d3dx9_31.dll
-d3dx9_32.dll
-d3dx9_33.dll
-d3dx9_34.dll
-d3dx9_35.dll
-d3dx9_36.dll
-d3dx9_37.dll
-d3dx9_38.dll
-d3dx9_39.dll
-d3dx9_40.dll
-d3dx9_41.dll
-d3dx9_42.dll
-d3dx9_43.dll
-d3dxof.dll
-davclnt.dll
-dbgeng.dll
-dbghelp.dll
-dbnetlib.dll
-dbnmpntw.dll
-dciman32.dll
-dcomp.dll
-ddraw.dll
-devmgr.dll
-devobj.dll
-devrtl.dll
-dhcpcsvc6.dll
-dhcpcsvc.dll
-dhcpsapi.dll
-digest.dll
-dimsntfy.dll
-dimsroam.dll
-dinput8.dll
-dinput.dll
-diskcopy.dll
-dismapi.dll
-dmconfig.dll
-dmdskmgr.dll
-dmivcitf.dll
-dmutil.dll
-dnsapi.dll
-dnsrslvr.dll
-dpapi.dll
-dpnaddr.dll
-dpnet.dll
-dpnhupnp.dll
-dpnlobby.dll
-dpvoice.dll
-drprov.dll
-ds32gt.dll
-dsauth.dll
-dskquota.dll
-dsound3d.dll
-dsound.dll
-dsprop.dll
-dsquery.dll
-dssec.dll
-dssenh.dll
-dsuiext.dll
-duser.dll
-dwmapi.dll
-dwrite.dll
-dxgi.dll
-dxva2.dll
-eappcfg.dll
-eapphost.dll
-eappprxy.dll
-efsadu.dll
-es.dll
-esent.dll
-esentprf.dll
-eventlog.dll
-evr.dll
-exports.dll
-exprfdll.dll
-exstrace.dll
-fastprox.dll
-faultrep.dll
-fcachdll.dll
-fdeploy.dll
-feclient.dll
-filemgmt.dll
-fldrclnr.dll
-fltlib.dll
-fmifs.dll
-fontsub.dll
-framedyn.dll
-ftpctrs2.dll
-ftpmib.dll
-fwpuclnt.dll
-fxsapi.dll
-fxscfgwz.dll
-fxsdrv.dll
-fxsocm.dll
-fxsperf.dll
-fxsroute.dll
-fxsst.dll
-fxst30.dll
-fxstiff.dll
-fxsui.dll
-fxswzrd.dll
-gamemode.dll
-gdi32.dll
-gdiplus.dll
-genericui.dll
-getuname.dll
-glmf32.dll
-glu32.dll
-gpedit.dll
-gpkcsp.dll
-gptext.dll
-guitrn.dll
-hal.dll
-hbaapi.dll
-hgfs.dll
-hhctrl.ocx
-hidclass.sys
-hid.dll
-hidparse.sys
-hlink.dll
-hmmapi.dll
-hnetcfg.dll
-hnetwiz.dll
-hostmib.dll
-hotplug.dll
-htrn_jis.dll
-httpapi.dll
-httpext.dll
-httpmib.dll
-httpodbc.dll
-htui.dll
-hypertrm.dll
-iashlpr.dll
-iaspolcy.dll
-iassam.dll
-iassvcs.dll
-icaapi.dll
-icfgnt.dll
-icm32.dll
-icmp.dll
-icmui.dll
-icwconn.dll
-icwdl.dll
-icwphbk.dll
-icwutil.dll
-idq.dll
-ieakeng.dll
-iedkcs32.dll
-iernonce.dll
-iesetup.dll
-igmpagnt.dll
-iisadmin.dll
-iiscfg.dll
-iis.dll
-iisprov.dll
-iisrtl.dll
-iisui.dll
-iisutil.dll
-imagehlp.dll
-imedic.dll
-imejpcus.dll
-imeshare.dll
-imeskdic.dll
-imeskdic.dll
-imgutil.dll
-imjp81k.dll
-imjputyc.dll
-imm32.dll
-imsinsnt.dll
-inetcfg.dll
-inetcomm.dll
-inetmib1.dll
-infoadmn.dll
-infocomm.dll
-infoctrs.dll
-infosoft.dll
-initpki.dll
-input.dll
-inseng.dll
-iphlpapi.dll
-ipmontr.dll
-ipnathlp.dll
-iprop.dll
-iprtprio.dll
-iprtrmgr.dll
-ipsecspd.dll
-ipxsap.dll
-irclass.dll
-isapitst.dll
-isatq.dll
-iscomlog.dll
-iscsidsc.dll
-isignup2.dll
-iyuv_32.dll
-jet500.dll
-jsproxy.dll
-kd1394.dll
-kdcom.dll
-kerberos.dll
-kernel32.dll
-keymgr.dll
-ksecdd.sys
-ks.sys
-ksuser.dll
-ktmw32.dll
-linkinfo.dll
-lmmib2.dll
-loadperf.dll
-localspl.dll
-log.dll
-loghours.dll
-lonsint.dll
-lpk.dll
-lprhelp.dll
-lsasrv.dll
-lz32.dll
-mag_hook.dll
-mapi32.dll
-mcastmib.dll
-mcd32.dll
-mcdsrv32.dll
-mchgrcoi.dll
-mciavi32.dll
-mcicda.dll
-mciole32.dll
-mciqtz32.dll
-mciseq.dll
-mciwave.dll
-mdminst.dll
-mf3216.dll
-mfc42.dll
-mfc42u.dll
-mfcore.dll
-mf.dll
-mfplat.dll
-mfplay.dll
-mfreadwrite.dll
-mfsensorgroup.dll
-mgmtapi.dll
-midimap.dll
-migism.dll
-miglibnt.dll
-mlang.dll
-mll_hp.dll
-mll_mtf.dll
-mll_qic.dll
-mmdevapi.dll
-mmfutil.dll
-mmutilse.dll
-mobsync.dll
-modemui.dll
-mofd.dll
-mprapi.dll
-mprddm.dll
-mpr.dll
-mprui.dll
-mqad.dll
-mqcertui.dll
-mqdscli.dll
-mqise.dll
-mqperf.dll
-mqrtdep.dll
-mqrt.dll
-mqsec.dll
-mqupgrd.dll
-mqutil.dll
-msacm32.dll
-msadcs.dll
-msado15.dll
-msafd.dll
-msasn1.dll
-mscat32.dll
-mscms.dll
-msctf.dll
-msdadiag.dll
-msdart.dll
-msdmo.dll
-msdrm.dll
-msdtclog.dll
-msdtcprx.dll
-msdtctm.dll
-msdtcuiu.dll
-msftedit.dll
-msgina.dll
-msgr3en.dll
-msgsvc.dll
-mshtml.dll
-msi.dll
-msimg32.dll
-msimtf.dll
-msir3jp.dll
-msisip.dll
-mslbui.dll
-msls31.dll
-msmqocm.dll
-msobdl.dll
-msobmain.dll
-msoeacct.dll
-msoe.dll
-msoert2.dll
-msoledbsql.dll
-mspatcha.dll
-msports.dll
-msrating.dll
-msrle32.dll
-mssign32.dll
-mssip32.dll
-mstask.dll
-mstlsapi.dll
-msutb.dll
-msv1_0.dll
-msvcirt.dll
-msvcp120_app.dll
-msvcp60.dll
-msvcr100.dll
-msvcr110.dll
-msvcr120_app.dll
-msvcr120d.dll
-msvcr120.dll
-msvcr80.dll
-msvcr90d.dll
-msvcr90.dll
-msvcrt.dll
-msvfw32.dll
-msvidc32.dll
-msw3prt.dll
-mswsock.dll
-msyuv.dll
-mtxclu.dll
-mtxdm.dll
-mtxex.dll
-mtxoci.dll
-mydocs.dll
-ncobjapi.dll
-ncrypt.dll
-ncxp.dll
-nddeapi.dll
-nddenb32.dll
-ndfapi.dll
-ndisnpp.dll
-ndis.sys
-netapi32.dll
-netcfgx.dll
-netid.dll
-netio.sys
-netlogon.dll
-netman.dll
-netoc.dll
-netplwiz.dll
-netrap.dll
-netshell.dll
-netui0.dll
-netui1.dll
-netui2.dll
-newdev.dll
-nntpapi.dll
-normaliz.dll
-npptools.dll
-nshipsec.dll
-ntdll.dll
-ntdsapi.dll
-ntdsbcli.dll
-ntdtcsetup.dll
-ntlanman.dll
-ntlanui.dll
-ntlsapi.dll
-ntmarta.dll
-ntmsapi.dll
-ntoc.dll
-ntoskrnl.exe
-ntprint.dll
-ntshrui.dll
-ntvdm64.dll
-nwprovau.dll
-oakley.dll
-occache.dll
-ocmanage.dll
-ocmsn.dll
-ocsbs.dll
-odbc32.dll
-odbc32gt.dll
-odbcbcp.dll
-odbcconf.dll
-odbccp32.dll
-odbccr32.dll
-odbctrac.dll
-oeimport.dll
-oemiglib.dll
-ole32.dll
-oleacc.dll
-oleaut32.dll
-olecli32.dll
-olecnv32.dll
-oledb32.dll
-oledlg.dll
-olesvr32.dll
-opends60.dll
-opengl32.dll
-osuninst.dll
-p2pcollab.dll
-p2p.dll
-p2pgraph.dll
-pautoenr.dll
-pcwum.dll
-pdh.dll
-perfctrs.dll
-perfdisk.dll
-perfnet.dll
-perfos.dll
-perfproc.dll
-perfts.dll
-photowiz.dll
-pidgen.dll
-policman.dll
-polstore.dll
-powrprof.dll
-printui.dll
-prntvpt.dll
-profmap.dll
-proppage.dll
-propsys.dll
-ps5ui.dll
-psapi.dll
-psbase.dll
-pschdprf.dll
-pscript5.dll
-pstorec.dll
-pstorsvc.dll
-qmgr.dll
-qosname.dll
-quartz.dll
-query.dll
-qutil.dll
-qwave.dll
-rasadhlp.dll
-rasapi32.dll
-rasauto.dll
-raschap.dll
-rasctrs.dll
-rasdlg.dll
-rasman.dll
-rasmans.dll
-rasmontr.dll
-rasmxs.dll
-rasppp.dll
-rasrad.dll
-rassapi.dll
-rasser.dll
-rastapi.dll
-rastls.dll
-rdpcfgex.dll
-rdpsnd.dll
-rdpwsx.dll
-regapi.dll
-regsvc.dll
-resutils.dll
-riched20.dll
-rnr20.dll
-routemsg.dll
-routetab.dll
-rpcdiag.dll
-rpchttp.dll
-rpcns4.dll
-rpcref.dll
-rpcrt4.dll
-rpcss.dll
-rsaenh.dll
-rstrtmgr.dll
-rtm.dll
-rtutils.dll
-samlib.dll
-samsrv.dll
-scarddlg.dll
-sccbase.dll
-scecli.dll
-scesrv.dll
-schannel.dll
-schedsvc.dll
-sclgntfy.dll
-scredir.dll
-script.dll
-scrobj.dll
-scrrun.dll
-sdhcinst.dll
-seclogon.dll
-secur32.dll
-security.dll
-sensapi.dll
-senscfg.dll
-sens.dll
-seo.dll
-serialui.dll
-serwvdrv.dll
-setupapi.dll
-setupqry.dll
-sfc.dll
-sfcfiles.dll
-sfc_os.dll
-sfmapi.dll
-shcore.dll
-shdocvw.dll
-shell32.dll
-shfolder.dll
-shimeng.dll
-shimgvw.dll
-shlwapi.dll
-shscrap.dll
-shsvcs.dll
-sigtab.dll
-sisbkup.dll
-skdll.dll
-slbcsp.dll
-slc.dll
-slcext.dll
-slwga.dll
-smtpapi.dll
-smtpctrs.dll
-snapin.dll
-snmpapi.dll
-snmpelea.dll
-snmpmib.exe
-softpub.dll
-spoolss.dll
-sqlsrv32.dll
-sqlxmlx.dll
-srchctls.dll
-srclient.dll
-srrstr.dll
-srvsvc.dll
-ssdpapi.dll
-ssinc.dll
-sspicli.dll
-staxmem.dll
-sti_ci.dll
-sti.dll
-streamci.dll
-strmfilt.dll
-subauth.dll
-svcpack.dll
-sxs.dll
-synceng.dll
-syncui.dll
-sysinv.dll
-sysmod.dll
-syssetup.dll
-t2embed.dll
-tapi32.dll
-tapiperf.dll
-tbs.dll
-tcpmib.dll
-tdh.dll
-traffic.dll
-tsappcmp.dll
-tsbyuv.dll
-tsd32.dll
-tsoc.dll
-txfw32.dll
-ucrtbase.dll
-ufat.dll
-umandlg.dll
-umdmxfrm.dll
-umpnpmgr.dll
-unidrv.dll
-unidrvui.dll
-uniime.dll
-unimdmat.dll
-uniplat.dll
-untfs.dll
-upnp.dll
-upnpui.dll
-urlauth.dll
-url.dll
-urlmon.dll
-usbcamd2.sys
-usbd.sys
-usbport.sys
-user32.dll
-userenv.dll
-usp10.dll
-utildll.dll
-uxtheme.dll
-vcruntime140_app.dll
-vdsutil.dll
-verifier.dll
-version.dll
-vgx.dll
-virtdisk.dll
-vmx_mode.dll
-vssapi.dll
-w32time.dll
-w32topl.dll
-w3core.dll
-w3ctrs.dll
-w3dt.dll
-w3isapi.dll
-w3ssl.dll
-w3tp.dll
-wab32.dll
-wabimp.dll
-wamreg.dll
-wbemcore.dll
-wbemupgd.dll
-wdigest.dll
-wdmaud.drv
-wdsclientapi.dll
-wdsclient.dll
-wdscore.dll
-wdscsl.dll
-wdsimage.dll
-wdstptc.dll
-wdsupgcompl.dll
-wdsutil.dll
-webauthn.dll
-webcheck.dll
-webclnt.dll
-webhits.dll
-websocket.dll
-wecapi.dll
-wer.dll
-wevtapi.dll
-wevtfwd.dll
-wiadss.dll
-wiarpc.dll
-wiaservc.dll
-wiashext.dll
-wimgapi.dll
-windowscodecs.dll
-winfax.dll
-winhttp.dll
-winhvemulation.dll
-winhvplatform.dll
-wininet.dll
-winipsec.dll
-winmm.dll
-winrnr.dll
-winscard.dll
-winspool.drv
-winsrv.dll
-winsta.dll
-wintrust.dll
-winusb.dll
-wkssvc.dll
-wlanapi.dll
-wlanui.dll
-wlanutil.dll
-wldap32.dll
-wlnotify.dll
-wlstore.dll
-wmi2xml.dll
-wmiaprpl.dll
-wmi.dll
-wmilib.sys
-wmiprop.dll
-wmisvc.dll
-wofutil.dll
-wow64cpu.dll
-wow64.dll
-wow64mib.dll
-wow64win.dll
-wpd_ci.dll
-ws2_32.dll
-ws2help.dll
-wscapi.dll
-wscsvc.dll
-wsdapi.dll
-wshatm.dll
-wshbth.dll
-wslapi.dll
-wsock32.dll
-wtsapi32.dll
-x3daudio1_2.dll
-x3daudio1_3.dll
-x3daudio1_4.dll
-x3daudio1_5.dll
-x3daudio1_6.dll
-x3daudio1_7.dll
-x3daudiod1_7.dll
-xapofx1_0.dll
-xapofx1_1.dll
-xapofx1_2.dll
-xapofx1_3.dll
-xapofx1_4.dll
-xapofx1_5.dll
-xapofxd1_5.dll
-xaudio2_8.dll
-xinput1_1.dll
-xinput1_2.dll
-xinput1_3.dll
-xinput1_4.dll
-xinput9_1_0.dll
-zoneoc.dll
diff --git a/standard-dlls-ucrt64 b/standard-dlls-ucrt64
deleted file mode 100644
index 1242771..0000000
--- a/standard-dlls-ucrt64
+++ /dev/null
@@ -1,987 +0,0 @@
-acledit.dll
-aclui.dll
-activeds.dll
-admparse.dll
-admwprox.dll
-adptif.dll
-adsiisex.dll
-adsldpc.dll
-advapi32.dll
-advpack.dll
-agentanm.dll
-aksclass.dll
-alrsvc.dll
-apcups.dll
-api-ms-win-appmodel-runtime-l1-1-0.dll
-api-ms-win-appmodel-runtime-l1-1-1.dll
-api-ms-win-core-com-l1-1-0.dll
-api-ms-win-core-com-l1-1-1.dll
-api-ms-win-core-com-l2-1-1.dll
-api-ms-win-core-com-midlproxystub-l1-1-0.dll
-api-ms-win-core-comm-l1-1-0.dll
-api-ms-win-core-comm-l1-1-1.dll
-api-ms-win-core-comm-l1-1-2.dll
-api-ms-win-core-console-l1-1-0.dll
-api-ms-win-core-console-l1-2-0.dll
-api-ms-win-core-console-l2-1-0.dll
-api-ms-win-core-console-l2-2-0.dll
-api-ms-win-core-console-l3-2-0.dll
-api-ms-win-core-datetime-l1-1-0.dll
-api-ms-win-core-datetime-l1-1-1.dll
-api-ms-win-core-datetime-l1-1-2.dll
-api-ms-win-core-debug-l1-1-0.dll
-api-ms-win-core-debug-l1-1-1.dll
-api-ms-win-core-delayload-l1-1-1.dll
-api-ms-win-core-enclave-l1-1-0.dll
-api-ms-win-core-errorhandling-l1-1-0.dll
-api-ms-win-core-errorhandling-l1-1-1.dll
-api-ms-win-core-errorhandling-l1-1-3.dll
-api-ms-win-core-featurestaging-l1-1-0.dll
-api-ms-win-core-featurestaging-l1-1-1.dll
-api-ms-win-core-fibers-l1-1-1.dll
-api-ms-win-core-fibers-l2-1-1.dll
-api-ms-win-core-file-ansi-l1-1-0.dll
-api-ms-win-core-file-ansi-l2-1-0.dll
-api-ms-win-core-file-fromapp-l1-1-0.dll
-api-ms-win-core-file-l1-1-0.dll
-api-ms-win-core-file-l1-2-1.dll
-api-ms-win-core-file-l1-2-2.dll
-api-ms-win-core-file-l2-1-0.dll
-api-ms-win-core-file-l2-1-1.dll
-api-ms-win-core-file-l2-1-2.dll
-api-ms-win-core-firmware-l1-1-0.dll
-api-ms-win-core-handle-l1-1-0.dll
-api-ms-win-core-heap-l1-2-0.dll
-api-ms-win-core-heap-l2-1-0.dll
-api-ms-win-core-heap-obsolete-l1-1-0.dll
-api-ms-win-core-interlocked-l1-1-0.dll
-api-ms-win-core-interlocked-l1-2-0.dll
-api-ms-win-core-io-l1-1-0.dll
-api-ms-win-core-io-l1-1-1.dll
-api-ms-win-core-kernel32-legacy-ansi-l1-1-0.dll
-api-ms-win-core-kernel32-legacy-l1-1-0.dll
-api-ms-win-core-kernel32-legacy-l1-1-1.dll
-api-ms-win-core-largeinteger-l1-1-0.dll
-api-ms-win-core-libraryloader-l1-2-0.dll
-api-ms-win-core-libraryloader-l1-2-1.dll
-api-ms-win-core-libraryloader-l2-1-0.dll
-api-ms-win-core-localization-ansi-l1-1-0.dll
-api-ms-win-core-localization-l1-2-0.dll
-api-ms-win-core-localization-l1-2-1.dll
-api-ms-win-core-localization-l1-2-2.dll
-api-ms-win-core-localization-l2-1-0.dll
-api-ms-win-core-localization-obsolete-l1-2-0.dll
-api-ms-win-core-memory-l1-1-0.dll
-api-ms-win-core-memory-l1-1-1.dll
-api-ms-win-core-memory-l1-1-2.dll
-api-ms-win-core-memory-l1-1-3.dll
-api-ms-win-core-memory-l1-1-5.dll
-api-ms-win-core-memory-l1-1-6.dll
-api-ms-win-core-memory-l1-1-7.dll
-api-ms-win-core-namedpipe-ansi-l1-1-0.dll
-api-ms-win-core-namedpipe-ansi-l1-1-1.dll
-api-ms-win-core-namedpipe-l1-1-0.dll
-api-ms-win-core-namedpipe-l1-2-1.dll
-api-ms-win-core-namedpipe-l1-2-2.dll
-api-ms-win-core-namespace-ansi-l1-1-0.dll
-api-ms-win-core-namespace-l1-1-0.dll
-api-ms-win-core-normalization-l1-1-0.dll
-api-ms-win-core-path-l1-1-0.dll
-api-ms-win-core-processenvironment-l1-1-0.dll
-api-ms-win-core-processenvironment-l1-2-0.dll
-api-ms-win-core-processthreads-l1-1-0.dll
-api-ms-win-core-processthreads-l1-1-1.dll
-api-ms-win-core-processthreads-l1-1-2.dll
-api-ms-win-core-processthreads-l1-1-3.dll
-api-ms-win-core-processtopology-obsolete-l1-1-0.dll
-api-ms-win-core-profile-l1-1-0.dll
-api-ms-win-core-psapi-ansi-l1-1-0.dll
-api-ms-win-core-psapi-l1-1-0.dll
-api-ms-win-core-psm-appnotify-l1-1-0.dll
-api-ms-win-core-realtime-l1-1-0.dll
-api-ms-win-core-realtime-l1-1-1.dll
-api-ms-win-core-realtime-l1-1-2.dll
-api-ms-win-core-rtlsupport-l1-2-0.dll
-api-ms-win-core-slapi-l1-1-0.dll
-api-ms-win-core-string-l1-1-0.dll
-api-ms-win-core-synch-ansi-l1-1-0.dll
-api-ms-win-core-synch-l1-1-0.dll
-api-ms-win-core-synch-l1-2-0.dll
-api-ms-win-core-synch-l1-2-1.dll
-api-ms-win-core-sysinfo-l1-1-0.dll
-api-ms-win-core-sysinfo-l1-2-0.dll
-api-ms-win-core-sysinfo-l1-2-1.dll
-api-ms-win-core-sysinfo-l1-2-3.dll
-api-ms-win-core-threadpool-l1-2-0.dll
-api-ms-win-core-timezone-l1-1-0.dll
-api-ms-win-core-timezone-l1-1-1.dll
-api-ms-win-core-url-l1-1-0.dll
-api-ms-win-core-util-l1-1-0.dll
-api-ms-win-core-versionansi-l1-1-0.dll
-api-ms-win-core-version-l1-1-0.dll
-api-ms-win-core-version-l1-1-1.dll
-api-ms-win-core-windowsceip-l1-1-0.dll
-api-ms-win-core-windowserrorreporting-l1-1-0.dll
-api-ms-win-core-windowserrorreporting-l1-1-1.dll
-api-ms-win-core-windowserrorreporting-l1-1-2.dll
-api-ms-win-core-winrt-error-l1-1-0.dll
-api-ms-win-core-winrt-error-l1-1-1.dll
-api-ms-win-core-winrt-l1-1-0.dll
-api-ms-win-core-winrt-registration-l1-1-0.dll
-api-ms-win-core-winrt-robuffer-l1-1-0.dll
-api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll
-api-ms-win-core-winrt-string-l1-1-0.dll
-api-ms-win-core-wow64-l1-1-0.dll
-api-ms-win-core-wow64-l1-1-1.dll
-api-ms-win-core-xstate-l2-1-0.dll
-api-ms-win-crt-conio-l1-1-0.dll
-api-ms-win-crt-convert-l1-1-0.dll
-api-ms-win-crt-environment-l1-1-0.dll
-api-ms-win-crt-filesystem-l1-1-0.dll
-api-ms-win-crt-heap-l1-1-0.dll
-api-ms-win-crt-locale-l1-1-0.dll
-api-ms-win-crt-math-l1-1-0.dll
-api-ms-win-crt-multibyte-l1-1-0.dll
-api-ms-win-crt-private-l1-1-0.dll
-api-ms-win-crt-process-l1-1-0.dll
-api-ms-win-crt-runtime-l1-1-0.dll
-api-ms-win-crt-stdio-l1-1-0.dll
-api-ms-win-crt-string-l1-1-0.dll
-api-ms-win-crt-time-l1-1-0.dll
-api-ms-win-crt-utility-l1-1-0.dll
-api-ms-win-devices-config-l1-1-1.dll
-api-ms-win-devices-config-l1-1-2.dll
-api-ms-win-eventing-classicprovider-l1-1-0.dll
-api-ms-win-eventing-consumer-l1-1-0.dll
-api-ms-win-eventing-controller-l1-1-0.dll
-api-ms-win-eventing-legacy-l1-1-0.dll
-api-ms-win-eventing-provider-l1-1-0.dll
-api-ms-win-gaming-deviceinformation-l1-1-0.dll
-api-ms-win-gaming-expandedresources-l1-1-0.dll
-api-ms-win-gaming-tcui-l1-1-0.dll
-api-ms-win-gaming-tcui-l1-1-2.dll
-api-ms-win-gaming-tcui-l1-1-3.dll
-api-ms-win-gaming-tcui-l1-1-4.dll
-api-ms-win-ro-typeresolution-l1-1-0.dll
-api-ms-win-ro-typeresolution-l1-1-1.dll
-api-ms-win-security-base-l1-1-0.dll
-api-ms-win-security-base-l1-2-0.dll
-api-ms-win-security-base-l1-2-1.dll
-api-ms-win-security-cryptoapi-l1-1-0.dll
-api-ms-win-security-isolatedcontainer-l1-1-0.dll
-api-ms-win-security-lsalookup-ansi-l2-1-0.dll
-api-ms-win-security-lsalookup-l2-1-0.dll
-api-ms-win-security-provider-ansi-l1-1-0.dll
-api-ms-win-security-provider-l1-1-0.dll
-api-ms-win-security-sddl-ansi-l1-1-0.dll
-api-ms-win-security-sddl-l1-1-0.dll
-api-ms-win-shcore-obsolete-l1-1-0.dll
-api-ms-win-shcore-stream-winrt-l1-1-0.dll
-apphelp.dll
-appmgmts.dll
-aqueue.dll
-asp.dll
-aspperf.dll
-asycfilt.dll
-atkctrs.dll
-atl.dll
-atmlib.dll
-atrace.dll
-audiosrv.dll
-authz.dll
-autodial.dll
-autodisc.dll
-avicap32.dll
-avifil32.dll
-avrt.dll
-azroles.dll
-basesrv.dll
-batmeter.dll
-batt.dll
-bcrypt.dll
-bluetoothapis.dll
-bootvid.dll
-browser.dll
-bthprops.cpl
-cabinet.dll
-cabview.dll
-cards.dll
-catsrv.dll
-catsrvut.dll
-cdfview.dll
-cdm.dll
-certcli.dll
-cfgbkend.dll
-cfgmgr32.dll
-cimwin32.dll
-cintime.dll
-classpnp.sys
-clbcatq.dll
-clb.dll
-clfsw32.dll
-cliconfg.dll
-clusapi.dll
-cmcfg32.dll
-cmdial32.dll
-cmpbk32.dll
-cmutil.dll
-cnetcfg.dll
-coadmin.dll
-colbact.dll
-comctl32.dll
-comdlg32.dll
-compstui.dll
-computecore.dll
-computenetwork.dll
-computestorage.dll
-comres.dll
-comsetup.dll
-comsnap.dll
-comsvcs.dll
-comuid.dll
-connect.dll
-console.dll
-corpol.dll
-credui.dll
-crypt32.dll
-cryptdlg.dll
-cryptdll.dll
-cryptext.dll
-cryptnet.dll
-cryptsp.dll
-cryptsvc.dll
-cryptui.dll
-cryptxml.dll
-cscapi.dll
-cscdll.dll
-cscui.dll
-csrsrv.dll
-cufat.dll
-d2d1.dll
-d3d10.dll
-d3d11.dll
-d3d12.dll
-d3d8thk.dll
-d3d9.dll
-d3dcompiler_37.dll
-d3dcompiler_38.dll
-d3dcompiler_39.dll
-d3dcompiler_40.dll
-d3dcompiler_41.dll
-d3dcompiler_42.dll
-d3dcompiler_43.dll
-d3dcompiler_46.dll
-d3dcompiler_47.dll
-d3dcompiler.dll
-d3dcsx_46.dll
-d3dcsxd_43.dll
-d3dx10_33.dll
-d3dx10_34.dll
-d3dx10_35.dll
-d3dx10_36.dll
-d3dx10_37.dll
-d3dx10_38.dll
-d3dx10_39.dll
-d3dx10_40.dll
-d3dx10_41.dll
-d3dx10_42.dll
-d3dx10_43.dll
-d3dx11_42.dll
-d3dx11_43.dll
-d3dx9_24.dll
-d3dx9_25.dll
-d3dx9_26.dll
-d3dx9_27.dll
-d3dx9_28.dll
-d3dx9_29.dll
-d3dx9_30.dll
-d3dx9_31.dll
-d3dx9_32.dll
-d3dx9_33.dll
-d3dx9_34.dll
-d3dx9_35.dll
-d3dx9_36.dll
-d3dx9_37.dll
-d3dx9_38.dll
-d3dx9_39.dll
-d3dx9_40.dll
-d3dx9_41.dll
-d3dx9_42.dll
-d3dx9_43.dll
-d3dxof.dll
-davclnt.dll
-dbgeng.dll
-dbghelp.dll
-dbnetlib.dll
-dbnmpntw.dll
-dciman32.dll
-dcomp.dll
-ddraw.dll
-devmgr.dll
-devobj.dll
-devrtl.dll
-dhcpcsvc6.dll
-dhcpcsvc.dll
-dhcpsapi.dll
-digest.dll
-dimsntfy.dll
-dimsroam.dll
-dinput8.dll
-dinput.dll
-diskcopy.dll
-dismapi.dll
-dmconfig.dll
-dmdskmgr.dll
-dmivcitf.dll
-dmutil.dll
-dnsapi.dll
-dnsrslvr.dll
-dpapi.dll
-dpnaddr.dll
-dpnet.dll
-dpnhupnp.dll
-dpnlobby.dll
-dpvoice.dll
-drprov.dll
-ds32gt.dll
-dsauth.dll
-dskquota.dll
-dsound3d.dll
-dsound.dll
-dsprop.dll
-dsquery.dll
-dssec.dll
-dssenh.dll
-dsuiext.dll
-duser.dll
-dwmapi.dll
-dwrite.dll
-dxgi.dll
-dxva2.dll
-eappcfg.dll
-eapphost.dll
-eappprxy.dll
-efsadu.dll
-es.dll
-esent.dll
-esentprf.dll
-eventlog.dll
-evr.dll
-exports.dll
-exprfdll.dll
-exstrace.dll
-fastprox.dll
-faultrep.dll
-fcachdll.dll
-fdeploy.dll
-feclient.dll
-filemgmt.dll
-fldrclnr.dll
-fltlib.dll
-fmifs.dll
-fontsub.dll
-framedyn.dll
-ftpctrs2.dll
-ftpmib.dll
-fwpuclnt.dll
-fxsapi.dll
-fxscfgwz.dll
-fxsdrv.dll
-fxsocm.dll
-fxsperf.dll
-fxsroute.dll
-fxsst.dll
-fxst30.dll
-fxstiff.dll
-fxsui.dll
-fxswzrd.dll
-gamemode.dll
-gdi32.dll
-gdiplus.dll
-genericui.dll
-getuname.dll
-glmf32.dll
-glu32.dll
-gpedit.dll
-gpkcsp.dll
-gptext.dll
-guitrn.dll
-hal.dll
-hbaapi.dll
-hgfs.dll
-hhctrl.ocx
-hidclass.sys
-hid.dll
-hidparse.sys
-hlink.dll
-hmmapi.dll
-hnetcfg.dll
-hnetwiz.dll
-hostmib.dll
-hotplug.dll
-htrn_jis.dll
-httpapi.dll
-httpext.dll
-httpmib.dll
-httpodbc.dll
-htui.dll
-hypertrm.dll
-iashlpr.dll
-iaspolcy.dll
-iassam.dll
-iassvcs.dll
-icaapi.dll
-icfgnt.dll
-icm32.dll
-icmp.dll
-icmui.dll
-icwconn.dll
-icwdl.dll
-icwphbk.dll
-icwutil.dll
-idq.dll
-ieakeng.dll
-iedkcs32.dll
-iernonce.dll
-iesetup.dll
-igmpagnt.dll
-iisadmin.dll
-iiscfg.dll
-iis.dll
-iisprov.dll
-iisrtl.dll
-iisui.dll
-iisutil.dll
-imagehlp.dll
-imedic.dll
-imejpcus.dll
-imeshare.dll
-imeskdic.dll
-imeskdic.dll
-imgutil.dll
-imjp81k.dll
-imjputyc.dll
-imm32.dll
-imsinsnt.dll
-inetcfg.dll
-inetcomm.dll
-inetmib1.dll
-infoadmn.dll
-infocomm.dll
-infoctrs.dll
-infosoft.dll
-initpki.dll
-input.dll
-inseng.dll
-iphlpapi.dll
-ipmontr.dll
-ipnathlp.dll
-iprop.dll
-iprtprio.dll
-iprtrmgr.dll
-ipsecspd.dll
-ipxsap.dll
-irclass.dll
-isapitst.dll
-isatq.dll
-iscomlog.dll
-iscsidsc.dll
-isignup2.dll
-iyuv_32.dll
-jet500.dll
-jsproxy.dll
-kd1394.dll
-kdcom.dll
-kerberos.dll
-kernel32.dll
-keymgr.dll
-ksecdd.sys
-ks.sys
-ksuser.dll
-ktmw32.dll
-linkinfo.dll
-lmmib2.dll
-loadperf.dll
-localspl.dll
-log.dll
-loghours.dll
-lonsint.dll
-lpk.dll
-lprhelp.dll
-lsasrv.dll
-lz32.dll
-mag_hook.dll
-mapi32.dll
-mcastmib.dll
-mcd32.dll
-mcdsrv32.dll
-mchgrcoi.dll
-mciavi32.dll
-mcicda.dll
-mciole32.dll
-mciqtz32.dll
-mciseq.dll
-mciwave.dll
-mdminst.dll
-mf3216.dll
-mfc42.dll
-mfc42u.dll
-mfcore.dll
-mf.dll
-mfplat.dll
-mfplay.dll
-mfreadwrite.dll
-mfsensorgroup.dll
-mgmtapi.dll
-midimap.dll
-migism.dll
-miglibnt.dll
-mlang.dll
-mll_hp.dll
-mll_mtf.dll
-mll_qic.dll
-mmdevapi.dll
-mmfutil.dll
-mmutilse.dll
-mobsync.dll
-modemui.dll
-mofd.dll
-mprapi.dll
-mprddm.dll
-mpr.dll
-mprui.dll
-mqad.dll
-mqcertui.dll
-mqdscli.dll
-mqise.dll
-mqperf.dll
-mqrtdep.dll
-mqrt.dll
-mqsec.dll
-mqupgrd.dll
-mqutil.dll
-msacm32.dll
-msadcs.dll
-msado15.dll
-msafd.dll
-msasn1.dll
-mscat32.dll
-mscms.dll
-msctf.dll
-msdadiag.dll
-msdart.dll
-msdmo.dll
-msdrm.dll
-msdtclog.dll
-msdtcprx.dll
-msdtctm.dll
-msdtcuiu.dll
-msftedit.dll
-msgina.dll
-msgr3en.dll
-msgsvc.dll
-mshtml.dll
-msi.dll
-msimg32.dll
-msimtf.dll
-msir3jp.dll
-msisip.dll
-mslbui.dll
-msls31.dll
-msmqocm.dll
-msobdl.dll
-msobmain.dll
-msoeacct.dll
-msoe.dll
-msoert2.dll
-msoledbsql.dll
-mspatcha.dll
-msports.dll
-msrating.dll
-msrle32.dll
-mssign32.dll
-mssip32.dll
-mstask.dll
-mstlsapi.dll
-msutb.dll
-msv1_0.dll
-msvcirt.dll
-msvcp120_app.dll
-msvcp60.dll
-msvcr100.dll
-msvcr110.dll
-msvcr120_app.dll
-msvcr120d.dll
-msvcr120.dll
-msvcr80.dll
-msvcr90d.dll
-msvcr90.dll
-msvcrt.dll
-msvfw32.dll
-msvidc32.dll
-msw3prt.dll
-mswsock.dll
-msyuv.dll
-mtxclu.dll
-mtxdm.dll
-mtxex.dll
-mtxoci.dll
-mydocs.dll
-ncobjapi.dll
-ncrypt.dll
-ncxp.dll
-nddeapi.dll
-nddenb32.dll
-ndfapi.dll
-ndisnpp.dll
-ndis.sys
-netapi32.dll
-netcfgx.dll
-netid.dll
-netio.sys
-netlogon.dll
-netman.dll
-netoc.dll
-netplwiz.dll
-netrap.dll
-netshell.dll
-netui0.dll
-netui1.dll
-netui2.dll
-newdev.dll
-nntpapi.dll
-normaliz.dll
-npptools.dll
-nshipsec.dll
-ntdll.dll
-ntdsapi.dll
-ntdsbcli.dll
-ntdtcsetup.dll
-ntlanman.dll
-ntlanui.dll
-ntlsapi.dll
-ntmarta.dll
-ntmsapi.dll
-ntoc.dll
-ntoskrnl.exe
-ntprint.dll
-ntshrui.dll
-ntvdm64.dll
-nwprovau.dll
-oakley.dll
-occache.dll
-ocmanage.dll
-ocmsn.dll
-ocsbs.dll
-odbc32.dll
-odbc32gt.dll
-odbcbcp.dll
-odbcconf.dll
-odbccp32.dll
-odbccr32.dll
-odbctrac.dll
-oeimport.dll
-oemiglib.dll
-ole32.dll
-oleacc.dll
-oleaut32.dll
-olecli32.dll
-olecnv32.dll
-oledb32.dll
-oledlg.dll
-olesvr32.dll
-opends60.dll
-opengl32.dll
-osuninst.dll
-p2pcollab.dll
-p2p.dll
-p2pgraph.dll
-pautoenr.dll
-pcwum.dll
-pdh.dll
-perfctrs.dll
-perfdisk.dll
-perfnet.dll
-perfos.dll
-perfproc.dll
-perfts.dll
-photowiz.dll
-pidgen.dll
-policman.dll
-polstore.dll
-powrprof.dll
-printui.dll
-prntvpt.dll
-profmap.dll
-proppage.dll
-propsys.dll
-ps5ui.dll
-psapi.dll
-psbase.dll
-pschdprf.dll
-pscript5.dll
-pstorec.dll
-pstorsvc.dll
-qmgr.dll
-qosname.dll
-quartz.dll
-query.dll
-qutil.dll
-qwave.dll
-rasadhlp.dll
-rasapi32.dll
-rasauto.dll
-raschap.dll
-rasctrs.dll
-rasdlg.dll
-rasman.dll
-rasmans.dll
-rasmontr.dll
-rasmxs.dll
-rasppp.dll
-rasrad.dll
-rassapi.dll
-rasser.dll
-rastapi.dll
-rastls.dll
-rdpcfgex.dll
-rdpsnd.dll
-rdpwsx.dll
-regapi.dll
-regsvc.dll
-resutils.dll
-riched20.dll
-rnr20.dll
-routemsg.dll
-routetab.dll
-rpcdiag.dll
-rpchttp.dll
-rpcns4.dll
-rpcref.dll
-rpcrt4.dll
-rpcss.dll
-rsaenh.dll
-rstrtmgr.dll
-rtm.dll
-rtutils.dll
-samlib.dll
-samsrv.dll
-scarddlg.dll
-sccbase.dll
-scecli.dll
-scesrv.dll
-schannel.dll
-schedsvc.dll
-sclgntfy.dll
-scredir.dll
-script.dll
-scrobj.dll
-scrrun.dll
-sdhcinst.dll
-seclogon.dll
-secur32.dll
-security.dll
-sensapi.dll
-senscfg.dll
-sens.dll
-seo.dll
-serialui.dll
-serwvdrv.dll
-setupapi.dll
-setupqry.dll
-sfc.dll
-sfcfiles.dll
-sfc_os.dll
-sfmapi.dll
-shcore.dll
-shdocvw.dll
-shell32.dll
-shfolder.dll
-shimeng.dll
-shimgvw.dll
-shlwapi.dll
-shscrap.dll
-shsvcs.dll
-sigtab.dll
-sisbkup.dll
-skdll.dll
-slbcsp.dll
-slc.dll
-slcext.dll
-slwga.dll
-smtpapi.dll
-smtpctrs.dll
-snapin.dll
-snmpapi.dll
-snmpelea.dll
-snmpmib.exe
-softpub.dll
-spoolss.dll
-sqlsrv32.dll
-sqlxmlx.dll
-srchctls.dll
-srclient.dll
-srrstr.dll
-srvsvc.dll
-ssdpapi.dll
-ssinc.dll
-sspicli.dll
-staxmem.dll
-sti_ci.dll
-sti.dll
-streamci.dll
-strmfilt.dll
-subauth.dll
-svcpack.dll
-sxs.dll
-synceng.dll
-syncui.dll
-sysinv.dll
-sysmod.dll
-syssetup.dll
-t2embed.dll
-tapi32.dll
-tapiperf.dll
-tbs.dll
-tcpmib.dll
-tdh.dll
-traffic.dll
-tsappcmp.dll
-tsbyuv.dll
-tsd32.dll
-tsoc.dll
-txfw32.dll
-ucrtbase.dll
-ufat.dll
-umandlg.dll
-umdmxfrm.dll
-umpnpmgr.dll
-unidrv.dll
-unidrvui.dll
-uniime.dll
-unimdmat.dll
-uniplat.dll
-untfs.dll
-upnp.dll
-upnpui.dll
-urlauth.dll
-url.dll
-urlmon.dll
-usbcamd2.sys
-usbd.sys
-usbport.sys
-user32.dll
-userenv.dll
-usp10.dll
-utildll.dll
-uxtheme.dll
-vcruntime140_app.dll
-vdsutil.dll
-verifier.dll
-version.dll
-vgx.dll
-virtdisk.dll
-vmx_mode.dll
-vssapi.dll
-w32time.dll
-w32topl.dll
-w3core.dll
-w3ctrs.dll
-w3dt.dll
-w3isapi.dll
-w3ssl.dll
-w3tp.dll
-wab32.dll
-wabimp.dll
-wamreg.dll
-wbemcore.dll
-wbemupgd.dll
-wdigest.dll
-wdmaud.drv
-wdsclientapi.dll
-wdsclient.dll
-wdscore.dll
-wdscsl.dll
-wdsimage.dll
-wdstptc.dll
-wdsupgcompl.dll
-wdsutil.dll
-webauthn.dll
-webcheck.dll
-webclnt.dll
-webhits.dll
-websocket.dll
-wecapi.dll
-wer.dll
-wevtapi.dll
-wevtfwd.dll
-wiadss.dll
-wiarpc.dll
-wiaservc.dll
-wiashext.dll
-wimgapi.dll
-windowscodecs.dll
-winfax.dll
-winhttp.dll
-winhvemulation.dll
-winhvplatform.dll
-wininet.dll
-winipsec.dll
-winmm.dll
-winrnr.dll
-winscard.dll
-winspool.drv
-winsrv.dll
-winsta.dll
-wintrust.dll
-winusb.dll
-wkssvc.dll
-wlanapi.dll
-wlanui.dll
-wlanutil.dll
-wldap32.dll
-wlnotify.dll
-wlstore.dll
-wmi2xml.dll
-wmiaprpl.dll
-wmi.dll
-wmilib.sys
-wmiprop.dll
-wmisvc.dll
-wofutil.dll
-wow64cpu.dll
-wow64.dll
-wow64mib.dll
-wow64win.dll
-wpd_ci.dll
-ws2_32.dll
-ws2help.dll
-wscapi.dll
-wscsvc.dll
-wsdapi.dll
-wshatm.dll
-wshbth.dll
-wslapi.dll
-wsock32.dll
-wtsapi32.dll
-x3daudio1_2.dll
-x3daudio1_3.dll
-x3daudio1_4.dll
-x3daudio1_5.dll
-x3daudio1_6.dll
-x3daudio1_7.dll
-x3daudiod1_7.dll
-xapofx1_0.dll
-xapofx1_1.dll
-xapofx1_2.dll
-xapofx1_3.dll
-xapofx1_4.dll
-xapofx1_5.dll
-xapofxd1_5.dll
-xaudio2_8.dll
-xinput1_1.dll
-xinput1_2.dll
-xinput1_3.dll
-xinput1_4.dll
-xinput9_1_0.dll
-zoneoc.dll

From 39edc444a35f7fe71cf015f0f7fa3a126b22fc4e Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 4 May 2022 00:42:30 +0200
Subject: [PATCH 57/90] Add README.md

---
 README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..b253320
--- /dev/null
+++ b/README.md
@@ -0,0 +1,18 @@
+Building the MinGW environment
+==============================
+
+Build order:
+
+- mingw-filesystem
+- mingw-binutils
+- mingw-headers (bundle_dummy_pthread_headers=1)
+- mingw-w64-tools
+- mingw-gcc (bootstrap=1, enable_libgomp=0)
+- mingw-crt (bootstrap=1)
+- mingw-crt (bootstrap=0)
+- mingw-filesystem (regenerate standard-dlls-mingw32/64)
+- mingw-gcc (bootstrap=0, enable_libgomp=0)
+- mingw-winpthreads
+- mingw-headers (bundle_dummy_pthread_headers=0)
+- mingw-gcc (bootstrap=0, enable_libgomp=1)
+- mingw-gdb

From 9f6edc6a7a85c5443c05e42e690a3f89c7493441 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 4 May 2022 10:46:54 +0200
Subject: [PATCH 58/90] Update README

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index b253320..681e44d 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,6 @@ Build order:
 - mingw-gcc (bootstrap=1, enable_libgomp=0)
 - mingw-crt (bootstrap=1)
 - mingw-crt (bootstrap=0)
-- mingw-filesystem (regenerate standard-dlls-mingw32/64)
 - mingw-gcc (bootstrap=0, enable_libgomp=0)
 - mingw-winpthreads
 - mingw-headers (bundle_dummy_pthread_headers=0)

From 574812854b92731c57ab237e6dbf0b1248e917c7 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 4 May 2022 16:47:47 +0200
Subject: [PATCH 59/90] Update README

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 681e44d..232a29e 100644
--- a/README.md
+++ b/README.md
@@ -7,11 +7,10 @@ Build order:
 - mingw-binutils
 - mingw-headers (bundle_dummy_pthread_headers=1)
 - mingw-w64-tools
-- mingw-gcc (bootstrap=1, enable_libgomp=0)
+- mingw-gcc (bootstrap=1)
 - mingw-crt (bootstrap=1)
 - mingw-crt (bootstrap=0)
-- mingw-gcc (bootstrap=0, enable_libgomp=0)
 - mingw-winpthreads
 - mingw-headers (bundle_dummy_pthread_headers=0)
-- mingw-gcc (bootstrap=0, enable_libgomp=1)
+- mingw-gcc (bootstrap=0)
 - mingw-gdb

From 7be59393305bc86bfb1251f34a06a57a5ac0a6aa Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 9 May 2022 08:49:16 +0100
Subject: [PATCH 60/90] Include glib-mkenums in the toolchain binaries

---
 mingw-filesystem.spec   | 5 ++++-
 toolchain-mingw32.meson | 1 +
 toolchain-mingw64.meson | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 5455cb7..c1ea4a2 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        136
+Version:        137
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -363,6 +363,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Mon May 09 2022 Richard Hughes <richard@hughsie.com> 137-1
+- Include glib-mkenums in the toolchain binaries to avoid installing host GLib for building.
+
 * Tue May 03 2022 Sandro Mani <manisandro@gmail.com> - 136-1
 - Drop standard DLL provides, moved to mingw-crt
 
diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson
index 99fe91a..563565c 100644
--- a/toolchain-mingw32.meson
+++ b/toolchain-mingw32.meson
@@ -10,6 +10,7 @@ strip = '/usr/bin/i686-w64-mingw32-strip'
 windres = '/usr/bin/i686-w64-mingw32-windres'
 dlltool = '/usr/bin/i686-w64-mingw32-dlltool'
 libgcrypt-config = '/usr/i686-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
+glib-mkenums = '/usr/i686-w64-mingw32/sys-root/mingw/bin/glib-mkenums'
 
 [properties]
 root = '/usr/i686-w64-mingw32/sys-root/mingw'
diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson
index 2f633aa..01d83ee 100644
--- a/toolchain-mingw64.meson
+++ b/toolchain-mingw64.meson
@@ -10,6 +10,7 @@ strip = '/usr/bin/x86_64-w64-mingw32-strip'
 windres = '/usr/bin/x86_64-w64-mingw32-windres'
 dlltool = '/usr/bin/x86_64-w64-mingw32-dlltool'
 libgcrypt-config = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
+glib-mkenums = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/glib-mkenums'
 
 [properties]
 root = '/usr/x86_64-w64-mingw32/sys-root/mingw'

From 508578c74b10c0a9cd860512791567d45f903df0 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 11 May 2022 11:42:42 +0200
Subject: [PATCH 61/90] Drop CMAKE_INSTALL_LIBDIR from mingw-cmake macros

Setting CMAKE_INSTALL_PREFIX is sufficient, lib relative to the CMAKE_INSTALL_PREFIX is default
---
 macros.mingw32        | 1 -
 macros.mingw64        | 1 -
 mingw-filesystem.spec | 5 ++++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 647d868..6caf0a2 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -138,7 +138,6 @@
         -DSYSCONF_INSTALL_DIR:PATH=%{mingw32_sysconfdir} \\\
         -DSHARE_INSTALL_PREFIX:PATH=%{mingw32_datadir} \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{mingw32_prefix} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw32_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW32_CMAKE_ARGS} \\\
         "$@" $__mingw32_topdir
diff --git a/macros.mingw64 b/macros.mingw64
index cecbc56..bf28141 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -138,7 +138,6 @@
         -DSYSCONF_INSTALL_DIR:PATH=%{mingw64_sysconfdir} \\\
         -DSHARE_INSTALL_PREFIX:PATH=%{mingw64_datadir} \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{mingw64_prefix} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw64_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW64_CMAKE_ARGS} \\\
         "$@" $__mingw64_topdir
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index c1ea4a2..03345c3 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        137
+Version:        138
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -363,6 +363,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Wed May 11 2022 Sandro Mani <manisandro@gmail.com> - 138-1
+- Drop CMAKE_INSTALL_LIBDIR from mingw-cmake macros
+
 * Mon May 09 2022 Richard Hughes <richard@hughsie.com> 137-1
 - Include glib-mkenums in the toolchain binaries to avoid installing host GLib for building.
 

From 6dffdd3418e033da5f5945bc1413492869598cab Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 20 May 2022 18:48:41 +0200
Subject: [PATCH 62/90] Set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE in cmake
 toolchain files

---
 mingw-filesystem.spec   | 5 ++++-
 toolchain-mingw32.cmake | 3 ++-
 toolchain-mingw64.cmake | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 03345c3..1c66b2d 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        138
+Version:        139
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -363,6 +363,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Fri May 20 2022 Sandro Mani <manisandro@gmail.com> - 139-1
+- Set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE in cmake toolchain files
+
 * Wed May 11 2022 Sandro Mani <manisandro@gmail.com> - 138-1
 - Drop CMAKE_INSTALL_LIBDIR from mingw-cmake macros
 
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index 36297b5..a450d39 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -17,9 +17,10 @@ SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32/sys-root/mingw)
 
 # search for programs in the build host directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
+# for libraries, headers and packages in the target directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 
 # Make sure Qt can be detected by CMake
 SET(QT_BINARY_DIR /usr/i686-w64-mingw32/bin /usr/bin)
diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake
index 39b0d65..a1e278f 100644
--- a/toolchain-mingw64.cmake
+++ b/toolchain-mingw64.cmake
@@ -17,9 +17,10 @@ SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32/sys-root/mingw)
 
 # search for programs in the build host directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
+# for libraries, headers and packages in the target directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 
 # Make sure Qt can be detected by CMake
 SET(QT_BINARY_DIR /usr/x86_64-w64-mingw32/bin /usr/bin)

From 1688ef84e12d09b2c8917e2910d9fbc5460e6498 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 21:14:17 +0000
Subject: [PATCH 63/90] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 1c66b2d..261a824 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        139
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -363,6 +363,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 139-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri May 20 2022 Sandro Mani <manisandro@gmail.com> - 139-1
 - Set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE in cmake toolchain files
 

From 82f4189ad6c9404aef10fccf28dea70e772c23ab Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 29 Jul 2022 22:26:20 +0200
Subject: [PATCH 64/90] Don't unset _PREFIX in mingw-env macro, it leads to
 ${_PREFIX} being empty when evaluated the lines above

---
 macros.mingw32        | 1 -
 macros.mingw64        | 1 -
 macros.ucrt64         | 1 -
 mingw-filesystem.spec | 8 ++++++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 6caf0a2..e2ecb4e 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -62,7 +62,6 @@
     x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
     declare -x $x="$i" ; export $x; \
   done; \
-  unset _PREFIX; \
   CC="${MINGW32_CC:-%mingw32_cc}"; export CC; \
   CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \
   CPPFLAGS="${MINGW32_CPPFLAGS-%mingw32_cppflags}"; export CPPFLAGS; \
diff --git a/macros.mingw64 b/macros.mingw64
index bf28141..9af606e 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -62,7 +62,6 @@
     x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
     declare -x $x="$i" ; export $x; \
   done; \
-  unset _PREFIX; \
   CC="${MINGW64_CC:-%mingw64_cc}"; export CC; \
   CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \
   CPPFLAGS="${MINGW64_CPPFLAGS-%mingw64_cppflags}"; export CPPFLAGS; \
diff --git a/macros.ucrt64 b/macros.ucrt64
index acbde9e..314dc3d 100644
--- a/macros.ucrt64
+++ b/macros.ucrt64
@@ -61,7 +61,6 @@
     x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
     declare -x $x="$i" ; export $x; \
   done; \
-  unset _PREFIX; \
   CC="${UCRT64_CC:-%ucrt64_cc}"; export CC; \
   CFLAGS="${UCRT64_CFLAGS-%ucrt64_cflags}"; export CFLAGS; \
   CPPFLAGS="${UCRT64_CPPFLAGS-%ucrt64_cppflags}"; export CPPFLAGS; \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 261a824..9f8f271 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        139
-Release:        2%{?dist}
+Version:        140
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -363,6 +363,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Fri Jul 29 2022 Sandro Mani <manisandro@gmail.com> - 140-1
+- Don't unset _PREFIX in mingw-env macro, it leads to ${_PREFIX}
+  being empty when evaluated the lines above
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 139-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 28d3d2b73df3e553c41d995c1e3b0355face1d2e Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sat, 30 Jul 2022 08:48:33 +0200
Subject: [PATCH 65/90] Revert unsetting _PREFIX

---
 macros.mingw32        | 1 +
 macros.mingw64        | 1 +
 macros.ucrt64         | 1 +
 mingw-filesystem.spec | 5 ++++-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/macros.mingw32 b/macros.mingw32
index e2ecb4e..6caf0a2 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -62,6 +62,7 @@
     x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
     declare -x $x="$i" ; export $x; \
   done; \
+  unset _PREFIX; \
   CC="${MINGW32_CC:-%mingw32_cc}"; export CC; \
   CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \
   CPPFLAGS="${MINGW32_CPPFLAGS-%mingw32_cppflags}"; export CPPFLAGS; \
diff --git a/macros.mingw64 b/macros.mingw64
index 9af606e..bf28141 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -62,6 +62,7 @@
     x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
     declare -x $x="$i" ; export $x; \
   done; \
+  unset _PREFIX; \
   CC="${MINGW64_CC:-%mingw64_cc}"; export CC; \
   CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \
   CPPFLAGS="${MINGW64_CPPFLAGS-%mingw64_cppflags}"; export CPPFLAGS; \
diff --git a/macros.ucrt64 b/macros.ucrt64
index 314dc3d..acbde9e 100644
--- a/macros.ucrt64
+++ b/macros.ucrt64
@@ -61,6 +61,7 @@
     x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
     declare -x $x="$i" ; export $x; \
   done; \
+  unset _PREFIX; \
   CC="${UCRT64_CC:-%ucrt64_cc}"; export CC; \
   CFLAGS="${UCRT64_CFLAGS-%ucrt64_cflags}"; export CFLAGS; \
   CPPFLAGS="${UCRT64_CPPFLAGS-%ucrt64_cppflags}"; export CPPFLAGS; \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 9f8f271..732c90f 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        140
+Version:        141
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -363,6 +363,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Sat Jul 30 2022 Sandro Mani <manisandro@gmail.com> - 141-1
+- Revert unsetting _PREFIX
+
 * Fri Jul 29 2022 Sandro Mani <manisandro@gmail.com> - 140-1
 - Don't unset _PREFIX in mingw-env macro, it leads to ${_PREFIX}
   being empty when evaluated the lines above

From 2bf83196058831b64c32cbb54057e4cadcccd9a2 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 6 Oct 2022 08:51:53 +0200
Subject: [PATCH 66/90] Replace egrep with grep -E

---
 macros.mingw32          | 2 +-
 macros.mingw64          | 2 +-
 macros.ucrt64           | 2 +-
 mingw-filesystem.spec   | 7 +++++--
 mingw-find-debuginfo.sh | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 6caf0a2..1f5d360 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -50,7 +50,7 @@
 %mingw32_windmc          %{mingw32_target}-windmc
 %mingw32_windres         %{mingw32_target}-windres
 
-%mingw32_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
+%mingw32_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
   if test -z "$PATH_ORIG" ; then \
     PATH_ORIG="$PATH"; export PATH_ORIG; \
   fi; \
diff --git a/macros.mingw64 b/macros.mingw64
index bf28141..d5c16cc 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -50,7 +50,7 @@
 %mingw64_windmc          %{mingw64_target}-windmc
 %mingw64_windres         %{mingw64_target}-windres
 
-%mingw64_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
+%mingw64_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
   if test -z "$PATH_ORIG" ; then \
     PATH_ORIG="$PATH"; export PATH_ORIG; \
   fi; \
diff --git a/macros.ucrt64 b/macros.ucrt64
index acbde9e..28e13dc 100644
--- a/macros.ucrt64
+++ b/macros.ucrt64
@@ -49,7 +49,7 @@
 %ucrt64_windmc          %{ucrt64_target}-windmc
 %ucrt64_windres         %{ucrt64_target}-windres
 
-%ucrt64_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
+%ucrt64_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
   if test -z "$PATH_ORIG" ; then \
     PATH_ORIG="$PATH"; export PATH_ORIG; \
   fi; \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 732c90f..fe483e9 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        141
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -245,7 +245,7 @@ cat %{SOURCE101} | grep -v "^#" | grep -v "^$" | while read loc ; do
     fi
     # If the locale is not official and not special, skip it
     if [ -z "$special" ]; then
-        egrep -q "[[:space:]]${locale%%_*}[[:space:]]" %{buildroot}/iso_639.tab || continue
+        grep -Eq "[[:space:]]${locale%%_*}[[:space:]]" %{buildroot}/iso_639.tab || continue
     fi
     echo "%lang(${locale}) %{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw32
     echo "%lang(${locale}) %{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw64
@@ -363,6 +363,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Tue Sep 27 2022 Sandro Mani <manisandro@gmail.com> - 141-2
+- Replace egrep with grep -E
+
 * Sat Jul 30 2022 Sandro Mani <manisandro@gmail.com> - 141-1
 - Revert unsetting _PREFIX
 
diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
index 317749a..a7c6a98 100755
--- a/mingw-find-debuginfo.sh
+++ b/mingw-find-debuginfo.sh
@@ -12,7 +12,7 @@ shift
 
 for f in `find $RPM_BUILD_ROOT -type f -name "*.exe" -or -name "*.dll" -or -name "*.pyd"`
 do
-	case $(mingw-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
+	case $(mingw-objdump -h $f 2>/dev/null | grep -Eo '(debug[\.a-z_]*|gnu.version)') in
 	    *debuglink*) continue ;;
 	    *debug*) ;;
 	    *gnu.version*)

From de21385695148a980c81d68396ffc883988fce74 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 18 Oct 2022 14:02:48 +0200
Subject: [PATCH 67/90] Require mingw-binutils-generic

---
 mingw-filesystem.spec | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index fe483e9..1f98d81 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -1,3 +1,6 @@
+# Define before mingw-binutils is build
+%bcond_with bootstrap
+
 %global debug_package %{nil}
 
 # Place RPM macros in %%{_rpmconfigdir}/macros.d if it exists (RPM 4.11+)
@@ -6,8 +9,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        141
-Release:        2%{?dist}
+Version:        142
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -90,6 +93,9 @@ Requires:       %{name}-base = %{version}-%{release}
 Conflicts:      mingw32-pkg-config < 0.28-17
 Obsoletes:      mingw32-pkg-config < 0.28-17
 Provides:       mingw32-pkg-config = 0.28-17
+%if %{without bootstrap}
+Requires:       mingw-binutils-generic
+%endif
 
 %description -n mingw32-filesystem
 This package contains the base filesystem layout, RPM macros and
@@ -107,7 +113,9 @@ Requires:       %{name}-base = %{version}-%{release}
 Conflicts:      mingw64-pkg-config < 0.28-17
 Obsoletes:      mingw64-pkg-config < 0.28-17
 Provides:       mingw64-pkg-config = 0.28-17
-
+%if %{without bootstrap}
+Requires:       mingw-binutils-generic
+%endif
 
 %description -n mingw64-filesystem
 This package contains the base filesystem layout, RPM macros and
@@ -117,6 +125,7 @@ This environment is maintained by the Fedora MinGW SIG at:
 
   http://fedoraproject.org/wiki/SIGs/MinGW
 
+
 %package -n ucrt64-filesystem
 Summary:        MinGW cross compiler base filesystem and environment for the win64 UCRT target
 Requires:       %{name}-base = %{version}-%{release}
@@ -124,7 +133,9 @@ Requires:       %{name}-base = %{version}-%{release}
 Conflicts:      ucrt64-pkg-config < 0.28-17
 Obsoletes:      ucrt64-pkg-config < 0.28-17
 Provides:       ucrt64-pkg-config = 0.28-17
-
+%if %{without bootstrap}
+Requires:       mingw-binutils-generic
+%endif
 
 %description -n ucrt64-filesystem
 This package contains the base filesystem layout, RPM macros and
@@ -363,6 +374,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Tue Oct 18 2022 Sandro Mani <manisandro@gmail.com> - 142-1
+- Require mingw-binutils-generic
+
 * Tue Sep 27 2022 Sandro Mani <manisandro@gmail.com> - 141-2
 - Replace egrep with grep -E
 

From 404594a9fc8ccf999b468c39f9e631501bdba36e Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 18 Nov 2022 22:09:17 +0100
Subject: [PATCH 68/90] Use SPDX license tag

---
 mingw-filesystem.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 1f98d81..3b7986d 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -13,7 +13,7 @@ Version:        142
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
-License:        GPLv2+
+License:        GPL-2.0-or-later
 URL:            http://fedoraproject.org/wiki/MinGW
 BuildArch:      noarch
 
@@ -219,6 +219,8 @@ for target in i686-w64-mingw32 x86_64-w64-mingw32 x86_64-w64-mingw32ucrt; do
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/locale
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/pkgconfig
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/xml
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/icons
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/metainfo
 
   mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/$target
 done

From 846156c1bda9bcff98c850714fa5da688a55e66a Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 9 Dec 2022 12:28:47 +0100
Subject: [PATCH 69/90] Prevent mingw-find-lang.sh from clobbering previous
 find-lang results

---
 mingw-filesystem.spec |  5 ++++-
 mingw-find-lang.sh    | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 3b7986d..5768418 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -9,7 +9,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        142
+Version:        143
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -376,6 +376,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Fri Dec 09 2022 Sandro Mani <manisandro@gmail.com> - 143-1
+- Prevent mingw-find-lang.sh from clobbering previous find-lang results
+
 * Tue Oct 18 2022 Sandro Mani <manisandro@gmail.com> - 142-1
 - Require mingw-binutils-generic
 
diff --git a/mingw-find-lang.sh b/mingw-find-lang.sh
index 097fc21..55b9adb 100755
--- a/mingw-find-lang.sh
+++ b/mingw-find-lang.sh
@@ -2,16 +2,22 @@
 
 # Wrapper for the %find_lang macro which splits out the various translations in per-target lists
 
+PACKAGE_NAME=$2
+
+# If previous result from native find-lang exists, filter mingw entries and move it out of the way
+test -f ${PACKAGE_NAME}.lang && grep -v mingw32 ${PACKAGE_NAME}.lang > ${PACKAGE_NAME}-native.lang
+
 /usr/lib/rpm/find-lang.sh $*
+
 if test $? != 0 ; then
+    test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang
     exit 1
 fi
 
-PACKAGE_NAME=$2
 targets=`rpm --eval '%{mingw_build_targets}'`
 for target in $targets; do
 	prefix=`rpm --eval "%{${target}_prefix}"`
-	cat $2.lang | grep "$prefix" > ${target}-$PACKAGE_NAME.lang
+	cat ${PACKAGE_NAME}.lang | grep "$prefix" > ${target}-$PACKAGE_NAME.lang
 done
 
-exit 0
+test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang

From feac8b009723eedb69b4bdca2437eb759a1b3143 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 28 Dec 2022 19:27:22 +0100
Subject: [PATCH 70/90] Add mingw-qmake-qt6 macros, drop mingw-cmake-kde4
 macros

---
 macros.mingw          | 49 +++++++++++++++++++++++--------------------
 macros.mingw32        |  6 ++----
 macros.mingw64        |  6 ++----
 mingw-filesystem.spec |  5 ++++-
 4 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/macros.mingw b/macros.mingw
index bd0f635..36f9d45 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -100,29 +100,6 @@ popd                                                   \
 }                                                      \
 run_mingw_cmake
 
-%mingw_cmake_kde4                                      \
-run_mingw_cmake_kde4()                                 \
-{                                                      \
-%if 0%{?mingw_build_win32} == 1                        \
-mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw32_cmake_kde4 "$@"}                        \
-popd                                                   \
-%endif                                                 \
-%if 0%{?mingw_build_win64} == 1                        \
-mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
-pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw64_cmake_kde4 "$@"}                        \
-popd                                                   \
-%endif                                                 \
-%if 0%{?mingw_build_ucrt64} == 1                       \
-mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
-pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
-    %{?ucrt64_cmake_kde4 "$@"}                         \
-popd                                                   \
-%endif                                                 \
-}                                                      \
-run_mingw_cmake_kde4
 
 %mingw_qmake_qt5                                       \
 run_mingw_qmake_qt5()                                  \
@@ -148,6 +125,32 @@ popd                                                   \
 }                                                      \
 run_mingw_qmake_qt5
 
+
+%mingw_qmake_qt6                                       \
+run_mingw_qmake_qt6()                                  \
+{                                                      \
+%if 0%{?mingw_build_win32} == 1                        \
+mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
+pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
+    %{?mingw32_qmake_qt6} "$@"                         \
+popd                                                   \
+%endif                                                 \
+%if 0%{?mingw_build_win64} == 1                        \
+mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
+pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
+    %{?mingw64_qmake_qt6} "$@"                         \
+popd                                                   \
+%endif                                                 \
+%if 0%{?mingw_build_ucrt64} == 1                       \
+mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
+    %{?ucrt64_qmake_qt6} "$@"                          \
+popd                                                   \
+%endif                                                 \
+}                                                      \
+run_mingw_qmake_qt6
+
+
 %mingw_meson                                           \
 run_mingw_meson()                                      \
 {                                                      \
diff --git a/macros.mingw32 b/macros.mingw32
index 1f5d360..6f95b75 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -146,12 +146,10 @@
   MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir} ${MINGW32_CMAKE_ARGS}" \
   %mingw32_cmake_generic
 
-%mingw32_cmake_kde4 \
-  MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}/kde4 ${MINGW32_CMAKE_ARGS}" \
-  %mingw32_cmake_generic
-
 %mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
 
+%mingw32_qmake_qt6 /usr/bin/%{mingw32_target}-qmake-qt6
+
 %mingw32_meson %{mingw32_env} ; \
   unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
   CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \\\
diff --git a/macros.mingw64 b/macros.mingw64
index d5c16cc..17c0711 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -146,12 +146,10 @@
   MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir} ${MINGW64_CMAKE_ARGS}" \
   %mingw64_cmake_generic
 
-%mingw64_cmake_kde4 \
-  MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}/kde4 ${MINGW64_CMAKE_ARGS}" \
-  %mingw64_cmake_generic
-
 %mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
 
+%mingw64_qmake_qt6 /usr/bin/%{mingw64_target}-qmake-qt6
+
 %mingw64_meson %{mingw64_env} ; \
   unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
   CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 5768418..557b4bb 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -9,7 +9,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        143
+Version:        144
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -376,6 +376,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Fri Dec 23 2022 Sandro Mani <manisandro@gmail.com> - 144-1
+- Add mingw-qmake-qt6 macros, drop mingw-cmake-kde4 macros
+
 * Fri Dec 09 2022 Sandro Mani <manisandro@gmail.com> - 143-1
 - Prevent mingw-find-lang.sh from clobbering previous find-lang results
 

From d897e0bb98731e5536c551be2cf401f1ced71138 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sat, 31 Dec 2022 13:39:47 +0100
Subject: [PATCH 71/90] Fix mingw-find-lang.sh exit code

---
 mingw-filesystem.spec | 5 ++++-
 mingw-find-lang.sh    | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 557b4bb..0de0c45 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -9,7 +9,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        144
+Version:        145
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -376,6 +376,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Sat Dec 31 2022 Sandro Mani <manisandro@gmail.com> - 145-1
+- Fix mingw-find-lang.sh exit code
+
 * Fri Dec 23 2022 Sandro Mani <manisandro@gmail.com> - 144-1
 - Add mingw-qmake-qt6 macros, drop mingw-cmake-kde4 macros
 
diff --git a/mingw-find-lang.sh b/mingw-find-lang.sh
index 55b9adb..81421fd 100755
--- a/mingw-find-lang.sh
+++ b/mingw-find-lang.sh
@@ -21,3 +21,4 @@ for target in $targets; do
 done
 
 test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang
+exit 0

From a34e458d5e18bb5d1cd0e1c9ce62eda1e1f7b291 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 19:38:45 +0000
Subject: [PATCH 72/90] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 0de0c45..2e44241 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        145
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -376,6 +376,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 145-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Sat Dec 31 2022 Sandro Mani <manisandro@gmail.com> - 145-1
 - Fix mingw-find-lang.sh exit code
 

From b8c708695e95853ef106a2b4d288a8964e19a112 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 6 Apr 2023 09:19:51 +0200
Subject: [PATCH 73/90] Set RUSTFLAGS in mingw env

---
 macros.mingw32        | 2 ++
 macros.mingw64        | 2 ++
 mingw-filesystem.spec | 7 +++++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 6f95b75..250675c 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -27,6 +27,7 @@
 %mingw32_cppflags        %{nil}
 %mingw32_fflags          -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw32_ldflags         -fstack-protector -lssp
+%mingw32_rustflags       -Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cforce-frame-pointers=yes --cap-lints=warn
 
 %mingw32_cc              %{mingw32_target}-gcc
 %mingw32_cxx             %{mingw32_target}-g++
@@ -77,6 +78,7 @@
   FFLAGS="${MINGW32_FFLAGS-%mingw32_fflags}"; export FFLAGS; \
   FCFLAGS="${MINGW32_FCFLAGS-%mingw32_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \
+  RUSTFLAGS="${MINGW32_RUSTFLAGS:-%mingw32_rustflags}"; export RUSTFLAGS; \
   for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \
     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
     declare -x $x="$i" ; export $x; \
diff --git a/macros.mingw64 b/macros.mingw64
index 17c0711..493024d 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -27,6 +27,7 @@
 %mingw64_cppflags        %{nil}
 %mingw64_fflags          -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw64_ldflags         -fstack-protector -lssp
+%mingw64_rustflags       -Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cforce-frame-pointers=yes --cap-lints=warn
 
 %mingw64_cc              %{mingw64_target}-gcc
 %mingw64_cxx             %{mingw64_target}-g++
@@ -77,6 +78,7 @@
   FFLAGS="${MINGW64_FFLAGS-%mingw64_fflags}"; export FFLAGS; \
   FCFLAGS="${MINGW64_FCFLAGS-%mingw64_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \
+  RUSTFLAGS="${MINGW64_RUSTFLAGS:-%mingw64_rustflags}"; export RUSTFLAGS; \
   for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \
     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
     declare -x $x="$i" ; export $x; \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 2e44241..45bc922 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -9,8 +9,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        145
-Release:        2%{?dist}
+Version:        146
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -376,6 +376,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Wed Apr 05 2023 Sandro Mani <manisandro@gmail.com> - 146-1
+- Set RUSTFLAGS in mingw env
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 145-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 8f58baf75ca391595dad9058b3b9d55b3b719fc0 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 7 Apr 2023 12:01:24 +0200
Subject: [PATCH 74/90] Set mingw_env before in run_mingw_make

---
 macros.mingw          | 3 +++
 mingw-filesystem.spec | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/macros.mingw b/macros.mingw
index 36f9d45..6118c46 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -65,12 +65,15 @@ run_mingw_configure
 run_mingw_make()                                                    \
 {                                                                   \
 %if 0%{?mingw_build_win32} == 1                                     \
+%{mingw32_env}                                                      \
 %{__make} -C build_win32$MINGW_BUILDDIR_SUFFIX "$@" $MINGW32_MAKE_ARGS   \
 %endif                                                              \
 %if 0%{?mingw_build_win64} == 1                                     \
+%{mingw64_env}                                                      \
 %{__make} -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_MAKE_ARGS   \
 %endif                                                              \
 %if 0%{?mingw_build_ucrt64} == 1                                    \
+%{ucrt64_env}                                                       \
 %{__make} -C build_ucrt64$MINGW_BUILDDIR_SUFFIX "$@" $UCRT64_MAKE_ARGS   \
 %endif                                                              \
 }                                                                   \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 45bc922..e671eed 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -9,7 +9,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        146
+Version:        147
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -376,6 +376,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Fri Apr 07 2023 Sandro Mani <manisandro@gmail.com> - 147-1
+- Set mingw_env before in run_mingw_make
+
 * Wed Apr 05 2023 Sandro Mani <manisandro@gmail.com> - 146-1
 - Set RUSTFLAGS in mingw env
 

From 1bf07da010eea5d927e9c591b4290057e5855e84 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 14:33:28 +0000
Subject: [PATCH 75/90] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index e671eed..d49ec63 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        147
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -376,6 +376,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 147-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Fri Apr 07 2023 Sandro Mani <manisandro@gmail.com> - 147-1
 - Set mingw_env before in run_mingw_make
 

From 88d6e607ff5e2bd68420bd5bc860ac825af93b8c Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Mon, 11 Sep 2023 19:16:42 -0400
Subject: [PATCH 76/90] Add dependency on cmake-rpm-macros

---
 mingw-filesystem.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index d49ec63..325da3c 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        147
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -68,6 +68,8 @@ This environment is maintained by the Fedora MinGW SIG at:
 %package base
 Summary:        Generic files which are needed for {mingw32,mingw64,ucrt64}-filesystem
 
+# We need this for cmake macros
+Requires:       cmake-rpm-macros
 Requires:       redhat-rpm-config
 # Obsolete the packages from the test repo
 Obsoletes:      cross-filesystem < 67-2
@@ -376,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Mon Sep 11 2023 Neal Gompa <ngompa@fedoraproject.org> - 147-3
+- Add dependency on cmake-rpm-macros
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 147-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From df0ee64736a0f86bf80cb78eec020b77f27a68ab Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sat, 6 May 2023 09:12:38 -0600
Subject: [PATCH 77/90] Add pkgconfig provides for installed pkgconfig files

For example:
  * Provides: mingw32-pkgconfig(qt5svg)
  * Provides: mingw64-pkgconfig(qt5svg)
---
 mingw-filesystem.spec |  7 +++++--
 mingw.prov            | 10 ++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 325da3c..cb8a240 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -9,8 +9,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        147
-Release:        3%{?dist}
+Version:        148
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Wed Sep 13 2023 Orion Poplawski <orion@nwra.com> - 148-1
+- Add pkgconfig provides
+
 * Mon Sep 11 2023 Neal Gompa <ngompa@fedoraproject.org> - 147-3
 - Add dependency on cmake-rpm-macros
 
diff --git a/mingw.prov b/mingw.prov
index b877e16..1ce2ace 100755
--- a/mingw.prov
+++ b/mingw.prov
@@ -21,4 +21,14 @@ for f in $dlls; do
     done
 done
 
+pcs=$(echo $filelist | tr '[:blank:]' '\n' | grep '\.pc$')
+
+for f in $pcs; do
+    basename=`basename $f .pc | tr '[:upper:]' '[:lower:]'`
+    for target in $targets; do
+        host_triplet=`rpm --eval "%{${target}_target}"`
+        [[ $f =~ .*$host_triplet.* ]] && echo "${target}-pkgconfig($basename)"
+    done
+done
+
 exit 0

From 2453ef048d0a98802b5971bfcd79322aab20856e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 07:36:27 +0000
Subject: [PATCH 78/90] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index cb8a240..77a11e1 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        148
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 148-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Sep 13 2023 Orion Poplawski <orion@nwra.com> - 148-1
 - Add pkgconfig provides
 

From c5baad7c9b4a51da7f7ed977bc97043db9dee5ed Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 06:29:46 +0000
Subject: [PATCH 79/90] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 77a11e1..f13a80e 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        148
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 148-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 148-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From e61f901d1148e879c8e085a82873ba5010e6c842 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 6 Jun 2024 20:23:48 +0200
Subject: [PATCH 80/90] Set __debug_package 1 in %mingw_debug_package

---
 macros.mingw          | 1 +
 mingw-filesystem.spec | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/macros.mingw b/macros.mingw
index 6118c46..d82abb3 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -17,6 +17,7 @@
 %mingw_debug_install_post   %{mingw_finddebuginfo} %{_builddir}/%{?buildsubdir} %{mingw_build_targets}
 
 %mingw_debug_package               \
+%global __debug_package 1          \
 %if 0%{?mingw_build_win32} == 1    \
 %{?mingw32_debug_package}          \
 %endif                             \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index f13a80e..6e8499b 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        148
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu Jun 06 2024 Sandro Mani <manisandro@gmail.com> - 148-4
+- Set __debug_package 1 in %mingw_debug_package (#2284193)
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 148-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From b27ab1cc12d1e76eb5e255cdb0fe9bf179636b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 12 Jun 2024 12:36:18 +0400
Subject: [PATCH 81/90] toolchain-mingw.meson: fix "Please do not put -C
 linker=" Rust warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Drop linker=, let meson guess the associated C linker instead.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 toolchain-mingw32.meson | 2 +-
 toolchain-mingw64.meson | 2 +-
 toolchain-ucrt64.meson  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson
index 563565c..377dbac 100644
--- a/toolchain-mingw32.meson
+++ b/toolchain-mingw32.meson
@@ -2,7 +2,7 @@
 c = 'i686-w64-mingw32-gcc'
 cpp = 'i686-w64-mingw32-g++'
 fortran = 'i686-w64-mingw32-gfortran'
-rust = ['rustc', '--target', 'i686-pc-windows-msvc', '-C', 'linker=/usr/bin/i686-w64-mingw32-gcc']
+rust = ['rustc', '--target', 'i686-pc-windows-msvc']
 ar = '/usr/bin/i686-w64-mingw32-ar'
 pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson
index 01d83ee..64ee74a 100644
--- a/toolchain-mingw64.meson
+++ b/toolchain-mingw64.meson
@@ -2,7 +2,7 @@
 c = 'x86_64-w64-mingw32-gcc'
 cpp = 'x86_64-w64-mingw32-g++'
 fortran = 'x86_64-w64-mingw32-gfortran'
-rust = ['rustc', '--target', 'x86_64-pc-windows-msvc', '-C', 'linker=/usr/bin/x86_64-w64-mingw32-gcc']
+rust = ['rustc', '--target', 'x86_64-pc-windows-msvc']
 ar = '/usr/bin/x86_64-w64-mingw32-ar'
 pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
diff --git a/toolchain-ucrt64.meson b/toolchain-ucrt64.meson
index 8eb172b..0bc527f 100644
--- a/toolchain-ucrt64.meson
+++ b/toolchain-ucrt64.meson
@@ -2,7 +2,7 @@
 c = 'x86_64-w64-mingw32ucrt-gcc'
 cpp = 'x86_64-w64-mingw32ucrt-g++'
 fortran = 'x86_64-w64-mingw32ucrt-gfortran'
-rust = ['rustc', '--target', 'x86_64-pc-windows-msvc', '-C', 'linker=/usr/bin/x86_64-w64-mingw32ucrt-gcc']
+rust = ['rustc', '--target', 'x86_64-pc-windows-msvc']
 ar = '/usr/bin/x86_64-w64-mingw32ucrt-ar'
 pkgconfig = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32ucrt-ranlib'

From 4776ff00230bb119c0143050ce3a6af6b08ae176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 12 Jun 2024 13:03:51 +0400
Subject: [PATCH 82/90] toolchain-mingw.meson: use GNU toolchain, not MSVC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MSVC: unlikely to work :)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 toolchain-mingw32.meson | 2 +-
 toolchain-mingw64.meson | 2 +-
 toolchain-ucrt64.meson  | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson
index 377dbac..9fc288e 100644
--- a/toolchain-mingw32.meson
+++ b/toolchain-mingw32.meson
@@ -2,7 +2,7 @@
 c = 'i686-w64-mingw32-gcc'
 cpp = 'i686-w64-mingw32-g++'
 fortran = 'i686-w64-mingw32-gfortran'
-rust = ['rustc', '--target', 'i686-pc-windows-msvc']
+rust = ['rustc', '--target', 'i686-pc-windows-gnu']
 ar = '/usr/bin/i686-w64-mingw32-ar'
 pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson
index 64ee74a..6bbacc8 100644
--- a/toolchain-mingw64.meson
+++ b/toolchain-mingw64.meson
@@ -2,7 +2,7 @@
 c = 'x86_64-w64-mingw32-gcc'
 cpp = 'x86_64-w64-mingw32-g++'
 fortran = 'x86_64-w64-mingw32-gfortran'
-rust = ['rustc', '--target', 'x86_64-pc-windows-msvc']
+rust = ['rustc', '--target', 'x86_64-pc-windows-gnu']
 ar = '/usr/bin/x86_64-w64-mingw32-ar'
 pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
diff --git a/toolchain-ucrt64.meson b/toolchain-ucrt64.meson
index 0bc527f..aa6020a 100644
--- a/toolchain-ucrt64.meson
+++ b/toolchain-ucrt64.meson
@@ -2,7 +2,9 @@
 c = 'x86_64-w64-mingw32ucrt-gcc'
 cpp = 'x86_64-w64-mingw32ucrt-g++'
 fortran = 'x86_64-w64-mingw32ucrt-gfortran'
-rust = ['rustc', '--target', 'x86_64-pc-windows-msvc']
+rust = ['rustc', '--target', 'x86_64-pc-windows-gnu']
+# XXX: there is no mingw/rustc target for UCRT yet, but this should do
+rust_ld = 'x86_64-w64-mingw32ucrt-gcc'
 ar = '/usr/bin/x86_64-w64-mingw32ucrt-ar'
 pkgconfig = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32ucrt-ranlib'

From 9f0c2b852a4068fdd6a5960de9449d8bfcbf7636 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 12 Jun 2024 11:14:39 +0200
Subject: [PATCH 83/90] Bump release

---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 6e8499b..a73f5a7 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        148
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Wed Jun 12 2024 Sandro Mani <manisandro@gmail.com> - 148-5
+- Rust fixes
+
 * Thu Jun 06 2024 Sandro Mani <manisandro@gmail.com> - 148-4
 - Set __debug_package 1 in %mingw_debug_package (#2284193)
 

From 0481f87ac14248c165d843ecfda4116f40af856c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 17:29:06 +0000
Subject: [PATCH 84/90] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index a73f5a7..8cdadfb 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        148
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 148-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Wed Jun 12 2024 Sandro Mani <manisandro@gmail.com> - 148-5
 - Rust fixes
 

From bc82ce5793d3c16b32e21057df29e9df26f41abd Mon Sep 17 00:00:00 2001
From: Zephyr Lykos <git@mochaa.ws>
Date: Sat, 7 Sep 2024 18:44:32 +0800
Subject: [PATCH 85/90] Fix meson deprecation warnings

---
 macros.mingw32          | 2 +-
 macros.mingw64          | 2 +-
 macros.ucrt64           | 2 +-
 mingw-filesystem.spec   | 5 ++++-
 toolchain-mingw32.meson | 2 +-
 toolchain-mingw64.meson | 2 +-
 toolchain-ucrt64.meson  | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 250675c..0b2a751 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -162,7 +162,7 @@
   if test -f meson.build; then __mingw32_topdir=.; \\\
   elif test -f ../meson.build; then __mingw32_topdir=..; \\\
   else __mingw32_topdir=""; fi; \\\
-  %__meson \\\
+  %__meson setup \\\
         --cross-file /usr/share/mingw/toolchain-mingw32.meson \\\
         --default-library shared \\\
         --prefix %{mingw32_prefix} \\\
diff --git a/macros.mingw64 b/macros.mingw64
index 493024d..4b96dc3 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -162,7 +162,7 @@
   if test -f meson.build; then __mingw64_topdir=.; \\\
   elif test -f ../meson.build; then __mingw64_topdir=..; \\\
   else __mingw64_topdir=""; fi; \\\
-  %__meson \\\
+  %__meson setup \\\
         --cross-file /usr/share/mingw/toolchain-mingw64.meson \\\
         --default-library shared \\\
         --prefix %{mingw64_prefix} \\\
diff --git a/macros.ucrt64 b/macros.ucrt64
index 28e13dc..9c0057a 100644
--- a/macros.ucrt64
+++ b/macros.ucrt64
@@ -158,7 +158,7 @@
   if test -f meson.build; then __ucrt64_topdir=.; \\\
   elif test -f ../meson.build; then __ucrt64_topdir=..; \\\
   else __ucrt64_topdir=""; fi; \\\
-  %__meson \\\
+  %__meson setup \\\
         --cross-file /usr/share/mingw/toolchain-ucrt64.meson \\\
         --default-library shared \\\
         --prefix %{ucrt64_prefix} \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 8cdadfb..37c4eb1 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        148
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Sat Sep 07 2024 Zephyr Lykos <fedora@mochaa.ws> - 148-7
+- Fix meson deprecation warnings
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 148-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson
index 9fc288e..600a297 100644
--- a/toolchain-mingw32.meson
+++ b/toolchain-mingw32.meson
@@ -4,7 +4,7 @@ cpp = 'i686-w64-mingw32-g++'
 fortran = 'i686-w64-mingw32-gfortran'
 rust = ['rustc', '--target', 'i686-pc-windows-gnu']
 ar = '/usr/bin/i686-w64-mingw32-ar'
-pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
+pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
 strip = '/usr/bin/i686-w64-mingw32-strip'
 windres = '/usr/bin/i686-w64-mingw32-windres'
diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson
index 6bbacc8..91298ec 100644
--- a/toolchain-mingw64.meson
+++ b/toolchain-mingw64.meson
@@ -4,7 +4,7 @@ cpp = 'x86_64-w64-mingw32-g++'
 fortran = 'x86_64-w64-mingw32-gfortran'
 rust = ['rustc', '--target', 'x86_64-pc-windows-gnu']
 ar = '/usr/bin/x86_64-w64-mingw32-ar'
-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
 strip = '/usr/bin/x86_64-w64-mingw32-strip'
 windres = '/usr/bin/x86_64-w64-mingw32-windres'
diff --git a/toolchain-ucrt64.meson b/toolchain-ucrt64.meson
index aa6020a..0834d2a 100644
--- a/toolchain-ucrt64.meson
+++ b/toolchain-ucrt64.meson
@@ -6,7 +6,7 @@ rust = ['rustc', '--target', 'x86_64-pc-windows-gnu']
 # XXX: there is no mingw/rustc target for UCRT yet, but this should do
 rust_ld = 'x86_64-w64-mingw32ucrt-gcc'
 ar = '/usr/bin/x86_64-w64-mingw32ucrt-ar'
-pkgconfig = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config'
+pkg-config = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32ucrt-ranlib'
 strip = '/usr/bin/x86_64-w64-mingw32ucrt-strip'
 windres = '/usr/bin/x86_64-w64-mingw32ucrt-windres'

From a19c9b95f646dd6e081c8f9f8a737d8364cbd8ca Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 17:46:59 +0000
Subject: [PATCH 86/90] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 37c4eb1..2b886ea 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        148
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 148-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Sat Sep 07 2024 Zephyr Lykos <fedora@mochaa.ws> - 148-7
 - Fix meson deprecation warnings
 

From 04c3b516570dc899fa5368fd2db9a6075340b16d Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sat, 5 Apr 2025 02:01:25 +0200
Subject: [PATCH 87/90] Only add cross host tools bin dir to PATH

---
 macros.mingw32        | 4 ++--
 macros.mingw64        | 4 ++--
 mingw-filesystem.spec | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 0b2a751..3fe7245 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -55,7 +55,7 @@
   if test -z "$PATH_ORIG" ; then \
     PATH_ORIG="$PATH"; export PATH_ORIG; \
   fi; \
-  PATH="%{mingw32_bindir}:$PATH_ORIG"; export PATH; \
+  PATH="%{_prefix}/%{mingw32_target}/bin:$PATH_ORIG"; export PATH; \
   HOST_CC=gcc; export HOST_CC; \
   unset PKG_CONFIG_PATH; \
   _PREFIX="%{_bindir}/%{mingw32_target}-"; \
@@ -79,7 +79,7 @@
   FCFLAGS="${MINGW32_FCFLAGS-%mingw32_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \
   RUSTFLAGS="${MINGW32_RUSTFLAGS:-%mingw32_rustflags}"; export RUSTFLAGS; \
-  for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \
+  for i in `ls %{_prefix}/%{mingw32_target}/bin/*|grep -- "-config\$"` ; do \
     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
     declare -x $x="$i" ; export $x; \
   done; \
diff --git a/macros.mingw64 b/macros.mingw64
index 4b96dc3..ddaa150 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -55,7 +55,7 @@
   if test -z "$PATH_ORIG" ; then \
     PATH_ORIG="$PATH"; export PATH_ORIG; \
   fi; \
-  PATH="%{mingw64_bindir}:$PATH_ORIG"; export PATH; \
+  PATH="%{_prefix}/%{mingw64_target}/bin:$PATH_ORIG"; export PATH; \
   HOST_CC=gcc; export HOST_CC; \
   unset PKG_CONFIG_PATH; \
   _PREFIX="%{_bindir}/%{mingw64_target}-"; \
@@ -79,7 +79,7 @@
   FCFLAGS="${MINGW64_FCFLAGS-%mingw64_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \
   RUSTFLAGS="${MINGW64_RUSTFLAGS:-%mingw64_rustflags}"; export RUSTFLAGS; \
-  for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \
+  for i in `ls %{_prefix}/%{mingw64_target}/bin/*|grep -- "-config\$"` ; do \
     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
     declare -x $x="$i" ; export $x; \
   done; \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 2b886ea..56c8bf4 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -9,8 +9,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        148
-Release:        8%{?dist}
+Version:        149
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Sun Mar 23 2025 Sandro Mani <manisandro@gmail.com> - 149-1
+- Only add cross host tools bin dir to PATH
+
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 148-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 220a8dc22f665b633547d1d302f52dcc85862375 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 29 May 2025 16:13:50 +0200
Subject: [PATCH 88/90] Re-add target bin dir to PATH

Fixes mingw-gcc FTBFS
---
 macros.mingw32        | 4 ++--
 macros.mingw64        | 4 ++--
 mingw-filesystem.spec | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 3fe7245..0b2a751 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -55,7 +55,7 @@
   if test -z "$PATH_ORIG" ; then \
     PATH_ORIG="$PATH"; export PATH_ORIG; \
   fi; \
-  PATH="%{_prefix}/%{mingw32_target}/bin:$PATH_ORIG"; export PATH; \
+  PATH="%{mingw32_bindir}:$PATH_ORIG"; export PATH; \
   HOST_CC=gcc; export HOST_CC; \
   unset PKG_CONFIG_PATH; \
   _PREFIX="%{_bindir}/%{mingw32_target}-"; \
@@ -79,7 +79,7 @@
   FCFLAGS="${MINGW32_FCFLAGS-%mingw32_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \
   RUSTFLAGS="${MINGW32_RUSTFLAGS:-%mingw32_rustflags}"; export RUSTFLAGS; \
-  for i in `ls %{_prefix}/%{mingw32_target}/bin/*|grep -- "-config\$"` ; do \
+  for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \
     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
     declare -x $x="$i" ; export $x; \
   done; \
diff --git a/macros.mingw64 b/macros.mingw64
index ddaa150..4b96dc3 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -55,7 +55,7 @@
   if test -z "$PATH_ORIG" ; then \
     PATH_ORIG="$PATH"; export PATH_ORIG; \
   fi; \
-  PATH="%{_prefix}/%{mingw64_target}/bin:$PATH_ORIG"; export PATH; \
+  PATH="%{mingw64_bindir}:$PATH_ORIG"; export PATH; \
   HOST_CC=gcc; export HOST_CC; \
   unset PKG_CONFIG_PATH; \
   _PREFIX="%{_bindir}/%{mingw64_target}-"; \
@@ -79,7 +79,7 @@
   FCFLAGS="${MINGW64_FCFLAGS-%mingw64_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \
   RUSTFLAGS="${MINGW64_RUSTFLAGS:-%mingw64_rustflags}"; export RUSTFLAGS; \
-  for i in `ls %{_prefix}/%{mingw64_target}/bin/*|grep -- "-config\$"` ; do \
+  for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \
     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
     declare -x $x="$i" ; export $x; \
   done; \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 56c8bf4..3a2c152 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -9,7 +9,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        149
+Version:        150
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu May 29 2025 Sandro Mani <manisandro@gmail.com> - 150-1
+- Re-add target bin dir to PATH
+
 * Sun Mar 23 2025 Sandro Mani <manisandro@gmail.com> - 149-1
 - Only add cross host tools bin dir to PATH
 

From fdcc6fd9c631fe2e118da02822e3aad77e63c8a5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 21:42:16 +0000
Subject: [PATCH 89/90] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 mingw-filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 3a2c152..2e1e61b 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        150
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 150-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu May 29 2025 Sandro Mani <manisandro@gmail.com> - 150-1
 - Re-add target bin dir to PATH
 

From 66831ea950a9fa4b065a4bac8822b2d65496061d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 20 Aug 2025 15:56:43 +0400
Subject: [PATCH 90/90] Own a few more directories
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 mingw-filesystem.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 2e1e61b..4a0a807 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        150
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -205,6 +205,8 @@ for target in i686-w64-mingw32 x86_64-w64-mingw32 x86_64-w64-mingw32ucrt; do
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib/pkgconfig
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib/cmake
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/libexec
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/libexec/installed-tests
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/sbin
 
   # We don't normally package manual pages and info files, except
@@ -223,6 +225,7 @@ for target in i686-w64-mingw32 x86_64-w64-mingw32 x86_64-w64-mingw32ucrt; do
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/xml
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/icons
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/metainfo
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/installed-tests
 
   mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/$target
 done
@@ -378,6 +381,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Wed Aug 20 2025 Marc-André Lureau <marcandre.lureau@redhat.com> - 150-3
+- Own a few more directories.
+
 * Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 150-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild