From feac8b009723eedb69b4bdca2437eb759a1b3143 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Dec 28 2022 18:27:22 +0000
Subject: Add mingw-qmake-qt6 macros, drop mingw-cmake-kde4 macros


---

diff --git a/macros.mingw b/macros.mingw
index bd0f635..36f9d45 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -100,53 +100,56 @@ popd                                                   \
 }                                                      \
 run_mingw_cmake
 
-%mingw_cmake_kde4                                      \
-run_mingw_cmake_kde4()                                 \
+
+%mingw_qmake_qt5                                       \
+run_mingw_qmake_qt5()                                  \
 {                                                      \
 %if 0%{?mingw_build_win32} == 1                        \
 mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw32_cmake_kde4 "$@"}                        \
+    %{?mingw32_qmake_qt5} "$@"                         \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_win64} == 1                        \
 mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw64_cmake_kde4 "$@"}                        \
+    %{?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_cmake_kde4 "$@"}                         \
+    %{?ucrt64_qmake_qt5} "$@"                          \
 popd                                                   \
 %endif                                                 \
 }                                                      \
-run_mingw_cmake_kde4
+run_mingw_qmake_qt5
 
-%mingw_qmake_qt5                                       \
-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_qt5} "$@"                         \
+    %{?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_qt5} "$@"                         \
+    %{?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_qt5} "$@"                          \
+    %{?ucrt64_qmake_qt6} "$@"                          \
 popd                                                   \
 %endif                                                 \
 }                                                      \
-run_mingw_qmake_qt5
+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