diff --git a/ports/qt5-webengine/0001-Fix-jumbo-build-error-due-to-ResolveColor-redefiniti.patch b/ports/qt5-webengine/0001-Fix-jumbo-build-error-due-to-ResolveColor-redefiniti.patch new file mode 100644 index 0000000000..34869c40ff --- /dev/null +++ b/ports/qt5-webengine/0001-Fix-jumbo-build-error-due-to-ResolveColor-redefiniti.patch @@ -0,0 +1,24 @@ +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/layout/svg/layout_svg_resource_paint_server.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/layout/svg/layout_svg_resource_paint_server.cc +index 99ba54e790c..abf8467912d 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/layout/svg/layout_svg_resource_paint_server.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/layout/svg/layout_svg_resource_paint_server.cc +@@ -94,7 +94,7 @@ void SVGPaintServer::PrependTransform(const AffineTransform& transform) { + transform_ = transform * transform_; + } + +-static base::Optional ResolveColor(const ComputedStyle& style, ++static base::Optional ResolveColorSvgPaintServer(const ComputedStyle& style, + const SVGPaint& paint, + const SVGPaint& visited_paint) { + if (!paint.HasColor()) +@@ -122,7 +122,7 @@ static SVGPaintDescription RequestPaint(const LayoutObject& object, + const SVGPaint& visited_paint = apply_to_fill + ? svg_style.InternalVisitedFillPaint() + : svg_style.InternalVisitedStrokePaint(); +- base::Optional color = ResolveColor(style, paint, visited_paint); ++ base::Optional color = ResolveColorSvgPaintServer(style, paint, visited_paint); + + if (paint.HasUrl()) { + LayoutSVGResourcePaintServer* uri_resource = nullptr; +-- +2.39.3 diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index 29719ff771..91c392f4ac 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -51,6 +51,7 @@ set(PATCHES common.pri.patch build_2.patch 0001-Support-ICU-74-in-LazyTextBreakIterator.patch workaround-protobuf-issue.patch + 0001-Fix-jumbo-build-error-due-to-ResolveColor-redefiniti.patch ) set(OPTIONS) diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index f29c9199aa..a068a4c333 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-webengine", "version": "5.15.13", - "port-version": 2, + "port-version": 3, "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.", "license": null, "supports": "!static", diff --git a/versions/baseline.json b/versions/baseline.json index 270660e633..c425180324 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7222,7 +7222,7 @@ }, "qt5-webengine": { "baseline": "5.15.13", - "port-version": 2 + "port-version": 3 }, "qt5-webglplugin": { "baseline": "5.15.13", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index dfa882f6da..71960d5283 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58ef6b79a9cfe23e3a196d3a38970c5c48b1a15b", + "version": "5.15.13", + "port-version": 3 + }, { "git-tree": "91b4cbf2c91549380aa26377330c142a6e408414", "version": "5.15.13",