From ac9fcd8ab6ef95b5fc6d78eeb34a313f86a69c89 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Feb 22 2022 13:07:23 +0000 Subject: Drop qt4 macros 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 --- 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} ; \