[Qt] Update to 6.6.0 (microsoft#34426)

* [Qt] Update to 6.6.0 * fix patch in qtbase * add tmp port to get qtwebengine logs * remove dep in tmp port * Fix CMAKE_BUILD_TYPE being hijacked by qt scripts. * Fix qtwebengine build? * add another script to be fixed * remove path to cmake * fix qtgrpc * looks like the variable is defined somewhere. * avoid aliasing only if the target exists * try different aliasing fix * fix patch * Dep stuff * reenable atomics * reenable librt * remove tmp * v db * v db * add vulkan-header as a dependency * v db * also needs libs * v db * add a comment to remember me not to touch this again * v db
keynmol · Oct 27, 2023 · 45f34d7 · 45f34d7
1 parent 820cf6a
commit 45f34d7
Show file tree

Hide file tree

Showing 105 changed files with 465 additions and 271 deletions.
diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt",
-  "version": "6.5.3",
+  "version": "6.6.0",
   "description": "Qt",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -52,6 +52,7 @@
       "platform": "linux"
     },
     "qtdoc",
+    "qtgrpc",
     {
       "name": "qtimageformats",
       "default-features": false,

diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt3d",
-  "version": "6.5.3",
+  "version": "6.6.0",
   "description": "Qt wrapper for existing OPC UA stacks",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5compat",
-  "version": "6.5.3",
+  "version": "6.6.0",
   "description": "The module contains unsupported Qt 5 APIs",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtactiveqt",
-  "version": "6.5.3",
+  "version": "6.6.0",
   "description": "ActiveQt",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake
@@ -29,6 +29,7 @@ qt_cmake_configure(${_opt}
                         -DINPUT_libyaml=system
                         -DFEATURE_am_system_libyaml=ON
                         -DFEATURE_am_system_libarchive=ON
+                        --trace-expand
                    OPTIONS_DEBUG
                    OPTIONS_RELEASE)
 

diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtapplicationmanager",
-  "version": "6.5.3",
+  "version": "6.6.0",
   "description": "Qt component for application lifecycle management",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtbase/CVE-2023-43114-6.5.patch b/ports/qtbase/CVE-2023-43114-6.5.patch
diff --git a/ports/qtbase/GLIB2-static.patch b/ports/qtbase/GLIB2-static.patch
@@ -98,6 +98,6 @@ index aef7f15..21b0c1d 100644
 -qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE_NAME core QMAKE_LIB gio)
 +qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE MODULE_NAME core QMAKE_LIB gobject)
 +qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE MODULE_NAME core QMAKE_LIB gio)
-
+ qt_find_package(WrapResolv PROVIDED_TARGETS WrapResolv::WrapResolv MODULE_NAME network QMAKE_LIB libresolv)
 
  #### Tests