From 952dc4add8a5848dd641afc052cf8ef97110b4c8 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Wed, 13 Oct 2021 23:17:22 +0300
Subject: [PATCH] qtbinpatcher: Add support for Qt6

---
 ...001-minimize-files-touching-add-qt6.patch} | 70 +++++++++++++++++--
 mingw-w64-qtbinpatcher/PKGBUILD               |  8 +--
 2 files changed, 67 insertions(+), 11 deletions(-)
 rename mingw-w64-qtbinpatcher/{001-minimize-files-touching.patch => 001-minimize-files-touching-add-qt6.patch} (54%)

diff --git a/mingw-w64-qtbinpatcher/001-minimize-files-touching.patch b/mingw-w64-qtbinpatcher/001-minimize-files-touching-add-qt6.patch
similarity index 54%
rename from mingw-w64-qtbinpatcher/001-minimize-files-touching.patch
rename to mingw-w64-qtbinpatcher/001-minimize-files-touching-add-qt6.patch
index 4c27746a36..56c497702d 100644
--- a/mingw-w64-qtbinpatcher/001-minimize-files-touching.patch
+++ b/mingw-w64-qtbinpatcher/001-minimize-files-touching-add-qt6.patch
@@ -1,6 +1,7 @@
---- qtbinpatcher-2.1.4/QtBinPatcher.cpp.orig	2015-04-28 13:25:04.642600000 +0300
-+++ qtbinpatcher-2.1.4/QtBinPatcher.cpp	2015-04-28 13:32:03.050200000 +0300
-@@ -255,32 +255,36 @@
+diff -Naur QtBinPatcher-2.2.0-orig/QtBinPatcher.cpp QtBinPatcher-2.2.0/QtBinPatcher.cpp
+--- QtBinPatcher-2.2.0-orig/QtBinPatcher.cpp	2015-07-05 19:17:34.000000000 +0300
++++ QtBinPatcher-2.2.0/QtBinPatcher.cpp	2021-10-13 09:26:08.664452400 +0300
+@@ -254,11 +254,11 @@
      // Files for patching in Qt4.
      static const TElement Elements4[] = {
          { "/lib/",             "*.prl",              false },
@@ -14,10 +15,7 @@
          { "/",                 ".qmake.cache",       false }
  #elif defined(OS_LINUX)
          { "/lib/pkgconfig/",   "qt*.pc",             false },
-         { "/lib/",             "*.la",               false },
-         { "/mkspecs/",         "qconfig.pri",        false }
- #endif
-     };
+@@ -269,20 +269,33 @@
  
      // Files for patching in Qt5.
      static const TElement Elements5[] = {
@@ -49,3 +47,61 @@
  #endif
      };
  
++    // Files for patching in Qt6.
++    static const TElement Elements6[] = {
++        { "/lib/",                                "*.prl",                        true  },
++        { "/lib/pkgconfig/",                      "Qt6*.pc",                      true  },
++        { "/share/qt6/",                          "*.pri",                        true  },
++        { "/share/qt6/",                          "*.prl",                        true  },
++        { "/lib/cmake/",                          "Qt6*.cmake",                   true  }
++    };
++
+     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ 
+     m_TxtFilesForPatch.clear();
+@@ -298,6 +311,10 @@
+             Elements = Elements5;
+             Count = sizeof(Elements5)/sizeof(Elements5[0]);
+             break;
++        case '6' :
++            Elements = Elements6;
++            Count = sizeof(Elements6)/sizeof(Elements6[0]);
++            break;
+         default :
+             LOG_E("Unsupported Qt version (%c).", m_QMake.qtVersion());
+             return false;
+@@ -354,6 +371,23 @@
+ #endif
+     };
+ 
++    // Files for patching in Qt6.
++    static const TElement Elements6[] = {
++#if defined(OS_WINDOWS)
++        { "/bin/", "qmake.exe"    },
++        { "/bin/", "qmake6.exe"   },
++        { "/bin/", "lrelease.exe" },
++        { "/bin/", "qdoc.exe"     },
++        { "/bin/", "Qt6Core*.dll" },
++        { "/lib/", "Qt6Core*.dll" }
++#elif defined(OS_LINUX)
++        { "/bin/", "qmake"        },
++        { "/bin/", "lrelease"     },
++        { "/bin/", "qdoc"         },
++        { "/lib/", "libQt6Core.so" }
++#endif
++    };
++
+     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ 
+     m_BinFilesForPatch.clear();
+@@ -369,6 +403,10 @@
+             Elements = Elements5;
+             Count = sizeof(Elements5)/sizeof(Elements5[0]);
+             break;
++        case '6' :
++            Elements = Elements6;
++            Count = sizeof(Elements6)/sizeof(Elements6[0]);
++            break;
+         default :
+             LOG_E("Unsupported Qt version (%c).", m_QMake.qtVersion());
+             return false;
diff --git a/mingw-w64-qtbinpatcher/PKGBUILD b/mingw-w64-qtbinpatcher/PKGBUILD
index fe31bcfa59..0d7b45e8c1 100644
--- a/mingw-w64-qtbinpatcher/PKGBUILD
+++ b/mingw-w64-qtbinpatcher/PKGBUILD
@@ -4,7 +4,7 @@ _realname=qtbinpatcher
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Patcher for Qt libraries (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -13,13 +13,13 @@ license=("GPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake")
 options=('staticlibs' 'strip')
 source=(${_realname}-${pkgver}.tar.gz
-        001-minimize-files-touching.patch)
+        001-minimize-files-touching-add-qt6.patch)
 sha256sums=('7196199cd59777bf78ee0e3f77baa3c44e02e69dded192d6f0e59cf9b7bbd18e'
-            '5f18d9a981ee97466279c0fc5bc09d2c5630e31395fa04137badf579cabc387a')
+            '1b0bce9ccc48b18355054582707169f0f8a2cd09e83ac605759df2f0e5494a1e')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  patch -p1 -i "${srcdir}/001-minimize-files-touching.patch"
+  patch -p1 -i "${srcdir}/001-minimize-files-touching-add-qt6.patch"
 }
 
 build() {