[Qt] Update to 6.2.2 and add missing modules

ports/qt/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qt",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "Qt",
   "homepage": "https://www.qt.io/",
   "dependencies": [
@@ -14,6 +14,7 @@
         "textcodec"
       ]
     },
+    "qtapplicationmanager",
     {
       "name": "qtbase",
       "default-features": false
@@ -30,6 +31,11 @@
     "qtconnectivity",
     "qtdatavis3d",
     "qtdeclarative",
+    {
+      "name": "qtdeviceutilities",
+      "default-features": false,
+      "platform": "linux"
+    },
     "qtdoc",
     {
       "name": "qtimageformats",
@@ -40,14 +46,7 @@
         "webp"
       ]
     },
-    {
-      "name": "qtlocation",
-      "default-features": false,
-      "features": [
-        "nmea",
-        "qml"
-      ]
-    },
+    "qtinterfaceframework",
     {
       "name": "qtlottie",
       "default-features": false,
@@ -60,18 +59,32 @@
       "name": "qtmultimedia",
       "default-features": false,
       "features": [
-        "gstreamer",
         "qml",
         "widgets"
       ]
     },
+    {
+      "name": "qtmultimedia",
+      "default-features": false,
+      "features": [
+        "gstreamer"
+      ],
+      "platform": "!(static & windows)"
+    },
     "qtnetworkauth",
     {
       "name": "qtopcua",
       "features": [
         "qml"
       ]
     },
+    {
+      "name": "qtpositioning",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
     {
       "name": "qtquick3d",
       "default-features": false
@@ -127,7 +140,8 @@
         "geolocation",
         "spellchecker",
         "webchannel"
-      ]
+      ],
+      "platform": "!static"
     },
     {
       "name": "qtwebsockets",
@@ -140,9 +154,16 @@
       "name": "qtwebview",
       "default-features": false,
       "features": [
-        "qml",
-        "webengine"
+        "qml"
       ]
+    },
+    {
+      "name": "qtwebview",
+      "default-features": false,
+      "features": [
+        "webengine"
+      ],
+      "platform": "!static"
     }
   ],
   "default-features": [

ports/qt5compat/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qt5compat",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "The module contains unsupported Qt 5 APIs",
   "homepage": "https://www.qt.io/",
   "dependencies": [

ports/qtactiveqt/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qtactiveqt",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "ActiveQt",
   "homepage": "https://www.qt.io/",
   "supports": "windows",

ports/qtapplicationmanager/bump-cmake-version.patch

@@ -0,0 +1,11 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f2236c0..904c5b7 100644
+--- a/CMakeLists.txt	
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+
+-cmake_minimum_required(VERSION 3.16)
++cmake_minimum_required(VERSION 3.19)
+
+ include(.cmake.conf)
+ project(QtApplicationManager # special case

ports/qtapplicationmanager/portfile.cmake

@@ -0,0 +1,62 @@
+set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
+include("${SCRIPT_PATH}/qt_install_submodule.cmake")
+
+set(${PORT}_PATCHES 
+        bump-cmake-version.patch
+        wrapper-fixes.patch
+    )
+
+set(TOOL_NAMES appman
+               appman-controller
+               appman-dumpqmltypes
+               appman-packager
+               appman-qmltestrunner
+               appman-launcher-qml
+               package-uploader
+    )
+
+qt_download_submodule(PATCHES ${${PORT}_PATCHES})
+if(QT_UPDATE_VERSION)
+    return()
+endif()
+
+set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
+set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
+qt_cmake_configure(${_opt} 
+                   OPTIONS
+                        -DINPUT_libarchive=system
+                        -DINPUT_libyaml=system
+                        -DFEATURE_am_system_libyaml=ON
+                        -DFEATURE_am_system_libarchive=ON
+                   OPTIONS_DEBUG
+                   OPTIONS_RELEASE)
+
+### Need to fix one post-build.bat; Couldn't find the place where it gets generated!
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat")
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE)
+    if(EXISTS "${scriptfile}")
+        vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin")
+    endif()
+endif()
+vcpkg_install_cmake(ADD_BIN_TO_PATH)
+
+qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES})
+
+qt_install_copyright("${SOURCE_PATH}")
+
+# Switch to a more complicated script due to the one post-build script which needed fixing after configure. 
+# If somebody finds out how/where post-build.bat gets generated please fix it there instead.
+#qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
+#                     TOOL_NAMES ${TOOL_NAMES}
+#                     CONFIGURE_OPTIONS
+#                        --trace-expand
+#                        -DINPUT_libarchive=system
+#                        -DINPUT_libyaml=system
+#                        -DFEATURE_am_system_libyaml=ON
+#                        -DFEATURE_am_system_libarchive=ON
+#                     CONFIGURE_OPTIONS_RELEASE
+#                     CONFIGURE_OPTIONS_DEBUG
+#                    )
+
+set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) #Debug tracing libraries are only build if CMAKE_BUILD_TYPE is equal to Debug

ports/qtapplicationmanager/vcpkg.json

@@ -0,0 +1,29 @@
+{
+  "name": "qtapplicationmanager",
+  "version-semver": "6.2.2",
+  "description": "Qt component for application lifecycle management",
+  "homepage": "https://www.qt.io/",
+  "supports": "!(windows & arm)",
+  "dependencies": [
+    "libarchive",
+    "libyaml",
+    {
+      "name": "qtapplicationmanager",
+      "host": true,
+      "default-features": false
+    },
+    {
+      "name": "qtbase",
+      "default-features": false
+    },
+    {
+      "name": "qtdeclarative",
+      "default-features": false
+    },
+    {
+      "name": "qtwayland",
+      "default-features": false,
+      "platform": "!windows"
+    }
+  ]
+}

ports/qtapplicationmanager/wrapper-fixes.patch

@@ -0,0 +1,56 @@
+diff --git a/cmake/FindWrapLibArchive.cmake b/cmake/FindWrapLibArchive.cmake
+index 67e4ce0..887b766 100644
+--- a/cmake/FindWrapLibArchive.cmake
++++ b/cmake/FindWrapLibArchive.cmake
+@@ -16,3 +16,24 @@ add_library(WrapLibArchive::WrapLibArchive INTERFACE IMPORTED)
+ target_link_libraries(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_LIBRARIES})
+ target_include_directories(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_INCLUDE_DIRS})
+ set(WrapLibArchive_FOUND TRUE)
++if(TARGET BZip2::BZip2)
++	set_property(TARGET BZip2::BZip2 PROPERTY _qt_no_promote_global TRUE)
++endif()
++if(TARGET Threads::Threads)
++	set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE)
++endif()
++if(TARGET OpenSSL::Crypto)
++	set_property(TARGET OpenSSL::Crypto PROPERTY _qt_no_promote_global TRUE)
++endif()
++if(TARGET zstd::libzstd)
++	set_property(TARGET zstd::libzstd PROPERTY _qt_no_promote_global TRUE)
++endif()
++if(TARGET zstd::libzstd_shared)
++	set_property(TARGET zstd::libzstd_shared PROPERTY _qt_no_promote_global TRUE)
++endif()
++if(TARGET zstd::libzstd_static)
++	set_property(TARGET zstd::libzstd_static PROPERTY _qt_no_promote_global TRUE)
++endif()
++if(TARGET ZLIB::ZLIB)
++	set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE)
++endif()
+diff --git a/cmake/FindWrapLibYaml.cmake b/cmake/FindWrapLibYaml.cmake
+index 1dab912..c09e97f 100644
+--- a/cmake/FindWrapLibYaml.cmake
++++ b/cmake/FindWrapLibYaml.cmake
+@@ -10,10 +10,17 @@ pkg_check_modules(pc_libyaml yaml-0.1 IMPORTED_TARGET)
+
+
+ if (NOT pc_libyaml_FOUND)
+-    set(WrapLibYaml_FOUND FALSE)
+-    return()
++    find_package(yaml)
++    if(yaml_FOUND)
++        add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED)
++        target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${yaml_LIBRARIES})
++    else()
++        set(WrapLibYaml_FOUND FALSE)
++        return()
++    endif()
++else()
++    add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED)
++    target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${pc_libyaml_LIBRARIES})
+ endif()
+-
+-add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED)
+-target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${pc_libyaml_LIBRARIES})
+ set(WrapLibYaml_FOUND TRUE)
++