summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-11 15:57:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-15 11:44:20 +0100
commite95851d966bc3f11177ea0862a6e5c37b650d0fb (patch)
tree92f03d8149ecb54e6e1787a63ed1f68dcbeaccbe /meta/recipes-sato/webkit
parent1a801e235464bdb08ed07d571de8973a2c7d95f0 (diff)
downloadpoky-e95851d966bc3f11177ea0862a6e5c37b650d0fb.tar.gz
webkitgtk: Upgrade to 2.28.4
backport a patch from master to fix clang11 build error (From OE-Core rev: 6d38f23f5c34dfb2a2d28b834b0c35b1f7778f85) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch66
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.28.4.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.28.3.bb)3
2 files changed, 68 insertions, 1 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch b/meta/recipes-sato/webkit/webkitgtk/0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch
new file mode 100644
index 0000000000..d8bb8efb88
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch
@@ -0,0 +1,66 @@
1From cb929f59b527fe890376e47613dfe1434a320bc0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 11 Aug 2020 15:44:48 -0700
4Subject: [PATCH] [clang 11] fix build errors due to -WWc++11-narrowing
5
6https://bugs.webkit.org/show_bug.cgi?id=211193
7
8Reviewed by Adrian Perez de Castro.
9
10Fixes the following errors,
11
12Source/WebCore/html/MediaElementSession.cpp:1059:9: error: type 'WebCore::RenderMedia *' cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing]
13m_element.renderer(),
14^~~~~~~~~~~~~~~~~~~~
15
16Source/WebCore/style/StyleResolver.cpp:106:55: error: type 'const char [4]' cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing]
17m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
18 ^~~~~
19Source/WebCore/style/StyleResolver.cpp:106:55: note: insert an explicit cast to silence this issue
20m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
21 ^~~~~
22 static_cast<bool>( )
23
24* html/HTMLMediaElement.h:
25(WebCore::HTMLMediaElement::hasRenderer const):
26MediaElementSession was implicitly casting a pointer to a bool,
27which is not allowed with modern Clang checks. Add a helper method
28to encapsulate the now required static_cast<bool>.
29* html/MediaElementSession.cpp: Use the new helper method to see
30if the HTMLMediaElement has an associated renderer.
31(WebCore::MediaElementSession::updateMediaUsageIfChanged):
32* style/StyleResolver.cpp: This was calling MediaQueryEvaluator {
33"all" }; and seemingly expecting to cast a const char[] to a bool,
34or maybe String? It's confusing because of the MediaQueryEvaluator
35API. If it was implicitly converting to bool then that could be
36unintentional. Such casts are not allowed either now. The
37MediaQueryEvaluator's default constructor says it returns true for
38"all", which appears to be the original intent of this call, so I
39replaced it with that.
40(WebCore::Style::Resolver::Resolver):
41
42git-svn-id: http://svn.webkit.org/repository/webkit/trunk@260951 268f45cc-cd09-0410-ab3c-d52691b4dbfc
43
44Upstream-Status: Backport [https://github.com/WebKit/webkit/commit/c3cf651016e4cdcb4350598d4a586821071f91bf.patch]
45
46Signed-off-by: Khem Raj <raj.khem@gmail.com>
47---
48 Source/WebCore/style/StyleResolver.cpp | 2 +-
49 1 file changed, 1 insertion(+), 1 deletion(-)
50
51diff --git a/Source/WebCore/style/StyleResolver.cpp b/Source/WebCore/style/StyleResolver.cpp
52index 8bf371a0..34580ddb 100644
53--- a/Source/WebCore/style/StyleResolver.cpp
54+++ b/Source/WebCore/style/StyleResolver.cpp
55@@ -107,7 +107,7 @@ Resolver::Resolver(Document& document)
56 if (view)
57 m_mediaQueryEvaluator = MediaQueryEvaluator { view->mediaType() };
58 else
59- m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
60+ m_mediaQueryEvaluator = MediaQueryEvaluator { };
61
62 if (root) {
63 m_rootDefaultStyle = styleForElement(*root, m_document.renderStyle(), nullptr, RuleMatchingBehavior::MatchOnlyUserAgentRules).renderStyle;
64--
652.28.0
66
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.28.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.28.4.bb
index 0158092265..8ebb3709a8 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.28.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.28.4.bb
@@ -19,8 +19,9 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
19 file://cross-compile.patch \ 19 file://cross-compile.patch \
20 file://0001-Fix-build-with-musl.patch \ 20 file://0001-Fix-build-with-musl.patch \
21 file://include_array.patch \ 21 file://include_array.patch \
22 file://0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch \
22 " 23 "
23SRC_URI[sha256sum] = "f0898ac072c220e13a4aee819408421a6cb56a6eb89170ceafe52468b0903522" 24SRC_URI[sha256sum] = "821952e8c9303ed752f1fb1d4283f612c25249d00d705d2b79c2db1bc49c9464"
24 25
25inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc 26inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
26 27