This commit is contained in:
Alexander Neumann 2024-11-22 23:05:29 +01:00 коммит произвёл GitHub
Родитель ded511cf49
Коммит ed03146c54
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
114 изменённых файлов: 531 добавлений и 209 удалений

Просмотреть файл

@ -301,7 +301,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR"
"${CURRENT_PACKAGES_DIR}/include/GL"
)
if(NOT VCPKG_TARGET_IS_LINUX AND "plugins-base" IN_LIST FEATURES)
if("plugins-base" IN_LIST FEATURES)
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include/gst/gl/gstglconfig.h"
"${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gl/gstglconfig.h"
)
@ -410,6 +410,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
endif()
endif()
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gstreamer-gl-1.0.pc")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gstreamer-gl-1.0.pc" [[${libinc}]] "")
endif()
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gstreamer-gl-1.0.pc")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gstreamer-gl-1.0.pc" [[${libinc}]] "")
endif()
vcpkg_fixup_pkgconfig()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

Просмотреть файл

@ -1,6 +1,7 @@
{
"name": "gstreamer",
"version": "1.24.7",
"port-version": 1,
"description": "GStreamer open-source multimedia framework core library",
"homepage": "https://gstreamer.freedesktop.org/",
"license": "LGPL-2.0-only",

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qt",
"version": "6.7.3",
"version": "6.8.0",
"description": "A cross-platform application and UI framework.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -31,5 +31,6 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES}
-DFEATURE_qt3d_fbxsdk=OFF # OpenFBX? Probably not!
-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
CONFIGURE_OPTIONS_RELEASE
-DCMAKE_TRY_COMPILE_CONFIGURATION=Release
CONFIGURE_OPTIONS_DEBUG
)

Просмотреть файл

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

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qt5compat",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt 5 Core Compat module contains the Qt 5 Core APIs that were removed in Qt 6. The module facilitates the transition to Qt 6.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

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

Просмотреть файл

@ -12,6 +12,7 @@ set(TOOL_NAMES appman
appman-packager
appman-qmltestrunner
appman-launcher-qml
appman-package-server
package-uploader
)
@ -22,19 +23,18 @@ endif()
set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
qt_cmake_configure(${_opt}
OPTIONS
qt_cmake_configure(OPTIONS
-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
-DINPUT_libarchive='system'
-DINPUT_libyaml='system'
-DFEATURE_am_system_libyaml=ON
-DINPUT_libyaml='system'
-DFEATURE_am_system_libarchive=ON
-DINPUT_libarchive='system'
-DINPUT_libdbus='no'
-DINPUT_libbacktrace='no'
OPTIONS_DEBUG
OPTIONS_RELEASE)
-DINPUT_systemd_watchdog='no'
-DINPUT_widgets_support=ON
TOOL_NAMES ${TOOL_NAMES}
)
### Need to fix one post-build.bat; Couldn't find the place where it gets generated!
if(VCPKG_TARGET_IS_WINDOWS)
@ -64,4 +64,18 @@ qt_install_copyright("${SOURCE_PATH}")
# CONFIGURE_OPTIONS_DEBUG
# )
file(GLOB_RECURSE qttools "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/*")
if(NOT qttools AND VCPKG_CROSSCOMPILING)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/")
endif()
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_CROSSCOMPILING AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin/"
"${CURRENT_PACKAGES_DIR}/debug/bin/"
"${CURRENT_PACKAGES_DIR}/tools/"
)
endif()
set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) #Debug tracing libraries are only build if CMAKE_BUILD_TYPE is equal to Debug

Просмотреть файл

@ -1,9 +1,10 @@
{
"name": "qtapplicationmanager",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt component for application lifecycle management",
"homepage": "https://www.qt.io/",
"license": null,
"supports": "!(windows & x86)",
"dependencies": [
"libarchive",
"libyaml",
@ -14,12 +15,16 @@
},
{
"name": "qtbase",
"default-features": false
"default-features": false,
"features": [
"widgets"
]
},
{
"name": "qtdeclarative",
"default-features": false
},
"qthttpserver",
{
"name": "qtwayland",
"default-features": false,

Просмотреть файл

@ -73,31 +73,3 @@ index 24a194c..91c8e41 100644
include(FeatureSummary)
set_package_properties(GLIB2 PROPERTIES
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index 7d52f48..2b1b221 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -25,7 +25,7 @@ endif()
qt_find_package(WrapSystemDoubleConversion
PROVIDED_TARGETS WrapSystemDoubleConversion::WrapSystemDoubleConversion
MODULE_NAME core QMAKE_LIB doubleconversion)
-qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE_NAME core QMAKE_LIB glib)
+qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE MODULE_NAME core QMAKE_LIB glib)
qt_find_package(ICU 50.1 COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data
MODULE_NAME core QMAKE_LIB icu)
diff --git a/src/network/configure.cmake b/src/network/configure.cmake
index aef7f15..21b0c1d 100644
--- a/src/network/configure.cmake
+++ b/src/network/configure.cmake
@@ -10,8 +10,8 @@
qt_find_package(WrapBrotli PROVIDED_TARGETS WrapBrotli::WrapBrotliDec MODULE_NAME network QMAKE_LIB brotli)
qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy MODULE_NAME network QMAKE_LIB libproxy)
qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI MODULE_NAME network QMAKE_LIB gssapi)
-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE_NAME core QMAKE_LIB gobject)
-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

Просмотреть файл

@ -3,8 +3,8 @@ index e40cd85..ba68a01 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -18,6 +18,7 @@
#endif
#include <QtCore/qscopeguard.h>
#include <QtCore/qttypetraits.h>
+#include <type_traits>
#include <array>

Просмотреть файл

@ -1,49 +1,48 @@
set(qtbase_HASH "99495c6ed942b3a7bd19f9471bac76502baaafc20ad7e139adf25726f699c1b4deffa1ab761fe9a49a3ffe6a36d830422a20f8a369aded67a083652bf4a19290")
set(qttools_HASH "c15a76a84e8cea53e8c68b00325acf2cd3fe8097c578f3e96fbb68958453116f02fed25d2811d4485b82f196b988870f0078aea0450c4526523fb8ffacbfae57")
set(qtdeclarative_HASH "54e9b262b07c80eb6530da3e980319edd7370cc90f4241ebaf22a73e1f7f4f14177cea06276a0d3b2b553c6ed0825be0c56b9e2ddca53e99db57b67c3ad4bb47")
set(qtsvg_HASH "4113d12b3662d37e1119f4f506b3b0c6712fc0718ce7840e92acd300990ad4ac6a753e839b4adc91fc1ef7dc938fc517340f990bd7b89636a42d40a25f8f4bdb")
set(qt5compat_HASH "5a9cdf6cc4d56c2576e68aaf1c68f59a6f0b7655685235876dd2916506afb11253a8fc88c8b1e7756533c39bf42263499f7fc2ef72ad6ba672a45a55cc7048a3")
set(qtshadertools_HASH "751c1e321c98a8074a9c071f7484a840ce1b0cee44b0c355c33df0e496d277fa2c1ed26e68d46412fd9c2be6231946d97c57b31601b841f65e4b8dff166e106d")
set(qtquicktimeline_HASH "e01acaad6080bec84b1efdf33c71859c609dd3a9b3e5a4af57384e9ad6b875a8ba9e426a62cea90ac51f0adf842d5e6abbcd6ec0453fba45133c39408e365816")
set(qtquick3d_HASH "cdfc34521a201325ee0d41dfb5608fc9deca6c27d71d27e170d147a53fad808c4e70ee67b5c7598c8685b8c534dd5fa8460f436ae4e7a208b7d5be27bf1631d5")
set(qttranslations_HASH "06c9ac70c77de52e750315bb74c5ad580c154805b924a95387bbac1297ca04df643f69e3ada74bd027071b179cf009927a1c0db8825104bb355036402092c405")
set(qtwayland_HASH "9e15f3798ae7738b69e367343ffd7992fcdaebeffbcb10414fe2f24be553ca63e5504ef0a8405348702d0581dabebd1c2360728f63757c7445900b04df5e9ad7")
set(qtdoc_HASH "faed302aa21e565c8a2222f34a9c3b003eee784a095c6756f4385d7715d507b647d8519a2ddf9e58ef2923a8f04b0b7a22bfe5fd97ba5480ebe302a29c47274d")
set(qtcoap_HASH "298ca42855c664b85636d1ce3482ef345672421a15f1dd0781e99c2dd3d3c4344e18ad5a440a4188a93616f5d5712a078044b356b0f5c0d051d3d5382dbeee9e")
set(qtopcua_HASH "dccd571d9764da8beda5942db8cb3577049ee0d7efd162e25008314089a1e67b17d3d46e7d868f933823d7f4f54d52e0cd277f1cbf6d6703f2745992200f0df3")
set(qtimageformats_HASH "ca4ef39cc0bdf53ff00ff870301ec184c52bb7db422eb04011926b03bedac22ba9c9426c75cb124d0016d2e70a108383c57c6826cc9e2c5d62adcd2f68db6471")
set(qtmqtt_HASH "f77b058d9a33a9006f349bdefc851d5128e37ec5ff5ebbcab2b7414ea2668cc5f869b29b9f0b3e3a72f205c658d4053b54959d918dce43a5d58db7f056193e1f")
set(qtnetworkauth_HASH "f5eacb898423bcee0b063f70bf227ef954702b281964dbf182a2e280ef98d203fd88e2696c5f6f45f62b0a6a2e6b9a33f968c71f63b02647e57c475c4c37f6df")
set(qt3d_HASH "8337c68e99a634e367899a49ce6aa51b98443c5f5e9c7487e1e79b0f2988d6543c78d8cf5e305506703d196032664a1dad33073530a10a5999ad623c6f7af98d")
set(qtactiveqt_HASH "b18186cc99d487487352714f6a351f73c3c51b768e186f11c5c35f5e92b29432a7972d12d6751e7bb1f09d03743d46dfe81d2dba335e243b50b33ea880396626")
set(qtdatavis3d_HASH "0b0835e36deff4dcb7cf0eca9391fe5a4b92cb13d6273d7d2780f6cac1d6d07e388041fe02e453684d1cb7bf9603bb3625b09ed1d0396ff078948230955df3ab")
set(qtdeviceutilities_HASH "5f1cc33af33e7541e73ad9201cd12aa1ff8e1d4b9b0ab5632f07f9bac666a12777bd24cc98ad70ca3d59757b40822641c68e2742786a3f21b7c4568bcd2d25a1")
set(qtlottie_HASH "84c79b01de4411b3ff72d30928436b35c6b042fbb8f0cb794b3a9658a09b9d91daaba6d27a4f0434df372c3154f31f3b8671c836d2217aeb94a20f88648669c5")
set(qtscxml_HASH "d2d561f7a94d1fad2ad578b602c51c5f506bb0ea2c145647ea490399bac5995191c56ad62454775f15a2d3973e99cd220487ead3d5873163949b9ddd58bdada7")
set(qtvirtualkeyboard_HASH "cc08560c565289c43e9e89f247f9eb26eed6d678892681310728c639f6f70bdaa5947b436dfce437b8e0dd9d9386229a391f19587080f043e41a53f4fcf06067")
set(qtcharts_HASH "5e1e9387bee3a500a0178390ee827d76c58ac66486236e677e2854c3ea06011aadaaa08f742bdb0674b382209d54d30e8a0fa5f110d78c2b0dbeab49d46736e4")
set(qtconnectivity_HASH "46d77b7c02a03f8aee3401c889121ada5979858d95959ab4d7f31d54ce17c92c5f9c18097297baecc08c468c4f020a826b08edffb55e00e5d3fdaa0523600362")
set(qtpositioning_HASH "feb900f7371e712a63be6798f924d42e79676c317e18d1b347ae3cc870e9bf1003accc147dfeaa18d91ce6fdf2a7f3626c11a0419cb5058fa81f6f9ef17d6554")
set(qtlocation_HASH "e905001e5edd4aa6fc3e28e7d9e0461083706510ae652bb8329a3eb9d0ca6a8cbea75ded54538e35a1a9389d743a41a4d1834f29184d398bdbb1281c0f4f591a")
set(qtmultimedia_HASH "6c8c7c18ad71e32507af57456d1c11544f3e6c67c9cd3811a83fd0c20e12d6457ab294d91905e3911bdef1977ec1b535de82e9d92b2a38bd9eef7851e6349b5a")
set(qtremoteobjects_HASH "42b744dc946296bbd57ed31509b720285fd50760484243eede06ac25205fced40060601bef257745635ab4e15a59ddc8bd207dec52246adfde94078706d23e0f")
set(qtsensors_HASH "78ddb7cad68f37e7e6f1206c1f9db1b86ecba0806659a1049b562c45ed94439200230040a441e7e3c8cc5a17460e5e2e236cf42adfa88ff640f8aceb786c2288")
set(qtserialbus_HASH "fb032e65392ea6ee5e3edfe4dccbae3514493dca8fa5b3ffada18f0ce661475f847bc27e4c49573d360d55ed1bd17d4bb7e5faf5a31fc169a6984070c8fd8cae")
set(qtserialport_HASH "b5296a1494b9601d29b74518abade07274559eb2cade9cedd10e922bede0e759334a6982d799ea2438b0e3940e122a43fc07e0250e273d97c0307f9d9f0cac5b")
set(qtwebchannel_HASH "4cf329c865f9b9eb30584061a0cc684a014f6bdd8cc1f7cd037416cd6aacb386a8d16fe58b5c1c9854c3df4182fd6117ec6297e8d941d5215f0f86ad51f80180")
set(qtwebengine_HASH "f20769ac9b3f4a9fda9865c86d9dd2c779e404823d85aaf12cbbc425880352c19352ed39eb804a80a06a99e13582d22d45dbf2a8d7bbefea3592ff965b863cbe")
set(qtwebsockets_HASH "3dd1ed7a29c4bcc070241f465608a2f0b35142f73bc5cf0b3e964504a68da5a76002dabd4c6f14330f29200c8fb8d5e0ad46c5bc6de7af4889fd355796bce261")
set(qtwebview_HASH "d23ca95d252078a8b2dc4738298603a45384d88e0a4c0d4880ea7bf20195f0f6dfb201704cc7b7cb7127a702ec9b87b90a6e9d1f94a721efb291d7e50720cc26")
set(qtinterfaceframework_REF 4b0f0b7cf669b5be55a300ff8f5df457d4a6ec69)
set(qtapplicationmanager_HASH "ebe8ab7afbf1ede3d0ec4e3f0e5e604a811be9bf62e64159ae5ed1f81e4ae36d06f9e9a6ec6c74969e99ee260857a57bc37da2c182d7b36789387ca8d9fa2e16")
set(qtlanguageserver_HASH "29ade3d88c5c2d33cd777ffef87f1e7606664ab25194912f4a575c364f2621b99128e821d1685acc332671b77235a02c92333e4186a133b5f180e5b184bf7551")
set(qthttpserver_HASH "05238a97b9576f015a741446cfda434355fee8599975b5f4bf062bd28c63127d4bfbf52c4b84ff1f7b88def31200f4c3d298812a7eff5583546a5b925a390edf")
set(qtquick3dphysics_HASH "db437b74c6970badf197d0666923bd1927a0ff86d07dd2bbb341709eda28a2483e4307e9c773bd71b49c3493429a464ffd79f3ee2edd638f1e99f0292622e8dc")
set(qtspeech_HASH "b2b5a3b67160b75a679701eeac97587add53a1f8c2a2d120a61c54ead1d519d1fb726945fd2d4871b800f028e70f44e1079480322f71e2010c72b675b1cf935f")
set(qtgrpc_HASH "919ef9e97dfa6ae8d24a187eea0d0744099b991760f618cff0de25e025fbc3b9c1035ec7c2ff1893b20d6cde142fa849defb3738d06a430cbb97d344bdd5d146")
set(qtquickeffectmaker_HASH "afeaefa94fefda3a8d5561cb313f6094220dfd57af836a4e5e93cd381141bd52c43533e9ce284b152a5ccc3a798dc7b4401fe68d8d2c20df29aaf5ea71715061")
set(qtgraphs_HASH "3a74894ad37370a241fb7c866a5347ce43004623ab276bc2d571fd1e0a65739e6196ca2866c63ee3dcdfdfc6d020e1f9a3962fd64f21268bab23d30e12445b37")
set(qtbase_HASH "7bd9452d4cb85fad88e7d609de93e7c3d55ddd2ac47005c20aaaf057bf339d944b5211d1897d21f9896fe433b7c6954eaffd0e80e725b2f3335a047fe06b0cd9")
set(qttools_HASH "e477c980446fe421484481537fb9997eca6595dae19e9bc7809d24e7685efb802fb704c97bacc77214070e6b7a0f7346f1537cc143e3fccb309bf14e9c8e8d75")
set(qtdeclarative_HASH "4f1e26511265e7085bfe097435e64b4daa0bb4a8287f56753a64437a5eb408c0679afa03e255d1949e382b59496eff600cb0638a9b8cc95278d67ad5cfb9d52b")
set(qtsvg_HASH "fa5d0869dc17fb6d44343bddd2741ab7b9930dbb6ede53a1e60a816b5efb520d98a1aaf58a04e1f380e03d33b24070305256d6a255f21e575009099c3882404f")
set(qt5compat_HASH "c2304da058f0acf3120348dc179080a3dc28c9cf3605a22a2e8fe2816e9f0aea7e38b22966f59ee85ce52d4a8ddf5084a5fd24932f31e5b40cb64fc09dbca100")
set(qtshadertools_HASH "fc15e7df6806c29f7c185dfb81a83d45bc0e65887812e09432b992d0606eb0477a6897ee611d490f671d2b2f8f492e0a74a7271b2d0397b5d37596d6217a7b7b")
set(qtquicktimeline_HASH "165d3dcf82c1a37bff31ece9ba3c1441e9dc147e93409dd81b876ff96e7857981eec5ccb8b03beb2fa56163db6d96f346c30788efcc3a675839c4c11176440f9")
set(qtquick3d_HASH "961f38845a07cb3792a1dc2c15784f526eb4da4ab6bb69825f7708076acff323ab9364434ad1099ac79a0f047b094f1b9bcd41e038f9520bda3dc361dc2f9529")
set(qttranslations_HASH "436342c54ee6d7e0034e661a882b8b3ae16baa3e2b6cde7bf4c7d6b741f7624b7d0fdbe69697852eb3abe13f3f23f4701179b5b571df9acc9a6dff8a1f4d16dc")
set(qtwayland_HASH "6b2258928481813db7037bdbc817f57e14fc7ae66d2a791e03a4f1ebc1eea6ed36782206b3edcbf17e8fa0eb9f45f4d2583865b2b764e8ac303abac40764070c")
set(qtdoc_HASH "a8c236255105e8d0a18049ae04cbdfbc4a62c4f8d9173b984a003d39cdce8ac85d9d9f1c5fdaf74a58522ed5dbd56489eb1fdff00d5b63bee63a2879dcf40efc")
set(qtcoap_HASH "3b9b8a1b3a3fc8634ef5635655f9260c339dea07694fd44373563b49ea7b7e70607f912c9b42e08d5d02d94211969a3af686e74b720630b3c19f346816f0257c")
set(qtopcua_HASH "2c685a4db76cb8cb1802eaad888b97f71d0b42e991c4ca4c2034bdc2b66d4b43bce6c0d180d41b7eb8a6fd38174032303103616f8e9d064f8eca35af220deeda")
set(qtimageformats_HASH "87d7959a8e5507c22f450c98c28059f44ee1ed9a112c3f0d33689f9569c6d5e4ed9daca7f92ed2e39ccf55ae7d09f87c9fa5b9ac2f921a08d8ffd9cb51db9404")
set(qtmqtt_HASH "c22999a2671fb9fe801ec198cc09a12131581c0e6b232db550455a888f07c468ae2f50e1a11ef14cb1e2dbe5c47b947611c3764927bc77ddb819353dea8cd428")
set(qtnetworkauth_HASH "dab8efa74a150f559ee318b519aa44c815785638de60aab02a6d92845b84eec937c9134844f92a9664d7b15acb4d4e66cc62857c98d91f78ac9c95334c7343f7")
set(qt3d_HASH "27e23e3546b4f32be11eaa7e55d0bd1dfd7ef4a089cc4b7021b7bb0be93db118ebfe4ab71882d2b164e622b4cf9bc9fa7b4616b4df600cc7069ae6acb101e2ff")
set(qtactiveqt_HASH "6c03d2754ad2c1a8390a438099a4e80771cd01e5acb155aca6370eecf2b9896b78833fbbfc633301694d05985ba96a64b0a61983a4631b0974158ff2732fcf26")
set(qtdatavis3d_HASH "bcdc142d0944ced853bd08bca3f7618737e75867e3a2cfc4fc6c7694ae1a580a0d67c3f373d362dd4e57effa55761371b4450da08374497766657f96c108f381")
set(qtdeviceutilities_HASH "100d119e3323bad84b50e2a67c60b91863d8d766b0d59826e410c00ebe4d75f5155c5f0723da0f37a86adec2ca915a0bf55333e7f5d98449b9ddaf88c6cdfea3")
set(qtlottie_HASH "be3f0c633ff4c6e4c23962de638ed58dd949fbce09a82c49dca76a0266d59617988ed85fd6b93a97924b1a4f0a9c378b87f8bc87b0de363a8034c4c7a6028d3d")
set(qtscxml_HASH "8b045845c1cbb35e1c3c998b940e47b4c69d3cf17256805a1964f51675c6166db472c6a26f081519cbcf0f2ded78315580ffd2637b6c249f5bc7c6aa000f6c1b")
set(qtvirtualkeyboard_HASH "a01cfa1908a1932b1fb11c3efc7f3493f42cc9a6c80f56f1ef18b13677a9bbf3714bffd33e76465b90404b6b43d371de1778ed8dd38cac0b5288f36030e016db")
set(qtcharts_HASH "f422ea114571f6c01aa0af613614f40d6b11b0551c7de716ddaaba05ac44e9ca631648605e44af4a880961bbcab4b84a4f3a427fcc9462d33769cfb1c69456df")
set(qtconnectivity_HASH "c5c780c3f30d366d4845b4ce497ded6603423d0c42f025dd90d54342ff4b536d065d8d1541fa86ae9ca6fcde930e48cbef09216b8cbdabd73d864ce04a7979c9")
set(qtpositioning_HASH "481332f5c436a615681fb9f66ca1eb370f407cd7d258bbda72af1621583d292f9a68b149b6890ce119b450d071ce08808ae1b0aab28ccc498b9c341b52f2469d")
set(qtlocation_HASH "dcbeb6306c58b8809054be070fdcb00c8b3397c934bbd433d3e3152275cbbd662d67c9316a5724a229ec6e2874d5a2d33fa9693f1a0f0c4ffb294b92a0387d49")
set(qtmultimedia_HASH "1374db720141d09ca3081b5a7dd6d0f1b4457ab87096b4bfac0b9ab97de1dadf36ded5cf04ae01824fd9e16cfe7f45f45f2ebebc464696a348284462a731388e")
set(qtremoteobjects_HASH "5c7899a49daa6ce751394b829d3cf7d12e3cfa74f8fdde6ae9aa74d6346b273901e44700fca5873a957e49b9546ebc964a93fbb8152206723c873ce8139348c6")
set(qtsensors_HASH "bead813c30010a8ea65d1ec24c1907a15407283635cc6454c10bf47a4cf22dea6ea2c7e9b9e73870253ed5516f2959b241c17337875894554b2339496c9be057")
set(qtserialbus_HASH "c3712f8e4ae29c2f6d13a8e5f3093136a5b77b16b68808f5651a7cc31be87e1cb8e3fc518a20fae712da5bb2dfecd462d4eefa3cca2abb4713f8c953f5c11102")
set(qtserialport_HASH "7b55354f64178ec1d5735be2f4b29eab1eb37cd47483f608cb7c0faf18fb35d3989aaee18f67f14c2a446269eb1ee90bc31261333eb314bac63b780ce2a18509")
set(qtwebchannel_HASH "1110d8c5e93146ec23967bb77701f5054b9dc5e0307fc4a9cfb15e2bd3f2505b7bbfc5f07eba6c1c7b30854368c2d50415fd14d1d0871aa0b2d6ccbedce884b6")
set(qtwebengine_HASH "80137c6e1d9aaddddb5d81716acb2ddee620a1416e6318104ace377f0259906d3f79b0fbf9d57e13f581554bc14d7f13abc13396022406d3530f5d9014a7eed4")
set(qtwebsockets_HASH "d69a27da6e0d88d3908851ae3f4cf57ef0d4edb6429adaa7378e8857bee1c94a178973695a374e7143ee26d83476c3915d87d9ae4726c259fb93fa32ea595dc1")
set(qtwebview_HASH "00f3756bfeaccf010cc065e641c928997772c61c655948a54df07b5c27fac3dbc29d4fe49c1fc4794559a922844445045ba16c8f03719336ab64cace12728b57")
set(qtinterfaceframework_REF 5dea6d8357d7bb1ba4f29baf42357930952b4bec)
set(qtapplicationmanager_HASH "0e44795ba0175a7ec95289c76cf1ab850e109f1cdead116119e8ec047659a9058354841e5430d980caa1fd9c719a8323b468aaed39bf72f5f35c6b731815528b")
set(qtlanguageserver_HASH "717b9844cb86d5ee2e88d09b8764f47a290c4b13284361600e0e08d834c2d3957dde11ce9d1cc6b1025367e3bad1868cd3fdd0ed45056030c7cd037e79c67254")
set(qthttpserver_HASH "92afcbb3294a3734bf47e53d3088f67722c5a72839f3f3f7208894af9e8356fbdc5aadf7858acf24d98c9594bfe6e5ca93ccca6f4b2190b5ac635f1a80ab771b")
set(qtquick3dphysics_HASH "09e35d13bc4a6c079b4adab1557d3bf5cd0217e9e56b9760cb265fe52571cb1256db9fc397d7ac06862d76aef8757953360a96a16919c5241b1940ee4bc23c79")
set(qtspeech_HASH "d1e2597f5407775750378844a6daecb27da2c6ffe720e4008e11ade07f183ec4d64c0bd25845bef81d6d0c31f6dafe0df160265f952a050b72d88715379b7720")
set(qtgrpc_HASH "c79c843fc12e9eedbb94b26fcf98ee90fd0b2808d388b6d6d1399cd2513f53125f599f4a4abd6d9385a2466d808120b0318e3ac6521bd702d2c4cac8fdd7905f")
set(qtquickeffectmaker_HASH "4ea873bfc6f7889999fbc252a426bc2816195629acea3f4eaeda6f205ef550731f92f9f1e5fe6635dfdbe79e47d47771b62cd63ad49df963b12da184d9010702")
set(qtgraphs_HASH "5c6ceca4b9f0394889a1aefe5002c07c74190e9286be3d7d96a918525cf9a1cb9aa47098b2b46f7b8989c8670a5f31c119c6a13033e9ea1b182245b45529bce2")
# Keep for beta/rc
#set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e)

Просмотреть файл

@ -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.7.3)
set(QT_VERSION 6.8.0)
set(QT_DEV_BRANCH 0)
set(QT_UPDATE_VERSION 0)

Просмотреть файл

@ -0,0 +1,34 @@
diff --git a/src/corelib/time/qtimezonelocale_p.h b/src/corelib/time/qtimezonelocale_p.h
index 50e9fc37ef0..18c147c9b50 100644
--- a/src/corelib/time/qtimezonelocale_p.h
+++ b/src/corelib/time/qtimezonelocale_p.h
@@ -35,6 +35,6 @@ namespace QtTimeZoneLocale {
#if QT_CONFIG(icu)
QString ucalTimeZoneDisplayName(UCalendar *ucal, QTimeZone::TimeType timeType,
QTimeZone::NameType nameType,
- const QString &localeCode);
+ const QByteArray &localeCode);
#else
// Define data types for QTZL_data_p.h
diff --git a/src/corelib/time/qtimezoneprivate_icu.cpp b/src/corelib/time/qtimezoneprivate_icu.cpp
index d992ebfc3aa..f42ffe07678 100644
--- a/src/corelib/time/qtimezoneprivate_icu.cpp
+++ b/src/corelib/time/qtimezoneprivate_icu.cpp
@@ -149,7 +149,7 @@ static QTimeZonePrivate::Data ucalTimeZoneTransition(UCalendar *m_ucal,
QTimeZone::TimeType timeType = dst == 0 ? QTimeZone::StandardTime : QTimeZone::DaylightTime;
using namespace QtTimeZoneLocale;
tran.abbreviation = ucalTimeZoneDisplayName(m_ucal, timeType,
- QTimeZone::ShortName, QLocale().name());
+ QTimeZone::ShortName, QLocale().name().toUtf8());
return tran;
}
#endif // U_ICU_VERSION_SHORT
@@ -258,7 +258,7 @@ QString QIcuTimeZonePrivate::displayName(QTimeZone::TimeType timeType,
// Technically this may be suspect, if locale isn't QLocale(), since that's
// what we used when constructing m_ucal; does ICU cope with inconsistency ?
using namespace QtTimeZoneLocale;
- return ucalTimeZoneDisplayName(m_ucal, timeType, nameType, locale.name());
+ return ucalTimeZoneDisplayName(m_ucal, timeType, nameType, locale.name().toUtf8());
}
int QIcuTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const

Просмотреть файл

@ -22,9 +22,9 @@ set(${PORT}_PATCHES
fix-host-aliasing.patch
fix_deploy_windows.patch
fix-link-lib-discovery.patch
qmake-arm64.patch
fix-missing-symbol.patch
)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
list(APPEND ${PORT}_PATCHES env.patch)
endif()

Просмотреть файл

@ -1,18 +0,0 @@
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp
index df3f92d7d5df..0ee8cdbf11e1 100644
--- a/qmake/library/qmakeevaluator.cpp
+++ b/qmake/library/qmakeevaluator.cpp
@@ -1046,6 +1046,11 @@ void QMakeEvaluator::loadDefaults()
case PROCESSOR_ARCHITECTURE_AMD64:
archStr = ProString("x86_64");
break;
+# endif
+# ifdef PROCESSOR_ARCHITECTURE_ARM64
+ case PROCESSOR_ARCHITECTURE_ARM64:
+ archStr = ProString("arm64");
+ break;
# endif
case PROCESSOR_ARCHITECTURE_INTEL:
archStr = ProString("x86");
--
2.16.3

Просмотреть файл

@ -1,7 +1,6 @@
{
"name": "qtbase",
"version": "6.7.3",
"port-version": 1,
"version": "6.8.0",
"description": "Qt Base (Core, Gui, Widgets, Network, ...)",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtcharts",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Charts module provides a set of easy-to-use chart components. It uses the Qt Graphics View Framework to integrate charts with modern user interfaces.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtcoap",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt CoAP implements the client side of CoAP.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtconnectivity",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Connectivity module provides access to Bluetooth and NFC hardware.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtdatavis3d",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Data Visualization module enables you to visualize data in 3D as bar, scatter, and surface graphs.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -5,8 +5,9 @@ vcpkg_buildpath_length_warning(44)
set(${PORT}_PATCHES "")
set(TOOL_NAMES
set(TOOL_NAMES
qml
qmlaotstats
qmlcachegen
qmleasing
qmlformat

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtdeclarative",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt Declarative (Quick 2)",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtdeviceutilities",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt Device Utilities provides functionality that is useful for controlling settings in embedded applications.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtdoc",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt documentation.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtgraphs",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Graphs module enables you to visualize data in 3D as bar, scatter, and surface graphs.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtgrpc",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt GRPC and Qt Protobuf modules together allow you to define data and messages in proto files, and then use the code generators, which generate client code allowing accessors for fields and gRPC services in the Qt framework.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qthttpserver",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt HTTP Server supports building HTTP server functionality into an application.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtimageformats",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Image Formats add-on module provides optional support for other image file formats.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtinterfaceframework",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Interface Framework module provides both the tools and the core APIs, for you to implement Middleware APIs, Middleware Back ends, and Middleware Services.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtlanguageserver",
"version": "6.7.3",
"version": "6.8.0",
"description": "An implementation of the Language Server Protocol.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtlocation",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtlottie",
"version": "6.7.3",
"version": "6.8.0",
"description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtmqtt",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt MQTT module provides a standard compliant implementation of the MQTT protocol specification.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -0,0 +1,13 @@
diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
index 77c459a..af5229e 100644
--- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt
+++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
@@ -273,7 +273,7 @@ if(BUILD_SHARED_LIBS)
else()
foreach(ffmpeg_lib IN LISTS ffmpeg_libs)
qt_internal_add_target_include_dirs(QFFmpegMediaPlugin ${ffmpeg_lib})
- target_include_directories(QFFmpegMediaPlugin PRIVATE
+ target_compile_definitions(QFFmpegMediaPlugin PRIVATE
"$<TARGET_PROPERTY:${ffmpeg_lib},INTERFACE_COMPILE_DEFINITIONS>")
endforeach()
endif()

Просмотреть файл

@ -5,6 +5,7 @@ set(${PORT}_PATCHES
static_find_modules.patch
fix_avfoundation_target.patch
remove-static-ssl-stub.patch
ffmpeg-compile-def.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -20,10 +21,12 @@ INVERTED_FEATURES
"vaapi" CMAKE_DISABLE_FIND_PACKAGE_VAAPI # not in vpckg
)
set(unused "")
if("gstreamer" IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='yes'")
else()
list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'")
list(APPEND unused INPUT_gstreamer_gl INPUT_gstreamer_photography)
endif()
list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer_gl='no'")
list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer_photography='no'")
@ -62,6 +65,7 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES}
-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
CONFIGURE_OPTIONS_MAYBE_UNUSED ${unused}
)
if("gstreamer" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtmultimedia",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt Multimedia is an add-on module that provides a rich set of QML types and C++ classes to handle multimedia content.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtnetworkauth",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt Network Authorization provides a set of APIs that enable Qt applications to obtain limited access to online accounts and HTTP services without exposing users' passwords.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -10,17 +10,18 @@ index b4fcea410..91958e554 100644
find_path(Open62541_INCLUDE_DIRS
NAMES open62541.h
HINTS "${OPEN62541_INCDIR}")
@@ -46,6 +47,14 @@ if (Open62541_FOUND)
@@ -46,6 +47,15 @@ if (Open62541_FOUND)
endif()
mark_as_advanced(Open62541_INCLUDE_DIRS Open62541_LIBRARIES)
+elseif()
+else()
+ find_package(open62541 CONFIG REQUIRED)
+ if(NOT TARGET open62541)
+ add_library(open62541 INTERFACE IMPORTED)
+ set_property(TARGET open62541 APPEND PROPERTY
+ INTERFACE_LINK_LIBRARIES open62541::open62541)
+ endif()
+ set(Open62541_FOUND ON)
+endif()
include(FeatureSummary)

Просмотреть файл

@ -35,7 +35,4 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
${FEATURE_OPTIONS}
"-DPYTHON_EXECUTABLE=${PYTHON3}"
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtopcua",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt OPC UA module implements a Qt API to interact with OPC UA on top of a 3rd party OPC UA stack.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtpositioning",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Positioning API provides positioning information via QML and C++ interfaces.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtquick3d",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt Quick 3D provides a high-level API for creating 3D content and 3D user interfaces based on Qt Quick.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtquick3dphysics",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt Quick 3D Physics provides a high-level API for physics simulation.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtquickeffectmaker",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt Quick Effect Maker is a tool for creating shader effects for Qt Quick with high productivity and performance.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtquicktimeline",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Quick Timeline module enables keyframe-based animations and parameterization.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtremoteobjects",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt Remote Objects (QtRO) is an Inter-Process Communication (IPC) module developed for Qt. This module extends Qt's existing functionalities to enable information exchange between processes or computers, easily.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtscxml",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt SCXML module provides functionality to create state machines from SCXML files.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtsensors",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. The Qt Sensors API also provides a motion gesture recognition API for devices.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtserialbus",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Serial Bus API provides classes and functions to access the various industrial serial buses and protocols, such as CAN, ModBus, and others.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtserialport",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt Serial Port provides basic functionality for configuration, I/O operations, and getting and setting the control signals of the RS-232 pinouts.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtshadertools",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Shader Tools module is designed to provide a set of tools and utilities to work with graphics shaders.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtspeech",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users who are visually challenged or cannot access the application for whatever reason.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtsvg",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt SVG provides classes for rendering and displaying SVG drawings in widgets and on other paint devices.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -83,6 +83,11 @@ elseif(VCPKG_TARGET_IS_OSX)
list(APPEND TOOL_NAMES macdeployqt)
endif()
set(unused "")
if(NOT "assistant" IN_LIST FEATURES)
list(APPEND unused QLITEHTML_USE_SYSTEM_LITEHTML CMAKE_REQUIRE_FIND_PACKAGE_litehtml)
endif()
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
@ -90,8 +95,8 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES}
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON
-DQLITEHTML_USE_SYSTEM_LITEHTML:BOOL=ON
-DCMAKE_REQUIRE_FIND_PACKAGE_litehtml:BOOL=ON
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
CONFIGURE_OPTIONS_MAYBE_UNUSED
${unused}
)
if(VCPKG_TARGET_IS_OSX)

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qttools",
"version": "6.7.3",
"version": "6.8.0",
"description": "A collection of tools and utilities that come with the Qt framework to assist developers in the creation, management, and deployment of Qt applications.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qttranslations",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt translations.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtvirtualkeyboard",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 6 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtwayland",
"version": "6.7.3",
"version": "6.8.0",
"description": "A toolbox for making Qt based Wayland compositors",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtwebchannel",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt WebChannel enables peer-to-peer communication between a server (QML/C++ application) and a client (HTML/JavaScript or QML application).",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -0,0 +1,51 @@
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/credentialmanagement/navigator_login.h b/src/3rdparty/chromium/third_party/blink/renderer/modules/credentialmanagement/navigator_login.h
index 4629e5d..0096117 100644
--- a/src/3rdparty/chromium/third_party/blink/renderer/modules/credentialmanagement/navigator_login.h
+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/credentialmanagement/navigator_login.h
@@ -9,10 +9,11 @@
#include "third_party/blink/renderer/modules/modules_export.h"
#include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
#include "third_party/blink/renderer/platform/supplementable.h"
+#include "third_party/blink/renderer/core/execution_context/navigator_base.h"
+#include "third_party/blink/renderer/core/frame/navigator.h"
namespace blink {
-class Navigator;
class V8LoginStatus;
// Methods to let websites tell the browser about their login status.
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/locked_mode/locked_mode.h b/src/3rdparty/chromium/third_party/blink/renderer/modules/locked_mode/locked_mode.h
index fa227f6..9b84783 100644
--- a/src/3rdparty/chromium/third_party/blink/renderer/modules/locked_mode/locked_mode.h
+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/locked_mode/locked_mode.h
@@ -9,10 +9,10 @@
#include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
#include "third_party/blink/renderer/platform/heap/visitor.h"
#include "third_party/blink/renderer/platform/supplementable.h"
+#include "third_party/blink/renderer/core/execution_context/navigator_base.h"
-namespace blink {
-class NavigatorBase;
+namespace blink {
class MODULES_EXPORT LockedMode final : public ScriptWrappable,
public Supplement<NavigatorBase> {
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/printing/web_printing_manager.h b/src/3rdparty/chromium/third_party/blink/renderer/modules/printing/web_printing_manager.h
index c316642..d58a4e8 100644
--- a/src/3rdparty/chromium/third_party/blink/renderer/modules/printing/web_printing_manager.h
+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/printing/web_printing_manager.h
@@ -10,11 +10,11 @@
#include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
#include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h"
#include "third_party/blink/renderer/platform/supplementable.h"
+#include "third_party/blink/renderer/core/execution_context/navigator_base.h"
namespace blink {
class ExceptionState;
-class NavigatorBase;
class ScriptPromise;
class ScriptPromiseResolver;

Просмотреть файл

@ -4,6 +4,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES
"clang-cl.patch"
"fix-error2275-2672.patch"
"blink-include-fixes.patch"
)
set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict webenginedriver)

Просмотреть файл

@ -1,7 +1,7 @@
{
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
"name": "qtwebengine",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtwebsockets",
"version": "6.7.3",
"version": "6.8.0",
"description": "The Qt WebSockets module provides C++ and QML interfaces that enable Qt applications to act as a server that can process WebSocket requests, or a client that can consume data received from the server, or both.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -13,6 +13,6 @@ INVERTED_FEATURES
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
CONFIGURE_OPTIONS_MAYBE_UNUSED
CMAKE_REQUIRE_FIND_PACKAGE_WebEngineCore
)

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "qtwebview",
"version": "6.7.3",
"version": "6.8.0",
"description": "Qt WebView provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.",
"homepage": "https://www.qt.io/",
"license": null,

Просмотреть файл

@ -3310,7 +3310,7 @@
},
"gstreamer": {
"baseline": "1.24.7",
"port-version": 0
"port-version": 1
},
"gtest": {
"baseline": "1.15.2",
@ -7353,7 +7353,7 @@
"port-version": 1
},
"qt": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qt-advanced-docking-system": {
@ -7361,7 +7361,7 @@
"port-version": 0
},
"qt3d": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qt5": {
@ -7537,67 +7537,67 @@
"port-version": 0
},
"qt5compat": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtactiveqt": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtapplicationmanager": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtbase": {
"baseline": "6.7.3",
"port-version": 1
"baseline": "6.8.0",
"port-version": 0
},
"qtcharts": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtcoap": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtconnectivity": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtdatavis3d": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtdeclarative": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtdeviceutilities": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtdoc": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtgraphs": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtgrpc": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qthttpserver": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtimageformats": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtinterfaceframework": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtkeychain": {
@ -7609,43 +7609,43 @@
"port-version": 0
},
"qtlanguageserver": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtlocation": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtlottie": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtmqtt": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtmultimedia": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtnetworkauth": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtopcua": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtpositioning": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtquick3d": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtquick3dphysics": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtquickcontrols2": {
@ -7653,75 +7653,75 @@
"port-version": 1
},
"qtquickeffectmaker": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtquicktimeline": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtremoteobjects": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtscxml": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtsensors": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtserialbus": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtserialport": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtshadertools": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtspeech": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtsvg": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qttools": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qttranslations": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtvirtualkeyboard": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtwayland": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtwebchannel": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtwebengine": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtwebsockets": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"qtwebview": {
"baseline": "6.7.3",
"baseline": "6.8.0",
"port-version": 0
},
"quadtree": {

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "018489638670c73b79e737bb3fe4d1e6452697f9",
"version": "1.24.7",
"port-version": 1
},
{
"git-tree": "0fbc36e567269da127885e9eff36b6083ecd1561",
"version": "1.24.7",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4d00d6076204ab4ff6ced71ce747a8f9562094da",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "6d43689d4a62bc9cff176447e5a2bf7876b46387",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "71205cfc640c34439a37c429a51bbec3c49cb3db",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "f14571786a31c8dd14aab6f24afc108f907a6486",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "eb5db3202e6b4f94d93fedbb00e40dad3962a2cb",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "4392000e3e518dfe64546a07e2be0865a8842fc0",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d8926dd920c2518925eaa8278087cf945a7d2ea0",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "d07740c4fe6c1969e4033188de041d60d20253bf",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4bbe951f0caf24090dc1c6076c0d239c1f4f85d5",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "e6a64f811c1ea17eb3ab149436a63f9549859eba",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b5025594fddc343bba86dadf4159d41a7e1bac13",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "f176facc532ba6e294f1627343e8f7c3ee686676",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "37ee6e3a4ce65560cf469ebed55266b09b25b02b",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "ab0834ec2fc5274d8fda76ccd5a63e9d2cb6b2fd",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "146108195081cb2faa9887c4512100014cb4a0e5",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "4f3dd51073b52944256dfceb0bf26a0264352eae",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f84dcad5a8f622dca510b007f704eaf6b556f463",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "10db799b4117aed906ea376d643458f54d13cf21",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "374af9cc03f7094541b899620066d0eef36db4a1",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "ec47a4a5acdec592601626a2094e8611545a77ea",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5ac8d74f1f417f0fad7bda993243787f6e2b1458",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "f13fda1e78b00cdd54a1d59869f90d054cb3d73e",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b1861992c422bd8fcae1eabcf0406941afe87aa5",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "c9f2146581ffc3e46ac6a07b17687bd8733dd606",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cd5c092adffc360a620c0f72dc7535f7c923686d",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "903a55b2aee1d8dd9818e971c84a1214efc3bc5d",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "352d1cf3a123232fac1ae8d78d55b39cc252739d",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "1ac4dee1c80ed12e4b3e6167629f4dbd2959e9ca",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bc62477f7950cfc4da15d6edfb7e5c9f9bf1102a",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "9a14e2e45899927afadb2680f9c63aff561813cd",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "46252c0bed6c8e31f974d5e7b8edb5bc7c3d9751",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "aaead2efbaa8c2468942eda9df6a33e723770f21",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1e3f9233809663bfbe5d0df381d99fc554838467",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "018a953cbfee0f9cf143c07272ce51db90b3923b",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5b0c8e0a1b39d26def1d23d30330bf20e663b023",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "c881371d954fd08efd4677dbc2c4c5580a4c4ae3",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c9c5c562bab566d732fb6b102719085f17da55f1",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "85bbd18f495ebf6b13d44266540b10a3a5e61191",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c4a91acc90fcaca8b7c3e912330e5ce54fabc598",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "5d0adef11df081a56c96ac86940b5a823c132a2c",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8272b0fbc07d41c87b1b5a6404c8dfd3c6fb8bac",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "f9f2943f619885d7ad200c1c767ac1c1f85bd2d9",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5062337fe9344f4ee89615504e38be963834a299",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "55107562f80a875e4c75dc6f997d49332bbffca6",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2c1cba855635b5668c261be35a7b5544f6c60c85",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "e256113a21a24c0ecc111662db61d269fb68eb2d",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c23aa4b60406e0b5e273a42cf005f0b4e3dd5b57",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "7fbbd215393f3b1397cfcce06ff3b8e1c97ea612",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7a26670fb40325ae903b1b98ac07f39509a564d9",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "597234b6c4bd8abb03cfea7dba75ce399d6fa46d",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "be7dc5f4720d1ca7cc01fb3c42d49107232ca585",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "5acab4269350dd335cfce1669c9fb9f91a69f9aa",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "19262762b2f6187cff88f9ddd04879de79227a93",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "235b463bfefa385dda2507b81246c9912b8b20a2",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "882f7371ecda57c8b21b0b5e022908cbea32c0e5",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "f744fd9dfb8b0884752a822f8392086099942d5e",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cdf26a97d34ccec320057a0e80f0901f8cd05778",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "01b2aab63ffab405c7b84035182081e9edd9c69a",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "99e388e8c5a8bd605f703f2a23fc98749d334bbb",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "7500afd29b4dd9de9b6aeec77b8da36fc265f846",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "28504599c59213d4902db1b34904bdbd01f57c1a",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "837930cc72e73703311f5893da09875578cf72ad",
"version": "6.7.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "84e8cdad41795be93d4b385ff147a29daaecd683",
"version": "6.8.0",
"port-version": 0
},
{
"git-tree": "ed5ee3b4458ed9416d95c112028f2f4fcfe06175",
"version": "6.7.3",

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше