diff options
| author | Khem Raj <raj.khem@gmail.com> | 2023-04-29 22:20:31 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-05 11:07:26 +0100 |
| commit | b729a12fc0409e6301c40f88a54c793396725709 (patch) | |
| tree | 0a0fedcef8855e6f987afa8e40afafe1079245e2 | |
| parent | 7163568576bed7dda3f73c3069cdff286cfbe819 (diff) | |
| download | poky-b729a12fc0409e6301c40f88a54c793396725709.tar.gz | |
qtwebkitgtk: Backport a build fix for GCC 13
(From OE-Core rev: b2a8379713af625f1667bc63ee85031ac65ca3a4)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.38.5.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch b/meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch new file mode 100644 index 0000000000..762de40995 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | From 93920b55f52ff8b883296f4845269e2ed746acb3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Michael Catanzaro <mcatanzaro@redhat.com> | ||
| 3 | Date: Fri, 31 Mar 2023 12:24:09 -0700 | ||
| 4 | Subject: [PATCH] Fix build of SourceBrush.cpp | ||
| 5 | https://bugs.webkit.org/show_bug.cgi?id=254821 | ||
| 6 | |||
| 7 | Unreviewed build fix. | ||
| 8 | |||
| 9 | * Source/WebCore/platform/graphics/SourceBrush.cpp: | ||
| 10 | (WebCore::SourceBrush::setGradient): | ||
| 11 | (WebCore::SourceBrush::setPattern): | ||
| 12 | |||
| 13 | Canonical link: https://commits.webkit.org/262434@main | ||
| 14 | |||
| 15 | Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/93920b55f52ff8b883296f4845269e2ed746acb3] | ||
| 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 17 | --- | ||
| 18 | Source/WebCore/platform/graphics/SourceBrush.cpp | 4 ++-- | ||
| 19 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 20 | |||
| 21 | --- a/Source/WebCore/platform/graphics/SourceBrush.cpp | ||
| 22 | +++ b/Source/WebCore/platform/graphics/SourceBrush.cpp | ||
| 23 | @@ -65,12 +65,12 @@ Pattern* SourceBrush::pattern() const | ||
| 24 | |||
| 25 | void SourceBrush::setGradient(Ref<Gradient>&& gradient, const AffineTransform& spaceTransform) | ||
| 26 | { | ||
| 27 | - m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } }; | ||
| 28 | + m_brush = Brush { Brush::LogicalGradient { { WTFMove(gradient) }, spaceTransform } }; | ||
| 29 | } | ||
| 30 | |||
| 31 | void SourceBrush::setPattern(Ref<Pattern>&& pattern) | ||
| 32 | { | ||
| 33 | - m_brush = { WTFMove(pattern) }; | ||
| 34 | + m_brush = Brush { WTFMove(pattern) }; | ||
| 35 | } | ||
| 36 | |||
| 37 | WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush) | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb index 36c6233b33..f7fa6dfb98 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb | |||
| @@ -14,6 +14,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
| 14 | file://reproducibility.patch \ | 14 | file://reproducibility.patch \ |
| 15 | file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ | 15 | file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ |
| 16 | file://d318bb461f040b90453bc4e100dcf967243ecd98.patch \ | 16 | file://d318bb461f040b90453bc4e100dcf967243ecd98.patch \ |
| 17 | file://93920b55f52ff8b883296f4845269e2ed746acb3.patch \ | ||
| 17 | " | 18 | " |
| 18 | SRC_URI[sha256sum] = "40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7" | 19 | SRC_URI[sha256sum] = "40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7" |
| 19 | 20 | ||
