[OE-core] [PATCH V2] webkitgtk: Upgrade to 2.20.2

Burton, Ross ross.burton at intel.com
Mon May 21 14:54:42 UTC 2018


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 at 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 at 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 at 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 at 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 at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core



More information about the Openembedded-core mailing list