[qt5] update to 5.12.3 (#6127)

* update CONTROL files and version variable

* fix qt5 linkage in debug

* revert target_link_libraries to set_property

* revert mqtt to 5.12.1 since 5.12.3 is not released yet

* update mqtt to 5.12.3

* update hashes

* remove unnecessary patch

* fix qmldevtools debug linkage for qt5-tools

4 files changed, 21 insertions, 63 deletions

diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index a58004756..2d8f1d105 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,4 +1,4 @@
-Source: qt5-base
-Version: 5.12.1-6
-Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
-Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl
+Source: qt5-base

+Version: 5.12.3

+Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.

+Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl

diff --git a/ports/qt5-base/fix-gui-configure-json.patch b/ports/qt5-base/fix-gui-configure-json.patch
deleted file mode 100644
index 060fd0b3c..000000000
--- a/ports/qt5-base/fix-gui-configure-json.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 89934c8f..70d08177 100644
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -239,7 +239,8 @@
-             "sources": [
-                 { "type": "pkgConfig", "args": "freetype2" },
-                 { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
--                { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
-+                { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
-+                { "libs": "-lfreetype" }
-             ],
-             "use": [
-                 { "lib": "zlib", "condition": "features.system-zlib" }
-@@ -250,7 +251,7 @@
-             "test": {
-                 "tail": [
-                     "#ifndef FC_RGBA_UNKNOWN",
--                    "#  error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define",
-+                    "#  error This version of fontconfig is too old, it is missing the FC_RGBA_UNKNOWN define",
-                     "#endif"
-                 ],
-                 "main": [
-@@ -1436,7 +1437,7 @@
-         },
-         "eglfs_x11": {
-             "label": "EGLFS X11",
--            "condition": "features.eglfs && features.xcb && features.xcb-xlib && features.egl_x11",
-+            "condition": "features.eglfs && features.xcb-xlib && features.egl_x11",
-             "output": [ "privateFeature" ]
-         },
-         "gif": {
-@@ -1569,7 +1570,6 @@
-         },
-         "xcb-xlib": {
-             "label": "XCB Xlib",
--            "emitIf": "features.xcb",
-             "condition": "features.xlib && libs.xcb_xlib",
-             "output": [ "privateFeature" ]
-         },
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index 3e6c5ae46..c6dc55e43 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -12,20 +12,18 @@ include(configure_qt)
 include(install_qt)
 
 set(MAJOR_MINOR 5.12)
-set(FULL_VERSION ${MAJOR_MINOR}.1)
+set(FULL_VERSION ${MAJOR_MINOR}.3)
 set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz")
 
 vcpkg_download_distfile(ARCHIVE_FILE
     URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
     FILENAME ${ARCHIVE_NAME}
-    SHA512 51494d8947ae16ab7aee22aca156035718f5a700737547de59b4d61d3919c00f4de858111c8928a66c0385604623d847d231892d964d53924a8c97b6e2bedf25
+    SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 )
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE "${ARCHIVE_FILE}"
     REF ${FULL_VERSION}
-    PATCHES
-        fix-gui-configure-json.patch
 )
 
 # Remove vendored dependencies to ensure they are not picked up by the build
@@ -171,7 +169,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
 endif()
 
-vcpkg_execute_required_process( 
+vcpkg_execute_required_process(
     COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py
     WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cmake
     LOGNAME fix-cmake
@@ -251,4 +249,4 @@ endif()
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5core)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION  ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-# 
\ No newline at end of file
+#
diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake
index 7f3e7df2f..8e00aaca7 100644
--- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake
+++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake
@@ -2,9 +2,9 @@ _find_package(${ARGS})
 
 function(add_qt_library _target)
     foreach(_lib IN LISTS ARGN)
-        find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d PATH_SUFFIXES plugins/platforms)
+        find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d PATH_SUFFIXES debug/plugins/platforms)
         find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} PATH_SUFFIXES plugins/platforms)
-        set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES 
+        set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
         \$<\$<NOT:\$<CONFIG:DEBUG>>:${${_lib}_LIBRARY_RELEASE}>\$<\$<CONFIG:DEBUG>:${${_lib}_LIBRARY_DEBUG}>)
     endforeach()
 endfunction()
@@ -21,28 +21,28 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY")
     find_package(OpenSSL)
     find_package(harfbuzz CONFIG)
 
-    set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES 
+    set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
         ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz
-        ${PostgreSQL_LIBRARY} double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto  
+        ${PostgreSQL_LIBRARY} double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto
     )
 
-    add_qt_library(Qt5::Core 
-        pcre2-16 
+    add_qt_library(Qt5::Core
+        pcre2-16
         Qt5ThemeSupport
         Qt5EventDispatcherSupport
-        Qt5PlatformCompositorSupport 
+        Qt5PlatformCompositorSupport
         Qt5FontDatabaseSupport)
 
     if(MSVC)
-       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES 
+       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
            Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib)
 
       add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d)
 
     elseif(APPLE)
-       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES           
-            "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" 
-            "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices" 
+       set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+            "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices"
+            "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices"
             "-weak_framework CoreFoundation" "-weak_framework SystemConfiguration"
             "-weak_framework Carbon"
             "-weak_framework QuartzCore"
@@ -53,10 +53,10 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY")
             "-weak_framework CoreGraphics"
             "-weak_framework OpenGL"
             "-weak_framework AGL"
-            "-weak_framework ImageIO" 
+            "-weak_framework ImageIO"
             "z" "m"
             cups)
-        add_qt_library(Qt5::Core 
+        add_qt_library(Qt5::Core
             Qt5GraphicsSupport
             Qt5ClipboardSupport
             Qt5AccessibilitySupport