3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[qt5-webengine] fix jumbo build error due to ResolveColor() redefinition (#37453)

Browse Source
This commit is contained in:
Thomas Sondergaard 2024-03-25 23:08:37 +01:00 committed by GitHub
parent a34c873a97
commit 77fc42259f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ports/qt5-webengine/0001-Fix-jumbo-build-error-due-to-ResolveColor-redefiniti.patch Normal file
View File

@ -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<Color> ResolveColor(const ComputedStyle& style,
+static base::Optional<Color> 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> color = ResolveColor(style, paint, visited_paint);
+ base::Optional<Color> color = ResolveColorSvgPaintServer(style, paint, visited_paint);
if (paint.HasUrl()) {
LayoutSVGResourcePaintServer* uri_resource = nullptr;
--
2.39.3

1
ports/qt5-webengine/portfile.cmake
View File

@ -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)

2
ports/qt5-webengine/vcpkg.json
View File

@ -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",

2
versions/baseline.json
View File

@ -7222,7 +7222,7 @@
},
"qt5-webengine": {
"baseline": "5.15.13",
"port-version": 2
"port-version": 3
},
"qt5-webglplugin": {
"baseline": "5.15.13",

5
versions/q-/qt5-webengine.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "58ef6b79a9cfe23e3a196d3a38970c5c48b1a15b",
"version": "5.15.13",
"port-version": 3
},
{
"git-tree": "91b4cbf2c91549380aa26377330c142a6e408414",
"version": "5.15.13",