summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit/webkitgtk
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-10-28 22:05:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-30 13:22:49 +0000
commit3846c15172cd8ecba47e421a31034dc3c198c4c8 (patch)
treea557b7eb8753fca4138a9d5e764fa16ebc34adcb /meta/recipes-sato/webkit/webkitgtk
parent9624092cd61bdde9bcef3361cff898282e50dcae (diff)
downloadpoky-3846c15172cd8ecba47e421a31034dc3c198c4c8.tar.gz
webkitgtk: update 2.28.4 -> 2.30.1
Drop 0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch and cross-compile.patch as upstream has removed the code. Rebase 0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch. Add a systemd config option, subject to systemd in DISTRO_FEATURES. (From OE-Core rev: 98d7a2b593eee33e0bc015778712cd8b68146588) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch25
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch35
-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/cross-compile.patch23
4 files changed, 11 insertions, 138 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
index 268118b5ca..ca7b1bca48 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
@@ -1,4 +1,4 @@
1From 8ee7806ad2d5606967f7a1529a113fb9d1a386de Mon Sep 17 00:00:00 2001 1From b145ab4273c59f4f908cdaff9e267241bd970e93 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 3 Feb 2020 17:06:27 -0800 3Date: Mon, 3 Feb 2020 17:06:27 -0800
4Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG 4Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG
@@ -13,26 +13,26 @@ missing atomic primitives.
13 13
14Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] 14Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit]
15Signed-off-by: Khem Raj <raj.khem@gmail.com> 15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16
16--- 17---
17 Source/cmake/OptionsGTK.cmake | 2 ++ 18 Source/cmake/OptionsGTK.cmake | 1 +
18 Source/cmake/OptionsJSCOnly.cmake | 1 + 19 Source/cmake/OptionsJSCOnly.cmake | 1 +
19 2 files changed, 3 insertions(+) 20 2 files changed, 2 insertions(+)
20 21
21diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake 22diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
22index d3beef19..6a92856f 100644 23index 8732e935..9b4fbae7 100644
23--- a/Source/cmake/OptionsGTK.cmake 24--- a/Source/cmake/OptionsGTK.cmake
24+++ b/Source/cmake/OptionsGTK.cmake 25+++ b/Source/cmake/OptionsGTK.cmake
25@@ -17,6 +17,8 @@ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKIT 26@@ -32,6 +32,7 @@ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
26 set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") 27 if (USER_AGENT_BRANDING)
27 set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0") 28 add_definitions(-DUSER_AGENT_BRANDING="${USER_AGENT_BRANDING}")
28 29 endif ()
29+set(THREADS_PREFER_PTHREAD_FLAG ON) 30+set(THREADS_PREFER_PTHREAD_FLAG ON)
30+ 31
31 find_package(Cairo 1.14.0 REQUIRED) 32 find_package(Cairo 1.14.0 REQUIRED)
32 find_package(Fontconfig 2.8.0 REQUIRED) 33 find_package(Fontconfig 2.8.0 REQUIRED)
33 find_package(Freetype 2.4.2 REQUIRED)
34diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake 34diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
35index b2e87418..326ade23 100644 35index 316c6240..2f712602 100644
36--- a/Source/cmake/OptionsJSCOnly.cmake 36--- a/Source/cmake/OptionsJSCOnly.cmake
37+++ b/Source/cmake/OptionsJSCOnly.cmake 37+++ b/Source/cmake/OptionsJSCOnly.cmake
38@@ -1,3 +1,4 @@ 38@@ -1,3 +1,4 @@
@@ -40,6 +40,3 @@ index b2e87418..326ade23 100644
40 find_package(Threads REQUIRED) 40 find_package(Threads REQUIRED)
41 41
42 if (MSVC) 42 if (MSVC)
43--
442.25.0
45
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
deleted file mode 100644
index e8d1d8c341..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From bed4cf4aaa6aad4172ec9942e9039fb8e1ef68a4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 29 Feb 2016 18:13:39 +0200
4Subject: [PATCH] OptionsGTK.cmake: drop the hardcoded introspection/gtkdoc
5 disabling when cross-compiling
6
7This was not possible to override from the command line and in OpenEmbedded
8(one of the most prominent cross-compilation frameworks) introspection does work fine,
9through the use of qemu target emulation.
10
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
13Upstream-Status: Pending
14
15---
16 Source/cmake/OptionsGTK.cmake | 6 ------
17 1 file changed, 6 deletions(-)
18
19diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
20index 661b40e..404441b 100644
21--- a/Source/cmake/OptionsGTK.cmake
22+++ b/Source/cmake/OptionsGTK.cmake
23@@ -352,12 +352,6 @@ if (ENABLED_COMPILER_SANITIZERS)
24 set(ENABLE_INTROSPECTION OFF)
25 endif ()
26
27-# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
28-if (CMAKE_CROSSCOMPILING)
29- set(ENABLE_GTKDOC OFF)
30- set(ENABLE_INTROSPECTION OFF)
31-endif ()
32-
33 # Override the cached variable, gtk-doc does not really work when building on Mac.
34 if (APPLE)
35 set(ENABLE_GTKDOC OFF)
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
deleted file mode 100644
index d8bb8efb88..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch
+++ /dev/null
@@ -1,66 +0,0 @@
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/cross-compile.patch b/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch
deleted file mode 100644
index 4d1de72851..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Disable the tests meant to run when compiling natively
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Index: webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake
7===================================================================
8--- webkitgtk-2.14.5.orig/Source/cmake/OptionsCommon.cmake
9+++ webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake
10@@ -67,8 +67,11 @@ endif ()
11 # Detect Cortex-A53 core if CPU is ARM64 and OS is Linux.
12 # Query /proc/cpuinfo for each available core and check reported CPU part number: 0xd03 signals Cortex-A53.
13 # (see Main ID Register in ARM Cortex-A53 MPCore Processor Technical Reference Manual)
14-set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF)
15-if (WTF_CPU_ARM64 AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux"))
16+if( NOT WTF_CPU_ARM64_CORTEXA53_INITIALVALUE)
17+ set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF)
18+endif(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE)
19+
20+if (WTF_CPU_ARM64 AND NOT CMAKE_CROSSCOMPILING AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux"))
21 execute_process(COMMAND nproc OUTPUT_VARIABLE PROC_COUNT)
22 math(EXPR PROC_MAX ${PROC_COUNT}-1)
23 foreach (PROC_ID RANGE ${PROC_MAX})