diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-05-20 15:03:15 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-29 21:06:00 +0100 |
| commit | 10cb11fe911473a3a2f4cb67815ff86141c0ab3c (patch) | |
| tree | 350247f10799747fae2d65fe2e3e55556ee48bc4 | |
| parent | f1978b7e1d68bd7813ae048ff9a37716618a473c (diff) | |
| download | openembedded-core-10cb11fe911473a3a2f4cb67815ff86141c0ab3c.tar.gz openembedded-core-10cb11fe911473a3a2f4cb67815ff86141c0ab3c.tar.bz2 openembedded-core-10cb11fe911473a3a2f4cb67815ff86141c0ab3c.zip | |
webkitgtk: Upgrade to 2.20.2
Backport a patch to fix build
clang 6.0+ driver can correclty detect corss gold linker now
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch | 31 | ||||
| -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 @@ +From 59f6903ad96f3213f248b672d5fd526cc0d666ce Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 20 May 2018 14:28:27 -0700 +Subject: [PATCH] soup: Forward declare URL class + +This helps getting away with compiler errors seen with clang + +/mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62: +error: unknown type name 'URL' + static std::optional<ResourceError> checkTLSErrors(const URL&, +GTlsCertificate*, GTlsCertificateFlags); + ^ +Upstream-Status: Backport [https://trac.webkit.org/changeset/231876/webkit] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h +index 03bd72ba..7ca8792d 100644 +--- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h ++++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h +@@ -43,6 +43,7 @@ namespace WebCore { + + class CertificateInfo; + class ResourceError; ++class URL; + struct SoupNetworkProxySettings; + + 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 \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://0001-Fix-build-with-musl.patch \ file://detect-gstreamer-gl.patch \ + file://0012-soup-Forward-declare-URL-class.patch \ " -SRC_URI[md5sum] = "0cd9b9ae1f48c04de5314f77806eceb4" -SRC_URI[sha256sum] = "43e43285fa4e393080cc4fbd5ad8644749a75b1e0b811b230b63ae56806c8959" +SRC_URI[md5sum] = "3fdda40dc10eb2a00d5fba4219b83967" +SRC_URI[sha256sum] = "dffe93a241f03f1c73b369f4e323e4d8f12e39d33d5515948cbf454ca4b526e2" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc @@ -85,7 +86,6 @@ EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " -EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON" |