summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-05-20 15:03:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-29 21:07:15 +0100
commit09dc5c8273b4de9b2fa05af0cde83705b92df7f7 (patch)
tree88130e4dbb50e3654b8ebc4bdc569a94c572dfe6 /meta/recipes-sato/webkit
parentf7137f94905c0d0ef1c0af8e53db18de00a17fec (diff)
downloadpoky-09dc5c8273b4de9b2fa05af0cde83705b92df7f7.tar.gz
webkitgtk: Upgrade to 2.20.2
Backport a patch to fix build clang 6.0+ driver can correclty detect corss gold linker now (From OE-Core rev: 10cb11fe911473a3a2f4cb67815ff86141c0ab3c) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.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/0012-soup-Forward-declare-URL-class.patch31
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.20.2.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.20.1.bb)6
2 files changed, 34 insertions, 3 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch b/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch
new file mode 100644
index 0000000000..78fd4dc79b
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch
@@ -0,0 +1,31 @@
1From 59f6903ad96f3213f248b672d5fd526cc0d666ce Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 20 May 2018 14:28:27 -0700
4Subject: [PATCH] soup: Forward declare URL class
5
6This helps getting away with compiler errors seen with clang
7
8/mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62:
9error: unknown type name 'URL'
10 static std::optional<ResourceError> checkTLSErrors(const URL&,
11GTlsCertificate*, GTlsCertificateFlags);
12 ^
13Upstream-Status: Backport [https://trac.webkit.org/changeset/231876/webkit]
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h
21index 03bd72ba..7ca8792d 100644
22--- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h
23+++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h
24@@ -43,6 +43,7 @@ namespace WebCore {
25
26 class CertificateInfo;
27 class ResourceError;
28+class URL;
29 struct SoupNetworkProxySettings;
30
31 class SoupNetworkSession {
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.20.2.bb
index 360ab8e69b..a68a69f43c 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.20.2.bb
@@ -21,10 +21,11 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ 21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
22 file://0001-Fix-build-with-musl.patch \ 22 file://0001-Fix-build-with-musl.patch \
23 file://detect-gstreamer-gl.patch \ 23 file://detect-gstreamer-gl.patch \
24 file://0012-soup-Forward-declare-URL-class.patch \
24 " 25 "
25 26
26SRC_URI[md5sum] = "0cd9b9ae1f48c04de5314f77806eceb4" 27SRC_URI[md5sum] = "3fdda40dc10eb2a00d5fba4219b83967"
27SRC_URI[sha256sum] = "43e43285fa4e393080cc4fbd5ad8644749a75b1e0b811b230b63ae56806c8959" 28SRC_URI[sha256sum] = "dffe93a241f03f1c73b369f4e323e4d8f12e39d33d5515948cbf454ca4b526e2"
28 29
29inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc 30inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
30 31
@@ -85,7 +86,6 @@ EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF "
85EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " 86EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF "
86EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " 87EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF "
87EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " 88EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF "
88EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF "
89 89
90EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON" 90EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON"
91 91