From patchwork Sat Apr 20 01:27:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 162541 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp57677jan; Fri, 19 Apr 2019 18:27:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqyOhEDnaSYMLt0sTx87UXhvnijzcRVQmVSCCR/5wFlkXnAzLrsgGorpCVXXlAz38KZ955HO X-Received: by 2002:a17:902:184:: with SMTP id b4mr6996275plb.26.1555723673399; Fri, 19 Apr 2019 18:27:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555723673; cv=none; d=google.com; s=arc-20160816; b=FNwU+N3vTTVaMf2cFSZNRu3JmDoQZ7LunImPZeAS9KKQt3Z4IRaTBKgGPb8XCW9EzS xM9X0Oo+ALvQDAirwAn/CBsxL98PJrRCmZ6TiF/dlhoDvIWSVlouvSBMGoyzTHGz2syW aAWQ422NNmw4vkM4bqz97BJAqlygF44OD6BNgu4mgMzy+13YdQNN+GuEJwWBf6pDj4rO Hs3JGFumZZrdxoEw29TGpNlykxhA2MKag6nFjRTrcmaymc4Qp74KrfyhanSvPfFySsBz FOrzIfglYYyKz76VwlXvGTalbNvsq6Yto2CNTql/lTJ/3gACIO5EBmayy6TYXD3PmGtJ vjPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=hDnsQFP00buXvHTHbrzCmpI2dwEJvtHOLtHcZLHPNsk=; b=AAYhnSbr0TvkkKjwNzObC1RKVMgwv9Ljv7ezashR4LVAbJcKiZXl11jL4sCD7/E4Mt eS5rpWqVET2WEwrDIyafo4QiYA7RouALQvnHcZLNUOF8JrBuPaMMuosLLann1Ks9mqai BKlXe1l3oPBYZLcstey/xP9FsQp2KiAUMMdKAzLsHInbsZqVPggcNBmabm78DlnxLjHp SoPQR9qc4ylA5w9PIVNXD1MFIz8rVfU3qdifTDE8dmjw55LgaSPKM7vTl8Wl3Vt6pY6x o08jR4Wq5RiCzGt9zubBXzU6RRy6Wt7ippKcDJMHdbqRIME7lmGlY9G5tscyT4YJ2jYZ zLuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sSPhmwW8; 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 f35si6256768pgl.369.2019.04.19.18.27.52; Fri, 19 Apr 2019 18:27:53 -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=sSPhmwW8; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BEA3C7C4DB; Sat, 20 Apr 2019 01:27:47 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mail.openembedded.org (Postfix) with ESMTP id C16D77C4DB for ; Sat, 20 Apr 2019 01:27:45 +0000 (UTC) Received: by mail-pf1-f182.google.com with SMTP id 10so3209021pfo.5 for ; Fri, 19 Apr 2019 18:27:47 -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:mime-version :content-transfer-encoding; bh=8AVFEtu8GWrp6ymA5ErnADQ4JOPRyG2/GBIk+1HiE+Q=; b=sSPhmwW81Omk7pmVC3wutUdTYtTG37FZ7/7bk4a1Id6ySiedhF9oIiL0PeyeHm0bYX lKkZYWPR7NYMmkFK9v+5uhQ9DN6bimHOGOA8jPCcfhHJLasENKbpDyxUBepx7t6BULtm yIbVRbiwTFBbfrrDmN+vB+qRYELFdpWmo8V9QD49mZ1QrX1STEIge4krP2hw9SqdX43R DDGJ/ob/vemEHodjRBYMPzIVVaG6o+3e4x7szavKPtYHkDKdcTQz2OWSTkyaSfqAx6jw i7Q86+Rxu36aWaIc7vjgWOzNXbBRYsBFm7q9zypIMVJGdax+B6whVcciyDX5EzPCuq36 DjNw== 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:mime-version :content-transfer-encoding; bh=8AVFEtu8GWrp6ymA5ErnADQ4JOPRyG2/GBIk+1HiE+Q=; b=lqTxLeaeO8KP8ASZW/1CHE2pTV05DI2L6k5DVzTR6xM2GBKcg6FrF7Ym092mySc1al Aif/LEeDuYgU/8GozJcbdQe6GHHe8FH+e5oEyXEhSqzNNQ3FUnLbGAARzwmRyz1mqGQ+ gxEViP5oD3cAhkXSEi4RPbZlVrsMLMRY/S7FzKxcNjZKfRUFV0TjV1eKqo/t1h293Uz6 yBhGZSBnXqAKHsZOH4Pe9fJhpIy8bAdt47KkVZGNxR3Vxv34JOP7qfW4T+ztI6vVtoHu CUNdkFn/PEckmK087EgO7NtaQnWtTL5gpK5vk6hXGY2S3SbJ5qP+ix62RGyk72kTNDPp wXBA== X-Gm-Message-State: APjAAAUaSmkjfHH0RSL3fxsWsNpafmYZGTNQLhFQ4S+XU60R8M3xObNa 58NSbMA45VffWu1+jjTOT52A8rlcnbM= X-Received: by 2002:a65:424d:: with SMTP id d13mr6876841pgq.318.1555723666158; Fri, 19 Apr 2019 18:27:46 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::5d43]) by smtp.gmail.com with ESMTPSA id d20sm7940602pfo.77.2019.04.19.18.27.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 18:27:45 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Fri, 19 Apr 2019 18:27:38 -0700 Message-Id: <20190420012738.21553-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [OE-core] [PATCH] webkitgtk: Fix build with clang 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Newer version of webkitgtk has some compile failures with clang/libc++ combination. Signed-off-by: Khem Raj --- .../webkit/webkitgtk/include_array.patch | 15 +++++++++ .../webkit/webkitgtk/narrowing.patch | 31 +++++++++++++++++++ .../webkit/webkitgtk/snprintf.patch | 15 +++++++++ meta/recipes-sato/webkit/webkitgtk_2.24.0.bb | 3 ++ 4 files changed, 64 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/include_array.patch create mode 100644 meta/recipes-sato/webkit/webkitgtk/narrowing.patch create mode 100644 meta/recipes-sato/webkit/webkitgtk/snprintf.patch -- 2.21.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/include_array.patch b/meta/recipes-sato/webkit/webkitgtk/include_array.patch new file mode 100644 index 0000000000..7268b04bf4 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/include_array.patch @@ -0,0 +1,15 @@ +Added missing include for std::array + +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197085] +Signed-off-by: Khem Raj + +--- webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp.org 2019-04-18 18:03:50.226231691 -0700 ++++ webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp 2019-04-18 18:07:28.569153989 -0700 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/meta/recipes-sato/webkit/webkitgtk/narrowing.patch b/meta/recipes-sato/webkit/webkitgtk/narrowing.patch new file mode 100644 index 0000000000..598b6b5df5 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/narrowing.patch @@ -0,0 +1,31 @@ +Fix build with clang on arm where char is unsigned + +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197087] +Signed-off-by: Khem Raj + +--- a/Source/WebCore/contentextensions/DFACombiner.cpp ++++ b/Source/WebCore/contentextensions/DFACombiner.cpp +@@ -37,7 +37,7 @@ namespace WebCore { + namespace ContentExtensions { + + class DFAMerger { +- typedef MutableRangeList CombinedTransitionsMutableRangeList; ++ typedef MutableRangeList CombinedTransitionsMutableRangeList; + + enum class WhichDFA { + A, +--- a/Source/WebCore/contentextensions/NFAToDFA.cpp ++++ b/Source/WebCore/contentextensions/NFAToDFA.cpp +@@ -41,9 +41,9 @@ namespace WebCore { + + namespace ContentExtensions { + +-typedef MutableRange NFANodeRange; +-typedef MutableRangeList NFANodeRangeList; +-typedef MutableRangeList PreallocatedNFANodeRangeList; ++typedef MutableRange NFANodeRange; ++typedef MutableRangeList NFANodeRangeList; ++typedef MutableRangeList PreallocatedNFANodeRangeList; + typedef Vector UniqueNodeList; + typedef Vector NFANodeClosures; + diff --git a/meta/recipes-sato/webkit/webkitgtk/snprintf.patch b/meta/recipes-sato/webkit/webkitgtk/snprintf.patch new file mode 100644 index 0000000000..b1481d78e8 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/snprintf.patch @@ -0,0 +1,15 @@ +include missing header for snprintf definition + +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197088] +Signed-off-by: Khem Raj + +--- a/Source/WebCore/platform/text/TextCodec.cpp ++++ b/Source/WebCore/platform/text/TextCodec.cpp +@@ -28,6 +28,7 @@ + #include "TextCodec.h" + + #include ++#include + + namespace WebCore { + diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb index 4a82dae9ef..a023a369f7 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb @@ -20,6 +20,9 @@ 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://include_array.patch \ + file://narrowing.patch \ + file://snprintf.patch \ " SRC_URI[md5sum] = "576d69c598b3e36c73441052d02466de"