[lunarg-vulkantools] Switch to Qt6 [qtwebengine] Resolve protobuf include quirk

ports/lunarg-vulkantools/jsoncpp.diff

@@ -0,0 +1,14 @@
+diff --git a/via/CMakeLists.txt b/via/CMakeLists.txt
+index 975fdb3..327acb1 100644
+--- a/via/CMakeLists.txt
++++ b/via/CMakeLists.txt
+@@ -72,6 +72,9 @@ endif()
+ find_package(jsoncpp CONFIG)
+ if (TARGET jsoncpp_static)
+     target_link_libraries(vkvia PRIVATE jsoncpp_static)
++
++elseif (TARGET JsonCpp::JsonCpp)
++    target_link_libraries(vkvia PRIVATE JsonCpp::JsonCpp)
+
+ # Support using jsoncpp.pc but only for UNIX platforms.
+ # And only if UPDATE_DEPS is disabled.

ports/lunarg-vulkantools/portfile.cmake

@@ -1,3 +1,6 @@
+set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_from_github(
@@ -8,33 +11,28 @@ vcpkg_from_github(
     HEAD_REF main
     PATCHES
         disable-qtdeploy.patch
+        jsoncpp.diff
 )
 
-vcpkg_replace_string("${SOURCE_PATH}/via/CMakeLists.txt" "jsoncpp_static" "JsonCpp::JsonCpp")
-
 x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES jsonschema OUT_PYTHON_VAR PYTHON3)
-get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-vcpkg_add_to_path("${PYTHON3_DIR}")
 
 vcpkg_cmake_configure(
-  SOURCE_PATH "${SOURCE_PATH}"
-  OPTIONS
-    -DVULKAN_HEADERS_INSTALL_DIR=${CURRENT_INSTALLED_DIR}
-    -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON
-    -DBUILD_TESTS:BOOL=OFF
-  OPTIONS_RELEASE
-    -DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR}
-  OPTIONS_DEBUG
-    -DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR}/debug
-
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTS:BOOL=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
+        -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6=ON
+        "-DPython3_EXECUTABLE=${PYTHON3}"
+        "-DVULKAN_HEADERS_INSTALL_DIR=${CURRENT_INSTALLED_DIR}"
+    OPTIONS_RELEASE
+        "-DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR}"
+    OPTIONS_DEBUG
+        "-DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR}/debug"
 )
 vcpkg_cmake_install()
 
+vcpkg_copy_tools(TOOL_NAMES vkvia vkconfig vkconfig-gui AUTO_CLEAN)
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
-
-vcpkg_copy_tools(TOOL_NAMES vkvia vkconfig vkconfig-gui AUTO_CLEAN )
-
-set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
-set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

ports/lunarg-vulkantools/vcpkg.json

@@ -1,13 +1,24 @@
 {
   "name": "lunarg-vulkantools",
   "version": "1.4.309.0",
+  "port-version": 1,
   "description": "Tools to aid in Vulkan development",
   "homepage": "https://github.com/LunarG/VulkanTools",
   "license": null,
   "supports": "!osx & !staticcrt",
   "dependencies": [
     "jsoncpp",
-    "qt5-base",
+    {
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "gui",
+        "network",
+        "thread",
+        "vulkan",
+        "widgets"
+      ]
+    },
     "valijson",
     {
       "name": "vcpkg-cmake",

ports/qtwebengine/include-dir-order.diff

@@ -0,0 +1,14 @@
+diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt
+index e2456a4..a9f8ec0 100644
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -54,6 +54,9 @@ qt_internal_add_module(WebEngineCore
+         ../../3rdparty/chromium/third_party/perfetto/include
+         ../../3rdparty/chromium/third_party/boringssl/src/include
+         ../../3rdparty/chromium/base/allocator/partition_allocator/src
++        # vendored protobuf must be listed here in order to appear
++        # before the vcpkg include dir coming with Qt targets.
++        ../../3rdparty/chromium/third_party/protobuf/src
+     LIBRARIES
+         Qt::CorePrivate
+         Qt::GuiPrivate

ports/qtwebengine/portfile.cmake

@@ -12,9 +12,9 @@ set(${PORT}_PATCHES
       "pdf-system-libpng.diff"
       "pkg-config.diff"
       "rpath.diff"
+      "include-dir-order.diff"
 )
 
-list(REMOVE_ITEM FEATURES "private-dependencies")
 set(qtwebengine_target "${VCPKG_TARGET_TRIPLET}-${VCPKG_CMAKE_SYSTEM_NAME}")
 if(VCPKG_CROSSCOMPILING)
     if(NOT qtwebengine_host STREQUAL qtwebengine_target)
@@ -207,7 +207,7 @@ if(QT_UPDATE_VERSION)
 endif()
 
 qt_cmake_configure(
-    DISABLE_PARALLEL_CONFIGURE # due to in source changes.
+    DISABLE_PARALLEL_CONFIGURE # due to in-source changes.
     OPTIONS
         ${FEATURE_OPTIONS}
         "-DGPerf_EXECUTABLE=${GPERF}"

ports/qtwebengine/vcpkg.json

@@ -2,8 +2,8 @@
   "$comment": "x86-windows is not within the upstream support matrix of Qt6",
   "name": "qtwebengine",
   "version": "6.9.1",
-  "port-version": 1,
-  "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
+  "port-version": 2,
+  "description": "Qt modules for rendering web and PDF content.",
   "homepage": "https://www.qt.io/",
   "license": null,
   "dependencies": [

versions/baseline.json

@@ -6014,7 +6014,7 @@
     },
     "lunarg-vulkantools": {
       "baseline": "1.4.309.0",
-      "port-version": 0
+      "port-version": 1
     },
     "lunasvg": {
       "baseline": "3.4.0",
@@ -8178,7 +8178,7 @@
     },
     "qtwebengine": {
       "baseline": "6.9.1",
-      "port-version": 1
+      "port-version": 2
     },
     "qtwebsockets": {
       "baseline": "6.9.1",

versions/l-/lunarg-vulkantools.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8932e52440aba5c3eef9648513539501529ef7a8",
+      "version": "1.4.309.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e556ea3035f1822d6af25c004bf5991b6ea472e1",
       "version": "1.4.309.0",

versions/q-/qtwebengine.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0cf8cb5f057bcd20d831317cee64096954eba501",
+      "version": "6.9.1",
+      "port-version": 2
+    },
     {
       "git-tree": "45f1164b10dc967d15b3b956834f57e319d7b34e",
       "version": "6.9.1",