diff --git a/ports/qt5-webengine/build_3.with_missing_stdbool_include.patch b/ports/qt5-webengine/build_3.with_missing_stdbool_include.patch deleted file mode 100644 index 985256049f..0000000000 --- a/ports/qt5-webengine/build_3.with_missing_stdbool_include.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/3rdparty/chromium/third_party/libxml/src/encoding.c -+++ b/src/3rdparty/chromium/third_party/libxml/src/encoding.c -@@ -25,6 +25,7 @@ - - #include - #include -+#include - - #ifdef HAVE_CTYPE_H - #include -@@ -2004,7 +2005,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, - #ifdef LIBXML_ICU_ENABLED - else if (handler->uconv_out != NULL) { - ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, -- TRUE); -+ true); - } - #endif /* LIBXML_ICU_ENABLED */ - else { diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index 55fea96778..aac87b1a1e 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -49,8 +49,6 @@ set(PATCHES common.pri.patch gl.patch build_1.patch build_2.patch - build_3.with_missing_stdbool_include.patch - workaround-msvc2022-ice.patch workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch ) diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 364b52cf0a..8161a985c8 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-webengine", "version": "5.15.10", + "port-version": 1, "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/ports/qt5-webengine/workaround-msvc2022-ice.patch b/ports/qt5-webengine/workaround-msvc2022-ice.patch deleted file mode 100644 index 59cc004b62..0000000000 --- a/ports/qt5-webengine/workaround-msvc2022-ice.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- a/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h -+++ b/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h -@@ -281,15 +281,63 @@ struct MD5CE { - return IntermediateDataToMD5Digest(ProcessMessage(data, n)); - } - -- static constexpr uint64_t Hash64(const char* data, uint32_t n) { -- IntermediateData intermediate = ProcessMessage(data, n); -- return (static_cast(SwapEndian(intermediate.a)) << 32) | -- static_cast(SwapEndian(intermediate.b)); -+ static constexpr uint64_t Hash64(const char* message, uint32_t n) { -+ const uint32_t m = GetPaddedMessageLength(n); -+ IntermediateData intermediate0 = kInitialIntermediateData; -+ for (uint32_t offset = 0; offset < m; offset += 64) { -+ RoundData data = { -+ GetPaddedMessageWord(message, n, m, offset), -+ GetPaddedMessageWord(message, n, m, offset + 4), -+ GetPaddedMessageWord(message, n, m, offset + 8), -+ GetPaddedMessageWord(message, n, m, offset + 12), -+ GetPaddedMessageWord(message, n, m, offset + 16), -+ GetPaddedMessageWord(message, n, m, offset + 20), -+ GetPaddedMessageWord(message, n, m, offset + 24), -+ GetPaddedMessageWord(message, n, m, offset + 28), -+ GetPaddedMessageWord(message, n, m, offset + 32), -+ GetPaddedMessageWord(message, n, m, offset + 36), -+ GetPaddedMessageWord(message, n, m, offset + 40), -+ GetPaddedMessageWord(message, n, m, offset + 44), -+ GetPaddedMessageWord(message, n, m, offset + 48), -+ GetPaddedMessageWord(message, n, m, offset + 52), -+ GetPaddedMessageWord(message, n, m, offset + 56), -+ GetPaddedMessageWord(message, n, m, offset + 60)}; -+ IntermediateData intermediate1 = intermediate0; -+ for (uint32_t i = 0; i < 64; ++i) -+ intermediate1 = ApplyStep(i, data, intermediate1); -+ intermediate0 = Add(intermediate0, intermediate1); -+ } -+ return (static_cast(SwapEndian(intermediate0.a)) << 32) | -+ static_cast(SwapEndian(intermediate0.b)); - } - -- static constexpr uint32_t Hash32(const char* data, uint32_t n) { -- IntermediateData intermediate = ProcessMessage(data, n); -- return SwapEndian(intermediate.a); -+ static constexpr uint32_t Hash32(const char* message, uint32_t n) { -+ const uint32_t m = GetPaddedMessageLength(n); -+ IntermediateData intermediate0 = kInitialIntermediateData; -+ for (uint32_t offset = 0; offset < m; offset += 64) { -+ RoundData data = { -+ GetPaddedMessageWord(message, n, m, offset), -+ GetPaddedMessageWord(message, n, m, offset + 4), -+ GetPaddedMessageWord(message, n, m, offset + 8), -+ GetPaddedMessageWord(message, n, m, offset + 12), -+ GetPaddedMessageWord(message, n, m, offset + 16), -+ GetPaddedMessageWord(message, n, m, offset + 20), -+ GetPaddedMessageWord(message, n, m, offset + 24), -+ GetPaddedMessageWord(message, n, m, offset + 28), -+ GetPaddedMessageWord(message, n, m, offset + 32), -+ GetPaddedMessageWord(message, n, m, offset + 36), -+ GetPaddedMessageWord(message, n, m, offset + 40), -+ GetPaddedMessageWord(message, n, m, offset + 44), -+ GetPaddedMessageWord(message, n, m, offset + 48), -+ GetPaddedMessageWord(message, n, m, offset + 52), -+ GetPaddedMessageWord(message, n, m, offset + 56), -+ GetPaddedMessageWord(message, n, m, offset + 60)}; -+ IntermediateData intermediate1 = intermediate0; -+ for (uint32_t i = 0; i < 64; ++i) -+ intermediate1 = ApplyStep(i, data, intermediate1); -+ intermediate0 = Add(intermediate0, intermediate1); -+ } -+ return SwapEndian(intermediate0.a); - } - }; - ---- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h -+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h -@@ -26,6 +26,7 @@ - #include - #include - -+#include "absl/base/macros.h" - #include "net/third_party/quiche/src/quic/core/quic_tag.h" - #include "net/third_party/quiche/src/quic/core/quic_types.h" - #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -@@ -181,8 +182,14 @@ QUIC_EXPORT_PRIVATE constexpr bool ParsedQuicVersionIsValid( - transport_version == QUIC_VERSION_RESERVED_FOR_NEGOTIATION; - if (!transport_version_is_valid) { - // Iterators are not constexpr in C++14 which Chrome uses. -- constexpr auto supported_transport_versions = SupportedTransportVersions(); -- for (size_t i = 0; i < supported_transport_versions.size(); ++i) { -+ constexpr QuicTransportVersion supported_transport_versions[] = { -+ QUIC_VERSION_IETF_DRAFT_29, -+ QUIC_VERSION_IETF_DRAFT_27, -+ QUIC_VERSION_51, -+ QUIC_VERSION_50, -+ QUIC_VERSION_46, -+ QUIC_VERSION_43}; -+ for (size_t i = 0; i < ABSL_ARRAYSIZE(supported_transport_versions); ++i) { - const QuicTransportVersion& trans_vers = supported_transport_versions[i]; - if (trans_vers == transport_version) { - transport_version_is_valid = true; - diff --git a/versions/baseline.json b/versions/baseline.json index ba71b5fcaf..04fa0e0473 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6726,7 +6726,7 @@ }, "qt5-webengine": { "baseline": "5.15.10", - "port-version": 0 + "port-version": 1 }, "qt5-webglplugin": { "baseline": "5.15.10", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index 634dba081c..c7359dba46 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf5ac17e7409f445cbfc1cffc1d8a138a24582a0", + "version": "5.15.10", + "port-version": 1 + }, { "git-tree": "f088e5761d91d1539ecb60aed67afcdb197dccef", "version": "5.15.10",