From patchwork Tue May 22 02:11:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 136509 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1027629lji; Mon, 21 May 2018 19:12:04 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrD68Ce0q4m5jz104GFy6bmXCS8f8yQ696eLpRMpsnPe9G4nrkoZjOrBG0D053o0qa/2PaB X-Received: by 2002:a62:8ac1:: with SMTP id o62-v6mr22364944pfk.141.1526955124670; Mon, 21 May 2018 19:12:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526955124; cv=none; d=google.com; s=arc-20160816; b=uRhO0Mo5sILPAKQtQOjFl+46Yw9TxXlAVvnkn7sJh5SVej9p2/agkoScZUDA3jCXxV 81NUGgmCNzhGILQnGZQH+owNN96wRoOvAlwzyqYLLNCxbUjCMvggHNeJCXePTVpfm/kD j43Wf+3Lc3gbkyVJQh45dLwcqOVYObLe3ujtp/bn+PRra5M6LkWCfTjJFputBVfl+dWg C5P3dR8mO5yI7tGVJxviGWv8C6voJN0ITCK8v4+jr2GHd02eshufg7Q8gV+Qq2Ncw9vG cIiIXKyNlzM91BIvC3UAWiT6eGEMrECJwEklgpO6NewpzyEtqBz6Izt7Yb3cO3Belclr zrDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=tPsjzFFAl0lKlSHsYVL5pEI4+zPQqabuDtZTDUOdIFM=; b=zf2C4uOZC8CPhGBJTy+O3FMDi3u4+p/vqiRN8xhpc02ahpL4yvgcVnNtPBsoD4agYh 1drJnTGMh9kKHHRgG/8sHYcDLO7R3DOo+uLhihrPbUAvJO1O1C17YVXAZOC1cB5feJ64 TeYNC5yVR2lMTakYVmN9m3PKvkfE8lJlZNmVpezFjmmMBO9W7N138bQRXUmN/q8hkFJR JsUuftqjToMzQ0BjimE9GZG+1ZlYkP36769YGaD3PQb3/n3AuYRMqUtZNrQau9gWDr80 zo4OjEAQLwgpRT7JYwycteXugHRD5NdoALUUJxhBeFOV1cyW/fP6pDoojKXdcAu2XVH1 7AaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hixw9VU5; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s86-v6si15340726pfd.288.2018.05.21.19.12.03; Mon, 21 May 2018 19:12:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hixw9VU5; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3EFAE748B4; Tue, 22 May 2018 02:11:59 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f43.google.com (mail-pl0-f43.google.com [209.85.160.43]) by mail.openembedded.org (Postfix) with ESMTP id 5CF55748A5 for ; Tue, 22 May 2018 02:11:57 +0000 (UTC) Received: by mail-pl0-f43.google.com with SMTP id i5-v6so9901055plt.2 for ; Mon, 21 May 2018 19:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Dmb46D3Gg9bcQhNJhx/nu2ygDjgRpyq2Ejvq0QGvtEs=; b=hixw9VU5ktiI6DU2XVexrnYzTiSq0LWlwGq82f48dxpMVyfFUay1ZfyHPu6GpHTxmi jwLZcF2y9uJDDeWe8lLvij/cntRWtCmbacGfImvDn6m9nz74Z1/6CoDuRGhRAQ8Ske+4 0PE6kw+HkndQ4jcj2uz30Gz+tatuIloWXl1Vi9mZDMySnerxcWNgZr0Gj+qkr3hOFUYn 8vQlxFx3w+fR6c81cmn9r0fmCA0eXsqGFgspXAY6gW/YR3luOn1/Zzzqr/YJ9meYAFd9 XdolAp6o8repu3PBeczifSUiK0lrXyc+U46f07W+JVpiJ5PrE5klDhcfvGFr7OxjCGxC Icaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Dmb46D3Gg9bcQhNJhx/nu2ygDjgRpyq2Ejvq0QGvtEs=; b=UftkjDW1SwdszTHQvIqLaHq477i2Mkla4Hzsq6fmMGtlu1QlGQX7ffhWIe87ENZkcB GwX/A627CLwodNW9tB/LwYlBl0Sowh4YC2lxlHAbDcSq6B2QQZpx07ncvxt55HBgYqc5 D5y6RQ6dQNNG6qn/09PwwSi67DH24l5XAP3bySxD6oQ/C91Lk/YpoDfa1AlkWU62+YVO lI0IfQyGuvwWG420iV/J7eqT7JPv7fvYwAxEOyI5WMCw3RIcXD349SkIbdXO7pPoLTP6 b3M9Ca3GmaJCRSPe2maH9srjzLXft3mrtvFWoHmlDrecv5JJ8m2rTONfZ6MNPhL6ZQkU zCGg== X-Gm-Message-State: ALKqPwdDQdRUnjEEWXOHzspQbpBD0unpcaKrCoNcUefNwHTgMpMYhOyh 6eNPsKz/SKKxTITP+Xp7z6tKTw== X-Received: by 2002:a17:902:3381:: with SMTP id b1-v6mr22820932plc.248.1526955118127; Mon, 21 May 2018 19:11:58 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id x71-v6sm41582146pfe.47.2018.05.21.19.11.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 May 2018 19:11:57 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 21 May 2018 19:11:56 -0700 Message-Id: <20180522021156.6074-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [OE-core] [PATCH V3] webkitgtk: Upgrade to 2.20.2 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Backport a patch to fix build clang 6.0+ driver can correclty detect corss gold linker now Signed-off-by: Khem Raj --- V2: - Remove code to disable gold with clang instead of commenting, and describe why remove V3: - Mark patch status properly as backport .../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 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 +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 checkTLSErrors(const URL&, +GTlsCertificate*, GTlsCertificateFlags); + ^ +Upstream-Status: Backport [https://trac.webkit.org/changeset/231876/webkit] + +Signed-off-by: Khem Raj +--- + 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"