@openziti/ziti-sdk-nodejs 0.15.0 → 0.17.0

package/vcpkg/ports/python3/0012-force-disable-modules.patch

@@ -0,0 +1,13 @@
+diff --git a/Modules/Setup b/Modules/Setup
+index 87c6a152f8..7ad53f5b4f 100644
+--- a/Modules/Setup
++++ b/Modules/Setup
+@@ -375,3 +375,8 @@ xxsubtype xxsubtype.c
+ #
+ # _sqlite3 _tkinter _curses pyexpat
+ # _codecs_jp _codecs_kr _codecs_tw unicodedata
++
++*disabled*
++_curses
++_curses_panel
++_tkinter

package/vcpkg/ports/python3/0018-fix-sysconfig-include.patch

@@ -0,0 +1,27 @@
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index ebe371182..e351df7da 100644
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -30,9 +30,9 @@
+         'purelib': '{base}/lib/python{py_version_short}/site-packages',
+         'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
+         'include':
+-            '{installed_base}/include/python{py_version_short}{abiflags}',
++            '{installed_base}/../../include/python{py_version_short}{abiflags}',
+         'platinclude':
+-            '{installed_platbase}/include/python{py_version_short}{abiflags}',
++            '{installed_platbase}/../../include/python{py_version_short}{abiflags}',
+         'scripts': '{base}/bin',
+         'data': '{base}',
+         },
+@@ -51,8 +51,8 @@
+         'platstdlib': '{base}/Lib',
+         'purelib': '{base}/Lib/site-packages',
+         'platlib': '{base}/Lib/site-packages',
+-        'include': '{installed_base}/Include',
+-        'platinclude': '{installed_base}/Include',
++        'include': '{installed_base}/../../include/python{py_version_short}{abiflags}',
++        'platinclude': '{installed_base}/../../include/python{py_version_short}{abiflags}',
+         'scripts': '{base}/Scripts',
+         'data': '{base}',
+         },

package/vcpkg/ports/python3/portfile.cmake

@@ -3,6 +3,21 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_CRT_LINKAGE STREQUAL static
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
 
+if(NOT VCPKG_HOST_IS_WINDOWS)
+    message(WARNING "${PORT} currently requires the following programs from the system package manager:
+    autoconf automake autoconf-archive
+On Debian and Ubuntu derivatives:
+    sudo apt-get install autoconf automake autoconf-archive
+On recent Red Hat and Fedora derivatives:
+    sudo dnf install autoconf automake autoconf-archive
+On Arch Linux and derivatives:
+    sudo pacman -S autoconf automake autoconf-archive
+On Alpine:
+    apk add autoconf automake autoconf-archive
+On macOS:
+    brew install autoconf automake autoconf-archive\n")
+endif()
+
 string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" PYTHON_VERSION "${VERSION}")
 set(PYTHON_VERSION_MAJOR "${CMAKE_MATCH_1}")
 set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_2}")
@@ -15,9 +30,10 @@ set(PATCHES
     0005-dont-copy-vcruntime.patch
     0008-python.pc.patch
     0010-dont-skip-rpath.patch
-    0012-force-disable-curses.patch
+    0012-force-disable-modules.patch
     0014-fix-get-python-inc-output.patch
     0015-dont-use-WINDOWS-def.patch
+    0018-fix-sysconfig-include.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

package/vcpkg/ports/python3/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "python3",
   "version": "3.11.5",
+  "port-version": 3,
   "description": "The Python programming language",
   "homepage": "https://github.com/python/cpython",
   "license": "Python-2.0",

package/vcpkg/ports/qcoro/portfile.cmake

@@ -2,9 +2,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO danvratil/qcoro
     REF "v${VERSION}"
-    SHA512 f708e1a82861c39434d6934172246c3280864e933b333b56c0471f1a629f9da65554d1508af4291ac2257ad8df2040655394ae5525d728710de5bd83cef8fbee
+    SHA512 de2e55256d3c9d35fec3ef6dc78128801b70a5e5b8ff0f3a6f235dac17f349ea44207a7c9f35375215dbeea04cb67c3412d505d0a8a95f2b926775f804a02649
     HEAD_REF main
-    PATCHES 0001-qt6-deprecated-qwebsocket-error.patch
 )
 
 vcpkg_check_features(

package/vcpkg/ports/qcoro/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qcoro",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Coroutine support for Qt",
   "homepage": "https://www.github.com/danvratil/qcoro",
   "documentation": "https://qcoro.dvratil.cz",

package/vcpkg/ports/qt/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qt",
-  "version": "6.5.3",
+  "version": "6.6.1",
   "description": "Qt",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -52,6 +52,8 @@
       "platform": "linux"
     },
     "qtdoc",
+    "qtgraphs",
+    "qtgrpc",
     {
       "name": "qtimageformats",
       "default-features": false,

package/vcpkg/ports/qt-advanced-docking-system/portfile.cmake

@@ -2,10 +2,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO githubuser0xFFFF/Qt-Advanced-Docking-System
     REF "${VERSION}"
-    SHA512 d7b1501cd8d15aead7eca38172f3335d5a5f3165f948658df09016b773a870f024d16bf472ed7a65cb178408177a6af9db647892942818e53d044f67648e3435
+    SHA512 d06939e7c8a5ffb8398257889e0f393ac1d06b20fc4326327226334cbf1a3cf7bc1878a1d9d4cc73dd8f178982b6508e2aa8435f715d5a610914835fc318b471
     HEAD_REF master
-    PATCHES
-        qt.patch
 )
 
 if(VCPKG_CROSSCOMPILING)

package/vcpkg/ports/qt-advanced-docking-system/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "qt-advanced-docking-system",
-  "version": "4.0.3",
-  "port-version": 1,
+  "version": "4.2.1",
   "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio",
   "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System",
   "license": "LGPL-2.1-only",

package/vcpkg/ports/qt3d/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qt3d",
-  "version": "6.5.3",
+  "version": "6.6.1",
   "description": "Qt wrapper for existing OPC UA stacks",
   "homepage": "https://www.qt.io/",
   "license": null,

package/vcpkg/ports/qt5compat/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qt5compat",
-  "version": "6.5.3",
+  "version": "6.6.1",
   "description": "The module contains unsupported Qt 5 APIs",
   "homepage": "https://www.qt.io/",
   "license": null,

package/vcpkg/ports/qtactiveqt/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qtactiveqt",
-  "version": "6.5.3",
+  "version": "6.6.1",
   "description": "ActiveQt",
   "homepage": "https://www.qt.io/",
   "license": null,

package/vcpkg/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)
 

package/vcpkg/ports/qtapplicationmanager/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qtapplicationmanager",
-  "version": "6.5.3",
+  "version": "6.6.1",
   "description": "Qt component for application lifecycle management",
   "homepage": "https://www.qt.io/",
   "license": null,

package/vcpkg/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

package/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake

@@ -63,9 +63,9 @@ function(qt_download_submodule_impl)
             set(sha512 SHA512 "${${_qarg_SUBMODULE}_HASH}")
         endif()
 
-        qt_get_url_filename("${_qarg_SUBMODULE}" url filename)
+        qt_get_url_filename("${_qarg_SUBMODULE}" urls filename)
         vcpkg_download_distfile(archive
-            URLS "${url}"
+            URLS ${urls}
             FILENAME "${filename}"
             ${sha512}
         )

package/vcpkg/ports/qtbase/cmake/qt_port_data.cmake

@@ -1,47 +1,48 @@
-set(qtbase_HASH "31c6c01d466f1e01f18d6dcee593360c08ee83ad0a6be495a8eba023faad628cf07ce7285426fabfd247db306319e9a64da329682c99a712a282e32f7493cdb9")
-set(qttools_HASH "7e383cdc575400d19051232dc563eaf330209605f28a93ac01f32921d0d966bc9a51bb5b56fb8f5c00ed4aab5fa2806b3bd0c8750aa2f49f5a04c85fa68fe30b")
-set(qtdeclarative_HASH "d3fc2f01de9940cf8715cf525bc0c68555c5dc519b4a78952682c23bfc9c09249fb651c6e4dddac128b7e96f07e0371d3040b8f8c5480c8c3fccc4f3bfec2640")
-set(qtsvg_HASH "d9391228f4bce041e7c36711cf3d787b373bb2e470b0d21c903d57ee5aeef672289caf8a7e4c57455db105a510d36536c611ceca4f64c823bf795d0638e6a0d4")
-set(qt5compat_HASH "49146eb1591e89b1d62a3615d673a4a29db9d2540fac2b2d03eb29ad24ec77ba97f8209240e512252ff1d3083d21312d6142654993582e95a7e549c94e8bf45c")
-set(qtshadertools_HASH "fab49d5c7609b9bf81b98562d21e29d05f001a27d446efddec569033eaa322ab336057076a5f2713ea1941f4e716694a471b5ae81be0913bc19668136d7a9b68")
-set(qtquicktimeline_HASH "b177eecd5750dcc1ab29bfc4dd1aeb22a6b7e07dcb11683721abf18476da4ff740c9ea4c351aa5bf31e5c499b4c7da5be71b243cdd895a8f35df8178bb50bc93")
-set(qtquick3d_HASH "85611eba47239c342159e704826cdcb7ec2cd79118aaad081d4924c5697b71eddf4307682e9dde23bf973641df2e90301e26f381aa29c023e386918e8d1f7f70")
-set(qttranslations_HASH "d14d5c40fe93ba1ee29fe4150710a14122dafe91e5343d5461c7ed3157e3e220effd235cf894f75ec6c26a0e5ac81d75867faff4045456395d76221e70113004")
-set(qtwayland_HASH "e516dd5158ed1aadc989b3f1bbaad87fa38b59872b44c7c92ec1c349e7e923a6b07b7fb3a3493312330eaf581b0d27aeaad2ec03629523ee28e3627b7c30ea89")
-set(qtdoc_HASH "c8cb3a4f155bf697e9168d575f225ca3ab60d289c62c47db72997d01c81129e4c550f673edb60df02dededfa48028c43d5ee6723577db00e78fec188e1f32f22")
-set(qtcoap_HASH "385b60c5fb24087bb87cf468303456338897f15cc32570290603312e491943ab00f4d1f013952f6b883d3deabcc870906628101b1ecbc390371544b676c423af")
-set(qtopcua_HASH "e814a3acb00f2b0f17d92c8a5722aa47d3a5ee9863db294416eb0d42201ae7dab9c7bfa9a2c81531fb48f103b862bbee3f7000a889364241061543365986fd7a")
-set(qtimageformats_HASH "66b8e7385a1b0db77f81730bd97f7e3488eec32a24829c3b21746e89e6ff179a3feacc4d023f1e4e6864a6a7aba46aeb7f66dca7e76836881829a20bb9afbad7")
-set(qtmqtt_HASH "1d660864485540afdafde2b87ae6a27a39066201aedb61cde3d15af71f3325893d0a99ac9ac753182569b0fda21ba25d38478c46921e448050abec255f50a59c")
-set(qtnetworkauth_HASH "73f04a144cb08048532aa6638dcaae01e9cee07afce10e5371bfa96ac0aac4fe941d84b888eaa4599304bcae58172665319d3eda43c460ab7df9f1b0e5e37f09")
-set(qt3d_HASH "15fa46766ff8c8295bb2273dc528f1952a04d20c786ff62122594395a8f003a7bd07944928da472ec2463bed0e31d63af559391724f935bab70067f9009f1917")
-set(qtactiveqt_HASH "3bfc52d8484e869a9ab1b489f7616f76ba48b9ac951d34a5a2b299d4c96dc9e3519c885dd86393578d1bbfdf39b59e6b1cba37a1ecb634bf66cf49264d59b621")
-set(qtdatavis3d_HASH "4272007a13651d9bb38d8bee58a66ffe448a7e51be530f6d543e8bc688fd30143f426c5f5210ab6f5a8b1d3981b3570ca2ec13ecd4d0e27d039e1f094c6c1f20")
-set(qtdeviceutilities_HASH "89a8198898fe928abe528d1967226daefacdde3c2ff59ce58ea3add38396a26ac75468a193ee42a089dbbde5457024aaecb8be3eb94f074c3aa0189d6c17c2c1")
-set(qtlottie_HASH "a0e9cda4363ef72a74e4721472aed8266ac9810273ee6fbfdaf9ed5d82495de5e0471a4e521b33f784097694a3f7d42f0ce5a7d39d23781e2e270932230512e4")
-set(qtscxml_HASH "f4aeb2f07a203ef448124b3e988735b46ef38d7800cd60ba3db9c0e0b8a9e9aca44bc07a6d72de2951134200c29d902709a80b52fd030713159c8f1711b60731")
-set(qtvirtualkeyboard_HASH "f09d8f4c025a94768582d21598a6cc35647511439fa4136933d724954ddb1cab50335df5609a6e951593175faf03cfb233a8805c1bac90d7fda92cfe3f42b3f6")
-set(qtcharts_HASH "ce37650c0e1bacc5432a6549fe6cfa8db19b1164c05172802638b51858e9cfcf68a56b401a84ab8d576fe2e1bf4fb08fc1f9c96cecd7f8251b8562defb647b68")
-set(qtconnectivity_HASH "d0a8309143545689c7f6f545ae1aa8e1b4e516398bc6cc0d0f0ea3df6a414d6c933d32ae32451134d2a0d7d2c02078e8e46438b0aec59e938e4b8533d4da9457")
-set(qtpositioning_HASH "af3ee341b57029ff10270602a23bde0b922b1f43e0e152b0f091e4447099d34df0410df582261935f6397c121f48bf944cc057772de9c063e679755fae7c5d11")
-set(qtlocation_HASH "6633dedba335b8de4c96f98f4709a147e225e82fee1ed741938e15e1540421ad7c3140baec75914f0844a793433abcadaf3ce72d944662b62778327d65ff7348")
-set(qtmultimedia_HASH "6b32e79f1fac21dba6a1ca9f82cfde8acdf9b33d1a65439d4a972f98ea23c919ecbd26ee4c08ecdb7d2743cab346437f27a701e45426e47fa89e55d913fe50bf")
-set(qtremoteobjects_HASH "17cfc030c4d45b395ba20ff0cdc973d55ae75ba34ed200bd01c3fffb7650000c69b95f935bffb43930a3779c5f15cce09ecd716e2b1284f1e28768ce71dee969")
-set(qtsensors_HASH "beb2c13855c42486dcbdb2e4885bbe931ded284dee755ecab539149113e2e8fec0b1c20859c36d9fc59b8188dffcfb8b1f4fc9495e04a33c80d425a0322f7f10")
-set(qtserialbus_HASH "9806ad33b24f1798081bd88c2dcd821b62f7455826043586f37ad5b6f833eb8f82b2a5d3a5ac21df5e660b0097c58eaabad503f4c19f30acb511785335a7b147")
-set(qtserialport_HASH "2a36851281dbe13317f559567dd3cd8f2c8cc73aad9df22de71883790bf7b1f685bd65dc353cff65b212398b6a72d1c517c2cf15e0b41b93be1d0ed7646d7a76")
-set(qtwebchannel_HASH "cf9cf75b3df885676bbaa521b991dd176fba826a1cca8e3a524ea553df709ed5f4ccbdd8af19d952957b87bce2de4144c1f2222ab8fd4dbac04d240675b26e71")
-set(qtwebengine_HASH "8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49")
-set(qtwebsockets_HASH "0121865827101a73aa2957efa322fcd81bf80d9d9e92c2022fa5bdf94c782fb9997392e6da7523e65b51cfd38c255ee7eb87e2de0069016fc93c1383bd116345")
-set(qtwebview_HASH "bedc21846e1dacbd8493dfae9d779e3aba5530b99e7d5ee4fd48e299a498b0cb135a8ad7ccebb95de52fd7608d7b5aa23fecec50a13c09f7308750a26f89bc3e")
-set(qtinterfaceframework_REF 2bd16fa1d13f98bec2c4e559e1a0372d2948d832)
-set(qtapplicationmanager_HASH "b50e7533208706013d32a06030a520e467a6f3968195810ba5c3277ef2da7c86f8c5321905700aa5cd7cc6412fd4f1c7634ad9ab8f7e81ec1a634d395493e7d9")
-set(qtlanguageserver_HASH "7f67e645c176fb2addd7409a8e625d34cf06b1e798f26d1edaa3829a2c2491328b7736c78ec9388d4fc75fcc18718a064ad169e4a3981cd7b344f2337b1f28f5")
-set(qthttpserver_HASH "49b8f732d57358c64ca07e7dad4a84c6205a3066939596493ad0bde333b339db84c0d73573a04319bb4954d0f48bdad22447bb50ff48ad2d72f982f1f4340be9")
-set(qtquick3dphysics_HASH "dc2b19df44a182bf77d0e45250cb4a4485a2143bca8ca043965beb02678bf944fd1c0c34f7411048d69f25fbc496b190ae3d81010e43a7d4a7ee00c4e5cc622c")
-set(qtspeech_HASH "d37c68cb9599e8d9a81ac070a87ed5a942e15e01401b5e179b4127aa0894a272023d717f0fc5f5c167e2ff299f79d6a19f3594172cf9779b400ac218d9587508")
-set(qtgrpc_HASH "464bc51a597cbfcf1a4461a62453a7ce7bfa0e5744f88fd6a58904d2bc8bccef15fa7082407dcb51d322b9bb963d1d0238e2472e1b67629cc2d67e9c9543b200")
-set(qtquickeffectmaker_HASH "514d60b52937e49737afbec018919bf86793600f423076996bfb5def9d75031590816fa17bd04fa48d884c7dc73e25b41e1bfa5348e43bb30711374c29d64bda")
+set(qtbase_HASH "93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1")
+set(qttools_HASH "7f7bfaf7f01a5374f711c20113e9461b83a6f908b48c7b3f662f8821a70ef0c792f040f2e8e62a570fec06df2329fe5eb953c680424262b3678ab283045e6909")
+set(qtdeclarative_HASH "1a819187519670338df1c308d5980aed985670ee3e79a424e56d8e300855513541f46a1b89d9f595bdab382a0072761f0fda87d78653602041a10a5bd3e7bdcd")
+set(qtsvg_HASH "46ca0e90a864678bbf46ac9618aacd1c2265eb336a798f6f09ab39cbfa7b16267b8d842f36b01c58d482a319bcd2172e7cbf09c08cd767a9e89d9b6d89b4a417")
+set(qt5compat_HASH "2d5e2e40621590adb489dac4ae9a28fe8c2436de05dfe5aea47e449ae88ef82dd831e786d8290d04315c827f8adf217374ea5c6919ae12932496c5cd6ac28c01")
+set(qtshadertools_HASH "1cc6e1e003754dd665b5633c0e38bab749b7fa002d68d5fff9caef850895ea30145fcb2a10621c5a666297bba9b95fcfaeb047b849b02f1992de3299cd675c03")
+set(qtquicktimeline_HASH "c35c19d67ea0fcb3e052a35207a7e6a42a4c7b6784e2a33c7e9928735a56085f1cc3b4aeead428ccc9149bb74b7c70db1a94f6ab79101e6dd77dcffef937ba86")
+set(qtquick3d_HASH "1a663920b3d2010de1b38ed559a2391d31a5c42dfdb0c414723acdf778c1fce2f6f74295bb260201d0a9ac64ff30570599e8d8b97229f6c5f33229a19a1fe763")
+set(qttranslations_HASH "727d3cf53dc80754771318b2d0f32ad09e5d5f02127d5003ee3f9685bf5742d19efe3e3c1ee03d4def908b23173f0417e4115376474d3a8d7f05062960565850")
+set(qtwayland_HASH "7f6533754daad7a2804ddddcd5139608c2b8f1ef92ae8a238c1ed4fc41c8a3ee532da0b2e57266d07d4d39d1ec6c83eca487c73788a108af30035b0dae262c76")
+set(qtdoc_HASH "151727a9d578cddf0f922d7429c46fd1983419832dcb0163f82b0c7333e8f3ba5e9f810cc4070de03f1ac959aa0a3253999fdd1f7e1d451cf2169e5394cfafc1")
+set(qtcoap_HASH "0c094b7743cb675ea92cc2e16dacc44b29bb060b5fa083208c123089b82092672b7877775e335e8dd148d700b8a13475f2ca5e061888a06f5c1844a02aa1b09c")
+set(qtopcua_HASH "59cb047bd647d0418ffd10e576d8ba42c363a9a9eb62122a8b49161df6c8b8c19d30f535687e39b3a4b0ee885374a187bf60873bdfe387ccf320eba52435718a")
+set(qtimageformats_HASH "da72e093b86638da5e5a5bd78a4ca88b72675d6294ad2af4b516affe88212ccc797ea859784b1f548c75c82fe926d3cd8f96a88901b475d60dc0dc30cfedb5a0")
+set(qtmqtt_HASH "ba23048e80faae1c8cc34cb1c4731b19cd4f5c394fa190443cedfe06b6754d1f59cf7110a230deb4d6c065db14d14b035c3f86058caf62e8d0bac12cdc9cfa02")
+set(qtnetworkauth_HASH "8d52344802ed6e9e6b60f1367ee9f9c2d495908a3992fa03f67d551c090cc837d02a560ba8e4244b739610b8ded0cb1bdc84ffa3f4183a6aa89df3b42310409f")
+set(qt3d_HASH "c924ded219fb6a6f49eff83b41f9d290119f99e9910521098c6d979282ebfe1dab32afdd7a249fdedecad26a8683776087ef15b5657976e2ae85de7319c67c19")
+set(qtactiveqt_HASH "653d8e634cead141b2f53f0c2339a36ffe254b046e514d5ad4f1453acf6bce73a2bb0d38b95f78a30a5cf0f59511fcb99a2464033551c4cbe775e0d25e10a7d0")
+set(qtdatavis3d_HASH "a4d1b3b705e87b883b5cab94798c459d6151b4c560038f26ec2633998e2a18d176d7718ea876bba63b21bb61732d8e3a2097793b9f2ba57c382b40f2ca3f270c")
+set(qtdeviceutilities_HASH "8ed34c952e31edc8e90928df3a992ae85edc5401108ad0d24fe2141336d873e776c406b90155a5da6a5fa06abd09cd4d226e5befdc32fa3b04904c5dd2d5a2c0")
+set(qtlottie_HASH "ee7f2253610dec22f55ce6f1eb2479e5c26137c55ca705716961f53fa6296cae6fa6a982911131eb42f451bf59db6f17c4e0fb8725a81d12b259e253da39a779")
+set(qtscxml_HASH "3c4b117138e9437a0e7b3f212e3a77aaf42c9fcbfdb30db0693e3fbf1562c68a88558951ff627dc9e91ff10625f3b269d115479e83cada46b9f9094f3d51e5a7")
+set(qtvirtualkeyboard_HASH "9b12e3dc6bab0ae1dd86c4b2ff1b8dbff3477b2a2a17a123f34874a59aa02f3ae6ccc550046d1f3976e010ba74b4534667366498b1aa3604ac1d380db326740f")
+set(qtcharts_HASH "1af5cb891454af3b0218e3475576609d438cbbbf9b52b2e614d1016cec8aff5b453d33964574b898ed70dff9ba78b17c1c5a0a186f508116ee721efc4e410778")
+set(qtconnectivity_HASH "b1a1962d881c1965c56cef5226b3eac39613332c96778daf322fa0ccba9aa33677e1943f3bb3f7efbdd8aec81623ca6b59c2340c805346935ef77e7606210dab")
+set(qtpositioning_HASH "8114d9cec0e453ff51fdbe8b1a814c968e614e1f9aaf031bf00c0c48e732de728d925852789360411c594f63ae322404fc9403d0bc3a35500522d8dc403d79e2")
+set(qtlocation_HASH "aa820e84efe3576bf483cd7d64a3b930f731c88324d34cc1486312c1cb0107a726dea91dc226562f017695300f0d656228d947d97374747c3ac6ae597cda6bb5")
+set(qtmultimedia_HASH "11fb3e421a80fee82d30a817f20277505868de0c1a870c55dd488114a0302f6a1bf41694ed64d904e4d29b1a3ad1ba01ce8399ae11f03ae2f6994359698e9c94")
+set(qtremoteobjects_HASH "92d2ae9fa1f8ddff0e68bcaf54c9298ff54c7146fdf9e57ab60668057067797ecd1d72a08c5db827942985423075116d55213689114230c1bfa632e63756478b")
+set(qtsensors_HASH "962f8947bbf21bd08c4b1a7da367fca1d0ec934a32a9820280730efa3f7e8b377a9f547bc91d4373d321ba74a147b7913bdf153599183b21f2ef10730132bb06")
+set(qtserialbus_HASH "11245960ab411a490bbc70388f35b4f9109df43d87882da3af4994a5c0e415f052ec86f3e16931ebd4adf3d980f7fa9e3dcfc2791e6f7aebdd0eba6f32622ea2")
+set(qtserialport_HASH "5841f6227725ed61a6e88f5359c0c75ff9192a66e916cc93a8028b03c2689dd10ea8f339a67cd0a26b55b44495880b3032ea1d5d99b716342912195a9b10516a")
+set(qtwebchannel_HASH "027b22f8edfc3285199272bf367254749ed99de5a1f3724967e765c76cb3ba2e9946746414e9fac8e52ea12a52717b1da0186ddf0ac5d6e3588796c0b9592772")
+set(qtwebengine_HASH "d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0")
+set(qtwebsockets_HASH "0b067c263887002f415326c013a7c83634403ac486f9696a81ac601c7be421bd8a1fc97a86f10abb369fac9e4661d54571aaf559565125a1fa8005a718950559")
+set(qtwebview_HASH "cb3093b233b3c77690be4c0c7cb7c7facd2d62c5a20f5f490a7881d97216ba13320e208dc74b7c02899250caa3d643b70c7ae5996ae15d2b2167fe4619046d3b")
+set(qtinterfaceframework_REF 	a2085374e38a135eaacfe7533888f0a361d4c721)
+set(qtapplicationmanager_HASH "a6c291d63e911f5344bd5a8fa6149e361402167c1c7c3a1672e5731ac664e01131b6f8f7b31ce6cbada7a0ec91d1aa6c9af7f9ef5125870a569c7e6bd4cf80dd")
+set(qtlanguageserver_HASH "35b5c9419ca426643564a5df4bed16f586bb6841ecdf28dbd626fb1ab70f1cbd0f1da9a4e2f03a3829e68139b059d731b193bde5fe493cbc955303cb7f33086b")
+set(qthttpserver_HASH "f851c8f5ea9cd4067474dee30ca797a2acb70ecaab2d993afe6abba3622fe3139acc6245b78f7d12b7e5dca5fc90aabd5144a3429c58a5f13cf23c6fbb023c24")
+set(qtquick3dphysics_HASH "84d898ae8fa73b4ef941c16c29ca26044e680d2ab447026423ca30bf0c495cffef2753463bbf7b52228c4631ef239625982b7d3ccbc116d78d3af27378b8bf55")
+set(qtspeech_HASH "79a2f9192585efbea0567648e4dcbf8f36f31f28463b031378a5027c036870c67b7b15c1223fbf838fae7f8e5b036fb29ca0a631cb7d19b0a40c55588b34d5a5")
+set(qtgrpc_HASH "9fb537dab8ad79cac2b076989952decdeebe40c1a0fceebe3dd70ee1f1e60c679d0314637998bb36f1d0f35c894896358e77d87c1c9f832283b4a8943352317a")
+set(qtquickeffectmaker_HASH "4f61a66cd01691d5318331b3a96cdc0d6ea902ed293ab93d45fb72ce0cec5cf5df0e4877cba09114c5ff6169cfa13e0fe41eb15dc48070ad4ed81c22739fe482")
+set(qtgraphs_HASH "9f768ed53ae696ba15321b8de5658cea9a989dbdea276712ba5bc057048a13fae2b1913994dc77da1456896beb52c4644054777db1319f9c4a4dfa012bc2ba44")
 
 # Keep for beta/rc
 #set(qttools_qlitehtml_REF       bd70f93ce41443a6a90a269531393f575685283e)

package/vcpkg/ports/qtbase/cmake/qt_port_details.cmake

@@ -7,7 +7,7 @@
 ## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake
 ## 7. Set QT_UPDATE_VERSION back to 0
 
-set(QT_VERSION 6.5.3)
+set(QT_VERSION 6.6.1)
 set(QT_DEV_BRANCH 0)
 
 set(QT_UPDATE_VERSION 0)
@@ -90,6 +90,18 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.5.0)
              qtquickeffectmaker
              )
 endif()
+if(QT_VERSION VERSION_GREATER_EQUAL 6.6.0)
+    list(APPEND QT_PORTS
+             ## New in 6.6.0
+             qtgraphs
+             #qtvncserver # only commercial
+             #qtinsighttracker
+             )
+endif()
+#qtinsighttracker
+#qtvncserver
+#qtgraphs
+
 # 1. By default, modules come from the official release
 # 2. These modules are mirrored to github and have tags matching the release
 set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager)
@@ -101,23 +113,31 @@ set(QT_FROM_QT_GIT qtinterfaceframework)
 #set(QT_FROM_QT_GIT ${QT_PORTS})
 #list(POP_FRONT QT_FROM_QT_GIT)
 
-function(qt_get_url_filename qt_port out_url out_filename)
+function(qt_get_url_filename qt_port out_urls out_filename)
     if("${qt_port}" IN_LIST QT_FROM_GITHUB)
-        set(url "https://github.com/qt/${qt_port}/archive/v${QT_VERSION}.tar.gz")
+        set(urls "https://github.com/qt/${qt_port}/archive/v${QT_VERSION}.tar.gz")
         set(filename "qt-${qt_port}-v${QT_VERSION}.tar.gz")
     elseif("${qt_port}" IN_LIST QT_FROM_GITHUB_BRANCH)
-        set(url "https://github.com/qt/${qt_port}/archive/${QT_VERSION}.tar.gz")
+        set(urls "https://github.com/qt/${qt_port}/archive/${QT_VERSION}.tar.gz")
         set(filename "qt-${qt_port}-${QT_VERSION}.tar.gz")
     else()
         string(SUBSTRING "${QT_VERSION}" 0 3 qt_major_minor)
+
         if(NOT QT_DEV_BRANCH)
-            set(url "https://download.qt.io/archive/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+            set(branch_subpath "archive")
         else()
-            set(url "https://download.qt.io/development_releases/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+            set(branch_subpath "development_releases")
         endif()
+
         set(filename "${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+        set(mirrors
+            "https://download.qt.io/"
+            "https://mirrors.ocf.berkeley.edu/qt/"
+        )
+        set(url_subpath "${branch_subpath}/qt/${qt_major_minor}/${QT_VERSION}/submodules/${filename}")
+        list(TRANSFORM mirrors APPEND "${url_subpath}" OUTPUT_VARIABLE urls)
     endif()
-    set(${out_url} "${url}" PARENT_SCOPE)
+    set(${out_urls} ${urls} PARENT_SCOPE)
     set(${out_filename} "${filename}" PARENT_SCOPE)
 endfunction()
 
@@ -145,9 +165,9 @@ if(QT_UPDATE_VERSION)
             string(SUBSTRING "${out}" 0 40 tag_sha)
             string(APPEND msg "set(${qt_port}_REF ${tag_sha})\n")
         else()
-            qt_get_url_filename("${qt_port}" url filename)
+            qt_get_url_filename("${qt_port}" urls filename)
             vcpkg_download_distfile(archive
-                URLS "${url}"
+                URLS ${urls}
                 FILENAME "${filename}"
                 SKIP_SHA512
             )

package/vcpkg/ports/qtbase/fix-host-aliasing.patch

@@ -0,0 +1,17 @@
+diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
+index 180ec33..a03e3b1 100644
+--- a/cmake/QtTargetHelpers.cmake
++++ b/cmake/QtTargetHelpers.cmake
+@@ -281,10 +281,10 @@ function(qt_internal_add_target_aliases target)
+     set_target_properties("${target}" PROPERTIES _qt_versionfull_alias "${versionfull_alias}")
+ 
+     get_target_property(type "${target}" TYPE)
+-    if (type STREQUAL EXECUTABLE)
++    if (type STREQUAL EXECUTABLE AND NOT TARGET "${versionfull_alias}")
+         add_executable("${versionless_alias}" ALIAS "${target}")
+         add_executable("${versionfull_alias}" ALIAS "${target}")
+-    else()
++    elseif(NOT type STREQUAL EXECUTABLE)
+         add_library("${versionless_alias}" ALIAS "${target}")
+         add_library("${versionfull_alias}" ALIAS "${target}")
+     endif()

package/vcpkg/ports/qtbase/fix_cmake_build_type.patch

@@ -0,0 +1,24 @@
+diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in
+index 21c40f2..c212148 100644
+--- a/cmake/QtBuildInternalsExtra.cmake.in
++++ b/cmake/QtBuildInternalsExtra.cmake.in
+@@ -162,6 +162,7 @@ function(qt_internal_force_set_cmake_build_type_conditionally value)
+     # STREQUAL check needs to be expanded variables because an undefined var is not equal to an
+     # empty defined var.
+     if("${CMAKE_BUILD_TYPE}" STREQUAL "${CMAKE_BUILD_TYPE_INIT}"
++        AND NOT DEFINED CACHE{CMAKE_BUILD_TYPE}
+         AND NOT __qt_toolchain_cmake_build_type_before_project_call
+         AND NOT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE
+         AND NOT __qt_internal_extras_is_multi_config)
+diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake
+index 762299f..f104479 100644
+--- a/cmake/QtSetup.cmake
++++ b/cmake/QtSetup.cmake
+@@ -56,6 +56,7 @@ get_property(QT_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CON
+ # See also qt_internal_force_set_cmake_build_type_conditionally which is used
+ # to set the build type when building other repos or tests.
+ if("${CMAKE_BUILD_TYPE}" STREQUAL "${CMAKE_BUILD_TYPE_INIT}"
++    AND NOT DEFINED CACHE{CMAKE_BUILD_TYPE}
+     AND NOT __qt_auto_detect_cmake_build_type_before_project_call
+     AND NOT __qt_build_internals_cmake_build_type
+     AND NOT CMAKE_CONFIGURATION_TYPES)

package/vcpkg/ports/qtbase/portfile.cmake

@@ -12,6 +12,7 @@ set(${PORT}_PATCHES
         allow_outside_prefix.patch
         config_install.patch
         fix_cmake_build.patch
+        fix_cmake_build_type.patch
         harfbuzz.patch
         fix_egl.patch
         fix_egl_2.patch
@@ -19,6 +20,7 @@ set(${PORT}_PATCHES
         GLIB2-static.patch # alternative is to force pkg-config
         clang-cl_source_location.patch
         clang-cl_QGADGET_fix.diff
+        fix-host-aliasing.patch
         )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
@@ -117,6 +119,11 @@ list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON)
 list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON)
 list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON)
 list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON)
+list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapBacktrace:BOOL=ON)
+#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapAtomic:BOOL=ON) # Cannot be disabled on x64 platforms
+#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapRt:BOOL=ON) # Cannot be disabled on osx
+list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON)
+list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON)
 
 # Network features:
  vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_NET_OPTIONS
@@ -138,6 +145,7 @@ endif()
 
 list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libproxy:BOOL=ON)
 list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON)
+list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapResolv:BOOL=ON)
 
 # Gui features:
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
@@ -156,7 +164,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
     "xrender"             FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled. 
     "xrender"             FEATURE_xcb_native_painting # experimental
     "gles2"               FEATURE_opengles2
-    #"vulkan"              CMAKE_REQUIRE_FIND_PACKAGE_Vulkan
+    #Cannot be required since Qt will look in CONFIG mode first but is controlled via CMAKE_DISABLE_FIND_PACKAGE_Vulkan below
+    #"vulkan"              CMAKE_REQUIRE_FIND_PACKAGE_WrapVulkanHeaders 
     "egl"                 FEATURE_egl
     #"fontconfig"          CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig
     #"harfbuzz"            CMAKE_REQUIRE_FIND_PACKAGE_WrapSystemHarfbuzz
@@ -239,7 +248,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS
     "sql-oci"             CMAKE_DISABLE_FIND_PACKAGE_Oracle
     )
 
-set(DB_LIST DB2 Interbase)
+set(DB_LIST DB2 Interbase Mimer)
 foreach(_db IN LISTS DB_LIST)
     list(APPEND FEATURE_SQLDRIVERS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${_db}:BOOL=ON)
 endforeach()
@@ -317,15 +326,16 @@ file(COPY
 file(CONFIGURE OUTPUT "${CURRENT_PACKAGES_DIR}/share/${PORT}/port_status.cmake" CONTENT "set(qtbase_with_icu ${FEATURE_icu})\n")
 
 set(other_files qt-cmake
-                 qt-cmake-private
-                 qt-cmake-standalone-test
-                 qt-configure-module
-                 qt-internal-configure-tests
+                qt-cmake-private
+                qt-cmake-standalone-test
+                qt-configure-module
+                qt-internal-configure-tests
+                qt-cmake-create
                  )
 if(CMAKE_HOST_WIN32)
-    set(script_suffix .bat)
+    set(script_suffix ".bat")
 else()
-    set(script_suffix)
+    set(script_suffix "")
 endif()
 list(TRANSFORM other_files APPEND "${script_suffix}")
 
@@ -363,6 +373,7 @@ foreach(_config debug release)
                 string(REPLACE "../share/" "../../../share/" _contents "${_contents}")
             endif()
             string(REGEX REPLACE "set cmake_path=[^\n]+\n" "set cmake_path=cmake\n" _contents "${_contents}")
+            string(REGEX REPLACE "original_cmake_path=[^\n]+\n" "original_cmake_path=does-not-exist\n" _contents "${_contents}")
             file(WRITE "${target_file}" "${_contents}")
         endif()
     endforeach()

package/vcpkg/ports/qtbase/qt.conf.in

@@ -5,7 +5,7 @@ Libraries=@REL_PATH@lib
 Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins
 Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml
 Documentation=doc/@QT6_DIRECTORY_PREFIX@
-Binaries=@REL_PATH@bin
+Binaries=tools/Qt6/bin
 LibraryExecutables=tools/Qt6/bin
 ArchData=share/Qt6
 Data=share/Qt6
@@ -18,7 +18,7 @@ Libraries=@REL_PATH@lib
 Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins
 Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml
 Documentation=doc/@QT6_DIRECTORY_PREFIX@
-Binaries=@REL_PATH@bin
+Binaries=tools/Qt6/bin
 LibraryExecutables=tools/Qt6/bin
 ArchData=share/Qt6
 Data=share/Qt6

package/vcpkg/ports/qtbase/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "qtbase",
-  "version": "6.5.3",
+  "version": "6.6.1",
+  "port-version": 1,
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -390,7 +391,10 @@
       "description": "Thread support; provides QThread and related classes."
     },
     "vulkan": {
-      "description": "Enable Vulkan support"
+      "description": "Enable Vulkan support",
+      "dependencies": [
+        "vulkan"
+      ]
     },
     "widgets": {
       "description": "Qt Widgets",

package/vcpkg/ports/qtcharts/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qtcharts",
-  "version": "6.5.3",
+  "version": "6.6.1",
   "description": "QtCharts module",
   "homepage": "https://www.qt.io/",
   "license": null,

package/vcpkg/ports/qtcoap/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qtcoap",
-  "version": "6.5.3",
+  "version": "6.6.1",
   "description": "Qt CoAP client module",
   "homepage": "https://www.qt.io/",
   "license": null,

package/vcpkg/ports/qtconnectivity/portfile.cmake

@@ -5,6 +5,8 @@ set(${PORT}_PATCHES)
 
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      CONFIGURE_OPTIONS
+                      -DCMAKE_DISABLE_FIND_PACKAGE_BlueZ:BOOL=ON
+                      -DCMAKE_DISABLE_FIND_PACKAGE_PCSCLITE:BOOL=ON
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )

package/vcpkg/ports/qtconnectivity/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qtconnectivity",
-  "version": "6.5.3",
+  "version": "6.6.1",
   "description": "Qt Connectivity",
   "homepage": "https://www.qt.io/",
   "license": null,

package/vcpkg/ports/qtdatavis3d/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qtdatavis3d",
-  "version": "6.5.3",
+  "version": "6.6.1",
   "description": "Qt 3D data visualization framework",
   "homepage": "https://www.qt.io/",
   "license": null,

package/vcpkg/ports/qtdeclarative/portfile.cmake

@@ -25,6 +25,7 @@ vcpkg_buildpath_length_warning(44)
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      TOOL_NAMES ${TOOL_NAMES}
                      CONFIGURE_OPTIONS
+                      -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )