From 90162801bf1bab1c50a6354c15be898fecd08b22 Mon Sep 17 00:00:00 2001
From: oltolm <oleg.tolmatcev@gmail.com>
Date: Sun, 6 Aug 2023 12:45:45 +0200
Subject: [PATCH] Qt6: fix WINDEPLOYQT_EXECUTABLE variable

fixes #17970
---
 .../001-appending-qt6-to-remove-qt5-conflict.patch    | 11 +++++++++++
 mingw-w64-qt6-base/PKGBUILD                           |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-qt6-base/001-appending-qt6-to-remove-qt5-conflict.patch b/mingw-w64-qt6-base/001-appending-qt6-to-remove-qt5-conflict.patch
index 0c30031e651f4..6371821e724e8 100644
--- a/mingw-w64-qt6-base/001-appending-qt6-to-remove-qt5-conflict.patch
+++ b/mingw-w64-qt6-base/001-appending-qt6-to-remove-qt5-conflict.patch
@@ -94,3 +94,14 @@
      QStringList arguments;
      for (const QString &prefix : std::as_const(prefixes)) {
          arguments.clear();
+--- a/src/corelib/Qt6CoreMacros.cmake.old	Sun Aug  6 12:22:24 2023
++++ b/src/corelib/Qt6CoreMacros.cmake	Sun Aug  6 12:22:40 2023
+@@ -2522,7 +2522,7 @@
+             "$<TARGET_FILE:$<IF:${have_deploy_tool},${target_if_exists},${target}>>")
+         set(__QT_DEPLOY_TOOL "$<IF:${have_deploy_tool},${safe_target_file},${fallback}>")
+     elseif(WIN32)
+-        find_program(WINDEPLOYQT_EXECUTABLE windeployqt
++        find_program(WINDEPLOYQT_EXECUTABLE windeployqt-qt6
+             ${find_program_hints})
+         set(fallback "$<$<BOOL:${WINDEPLOYQT_EXECUTABLE}>:${WINDEPLOYQT_EXECUTABLE}>")
+         set(target_if_exists "$<TARGET_NAME_IF_EXISTS:${QT_CMAKE_EXPORT_NAMESPACE}::windeployqt>")
diff --git a/mingw-w64-qt6-base/PKGBUILD b/mingw-w64-qt6-base/PKGBUILD
index 6233cff6be3fd..a443630ab9363 100644
--- a/mingw-w64-qt6-base/PKGBUILD
+++ b/mingw-w64-qt6-base/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
 _qtver=6.5.2
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.qt.io'
@@ -51,7 +51,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         011-qt6-windeployqt-fixes.patch
         012-fix-unicode-definitions-in-cmake-interface.patch)
 sha256sums=('3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269'
-            'ec22ac099ff85be804c7a740852bdc10d9a40f32eab58c5e49bc86dc28f2a7b9'
+            'bdfe9069b91f560d5cc0e0b05120b6051d804f10f96d4743ddf538c2db1379fc'
             '3848318bccdfa21a139ccdb70f8226358c4a7ed3943231494aab3df83025d7c7'
             '68156b8b7717a0ce19c4b991942469171bfa048cd5c90765115a546e65669a1d'
             '142ed248e8025360a8a6b93bece2a13bef9f032d42723f36df730a5e2d00bcdd'