diff mbox series

[V2] webkitgtk: Upgrade to 2.20.2

Message ID 20180521133742.15994-1-raj.khem@gmail.com
State Superseded
Headers show
Series [V2] webkitgtk: Upgrade to 2.20.2 | expand

Commit Message

Khem Raj May 21, 2018, 1:37 p.m. UTC 
Patch it to build with clang

clang 6.0+ driver can correclty detect corss gold linker now

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
V2:
- Remove code to disabel gold with clang instead of commenting, and descrive the removal

 .../0012-soup-Forward-declare-URL-class.patch | 31 +++++++++++++++++++
 ...ebkitgtk_2.20.1.bb => webkitgtk_2.20.2.bb} |  6 ++--
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch
 rename meta/recipes-sato/webkit/{webkitgtk_2.20.1.bb => webkitgtk_2.20.2.bb} (96%)

-- 
2.17.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Ross Burton May 21, 2018, 2:54 p.m. UTC | #1 
My patch metrics[1] will love you if you can replace that patch with a
backport...

Ross
[1] http://www.burtonini.com/temp/status/

On 21 May 2018 at 14:37, Khem Raj <raj.khem@gmail.com> wrote:
> Patch it to build with clang

>

> clang 6.0+ driver can correclty detect corss gold linker now

>

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

> V2:

> - Remove code to disabel gold with clang instead of commenting, and descrive the removal

>

>  .../0012-soup-Forward-declare-URL-class.patch | 31 +++++++++++++++++++

>  ...ebkitgtk_2.20.1.bb => webkitgtk_2.20.2.bb} |  6 ++--

>  2 files changed, 34 insertions(+), 3 deletions(-)

>  create mode 100644 meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch

>  rename meta/recipes-sato/webkit/{webkitgtk_2.20.1.bb => webkitgtk_2.20.2.bb} (96%)

>

> 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..c689117650

> --- /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: Pending

> +

> +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

> similarity index 96%

> rename from meta/recipes-sato/webkit/webkitgtk_2.20.1.bb

> rename to 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"

>

> --

> 2.17.0

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj May 21, 2018, 7:14 p.m. UTC | #2 
Thanks, I'll check it out once I am near a computer

On Mon, May 21, 2018 at 7:55 AM Burton, Ross <ross.burton@intel.com> wrote:

> My patch metrics[1] will love you if you can replace that patch with a

> backport...

>

> Ross

> [1] http://www.burtonini.com/temp/status/

>

> On 21 May 2018 at 14:37, Khem Raj <raj.khem@gmail.com> wrote:

> > Patch it to build with clang

> >

> > clang 6.0+ driver can correclty detect corss gold linker now

> >

> > Signed-off-by: Khem Raj <raj.khem@gmail.com>

> > ---

> > V2:

> > - Remove code to disabel gold with clang instead of commenting, and

> descrive the removal

> >

> >  .../0012-soup-Forward-declare-URL-class.patch | 31 +++++++++++++++++++

> >  ...ebkitgtk_2.20.1.bb => webkitgtk_2.20.2.bb} |  6 ++--

> >  2 files changed, 34 insertions(+), 3 deletions(-)

> >  create mode 100644

> meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch

> >  rename meta/recipes-sato/webkit/{webkitgtk_2.20.1.bb =>

> webkitgtk_2.20.2.bb} (96%)

> >

> > 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..c689117650

> > --- /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: Pending

> > +

> > +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

> > similarity index 96%

> > rename from meta/recipes-sato/webkit/webkitgtk_2.20.1.bb

> > rename to 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"

> >

> > --

> > 2.17.0

> >

> > --

> > _______________________________________________

> > Openembedded-core mailing list

> > Openembedded-core@lists.openembedded.org

> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

>
<div><div dir="auto">Thanks, I&#39;ll check it out once I am near a computer </div></div><div><br><div class="gmail_quote"><div>On Mon, May 21, 2018 at 7:55 AM Burton, Ross &lt;<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">My patch metrics[1] will love you if you can replace that patch with a<br>
backport...<br>
<br>
Ross<br>
[1] <a href="http://www.burtonini.com/temp/status/" rel="noreferrer" target="_blank">http://www.burtonini.com/temp/status/</a><br>
<br>
On 21 May 2018 at 14:37, Khem Raj &lt;<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>&gt; wrote:<br>
&gt; Patch it to build with clang<br>
&gt;<br>
&gt; clang 6.0+ driver can correclty detect corss gold linker now<br>
&gt;<br>
&gt; Signed-off-by: Khem Raj &lt;<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>&gt;<br>
&gt; ---<br>
&gt; V2:<br>
&gt; - Remove code to disabel gold with clang instead of commenting, and descrive the removal<br>
&gt;<br>
&gt;  .../0012-soup-Forward-declare-URL-class.patch | 31 +++++++++++++++++++<br>
&gt;  ...<a href="http://ebkitgtk_2.20.1.bb" rel="noreferrer" target="_blank">ebkitgtk_2.20.1.bb</a> =&gt; <a href="http://webkitgtk_2.20.2.bb" rel="noreferrer" target="_blank">webkitgtk_2.20.2.bb</a>} |  6 ++--<br>
&gt;  2 files changed, 34 insertions(+), 3 deletions(-)<br>
&gt;  create mode 100644 meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch<br>
&gt;  rename meta/recipes-sato/webkit/{<a href="http://webkitgtk_2.20.1.bb" rel="noreferrer" target="_blank">webkitgtk_2.20.1.bb</a> =&gt; <a href="http://webkitgtk_2.20.2.bb" rel="noreferrer" target="_blank">webkitgtk_2.20.2.bb</a>} (96%)<br>
&gt;<br>
&gt; 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<br>
&gt; new file mode 100644<br>
&gt; index 0000000000..c689117650<br>
&gt; --- /dev/null<br>
&gt; +++ b/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch<br>
&gt; @@ -0,0 +1,31 @@<br>
&gt; +From 59f6903ad96f3213f248b672d5fd526cc0d666ce Mon Sep 17 00:00:00 2001<br>
&gt; +From: Khem Raj &lt;<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>&gt;<br>
&gt; +Date: Sun, 20 May 2018 14:28:27 -0700<br>
&gt; +Subject: [PATCH] soup: Forward declare URL class<br>
&gt; +<br>
&gt; +This helps getting away with compiler errors seen with clang<br>
&gt; +<br>
&gt; +/mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62:<br>
&gt; +error: unknown type name &#39;URL&#39;<br>
&gt; +    static std::optional&lt;ResourceError&gt; checkTLSErrors(const URL&amp;,<br>
&gt; +GTlsCertificate*, GTlsCertificateFlags);<br>
&gt; +                                                             ^<br>
&gt; +Upstream-Status: Pending<br>
&gt; +<br>
&gt; +Signed-off-by: Khem Raj &lt;<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>&gt;<br>
&gt; +---<br>
&gt; + Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 +<br>
&gt; + 1 file changed, 1 insertion(+)<br>
&gt; +<br>
&gt; +diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h<br>
&gt; +index 03bd72ba..7ca8792d 100644<br>
&gt; +--- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h<br>
&gt; ++++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h<br>
&gt; +@@ -43,6 +43,7 @@ namespace WebCore {<br>
&gt; +<br>
&gt; + class CertificateInfo;<br>
&gt; + class ResourceError;<br>
&gt; ++class URL;<br>
&gt; + struct SoupNetworkProxySettings;<br>
&gt; +<br>
&gt; + class SoupNetworkSession {<br>
&gt; diff --git a/meta/recipes-sato/webkit/<a href="http://webkitgtk_2.20.1.bb" rel="noreferrer" target="_blank">webkitgtk_2.20.1.bb</a> b/meta/recipes-sato/webkit/<a href="http://webkitgtk_2.20.2.bb" rel="noreferrer" target="_blank">webkitgtk_2.20.2.bb</a><br>
&gt; similarity index 96%<br>
&gt; rename from meta/recipes-sato/webkit/<a href="http://webkitgtk_2.20.1.bb" rel="noreferrer" target="_blank">webkitgtk_2.20.1.bb</a><br>
&gt; rename to meta/recipes-sato/webkit/<a href="http://webkitgtk_2.20.2.bb" rel="noreferrer" target="_blank">webkitgtk_2.20.2.bb</a><br>
&gt; index 360ab8e69b..a68a69f43c 100644<br>
&gt; --- a/meta/recipes-sato/webkit/<a href="http://webkitgtk_2.20.1.bb" rel="noreferrer" target="_blank">webkitgtk_2.20.1.bb</a><br>
&gt; +++ b/meta/recipes-sato/webkit/<a href="http://webkitgtk_2.20.2.bb" rel="noreferrer" target="_blank">webkitgtk_2.20.2.bb</a><br>
&gt; @@ -21,10 +21,11 @@ SRC_URI = &quot;<a href="http://www.webkitgtk.org/releases/$%7BBPN%7D-$%7BPV%7D.tar.xz" rel="noreferrer" target="_blank">http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz</a> \<br>
&gt;             file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \<br>
&gt;             file://0001-Fix-build-with-musl.patch \<br>
&gt;             file://detect-gstreamer-gl.patch \<br>
&gt; +           file://0012-soup-Forward-declare-URL-class.patch \<br>
&gt;             &quot;<br>
&gt;<br>
&gt; -SRC_URI[md5sum] = &quot;0cd9b9ae1f48c04de5314f77806eceb4&quot;<br>
&gt; -SRC_URI[sha256sum] = &quot;43e43285fa4e393080cc4fbd5ad8644749a75b1e0b811b230b63ae56806c8959&quot;<br>
&gt; +SRC_URI[md5sum] = &quot;3fdda40dc10eb2a00d5fba4219b83967&quot;<br>
&gt; +SRC_URI[sha256sum] = &quot;dffe93a241f03f1c73b369f4e323e4d8f12e39d33d5515948cbf454ca4b526e2&quot;<br>
&gt;<br>
&gt;  inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc<br>
&gt;<br>
&gt; @@ -85,7 +86,6 @@ EXTRA_OECMAKE_append_armv4 = &quot; -DENABLE_JIT=OFF &quot;<br>
&gt;  EXTRA_OECMAKE_append_aarch64 = &quot; -DUSE_LD_GOLD=OFF &quot;<br>
&gt;  EXTRA_OECMAKE_append_mipsarch = &quot; -DUSE_LD_GOLD=OFF &quot;<br>
&gt;  EXTRA_OECMAKE_append_powerpc = &quot; -DUSE_LD_GOLD=OFF &quot;<br>
&gt; -EXTRA_OECMAKE_append_toolchain-clang = &quot; -DUSE_LD_GOLD=OFF &quot;<br>
&gt;<br>
&gt;  EXTRA_OECMAKE_append_aarch64 = &quot; -DWTF_CPU_ARM64_CORTEXA53=ON&quot;<br>
&gt;<br>
&gt; --<br>
&gt; 2.17.0<br>
&gt;<br>
&gt; --<br>
&gt; _______________________________________________<br>
&gt; Openembedded-core mailing list<br>
&gt; <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
&gt; <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox series

Patch

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..c689117650
--- /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: Pending
+
+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
similarity index 96%
rename from meta/recipes-sato/webkit/webkitgtk_2.20.1.bb
rename to 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"