From patchwork Sun Feb 2 19:08:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1232424 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=IeLbqOxE; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 489gTy30x9z9s3x for ; Mon, 3 Feb 2020 06:08:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 53A4A86110; Sun, 2 Feb 2020 19:08:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kZKoWIQkWWq9; Sun, 2 Feb 2020 19:08:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E95998610A; Sun, 2 Feb 2020 19:08:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0F2F51BF334 for ; Sun, 2 Feb 2020 19:08:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0B9FC8610A for ; Sun, 2 Feb 2020 19:08:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RdsRrknbzD8O for ; Sun, 2 Feb 2020 19:08:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id 057A486100 for ; Sun, 2 Feb 2020 19:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1580670506; bh=kJ7318UHajH0segxPOxi6atkdMhgXQLqG5XLLpsPiOI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=IeLbqOxExC2m5FHAY1b0nl/ZcFIiErNgeU0GGPVRkHnPQRC7E8PEIK4mMfPy1nA/s Hyn6J0scyaH6N7+qPTFJ8H6g1Rcm5NCQGIjt/nnC95UtgVOgiHcmi/PnnPTgFkYNzP zJj1Ft4E2nQfx/9lz//g7tyL9F9xAT30XMNB+V28= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.183]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MsHnm-1jqySO1hPO-00tiTk; Sun, 02 Feb 2020 20:08:26 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Sun, 2 Feb 2020 20:08:24 +0100 Message-Id: <20200202190824.9856-2-ps.report@gmx.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200202190824.9856-1-ps.report@gmx.net> References: <20200202190824.9856-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:W9Bbtmh8DzaE9PU0aiQ8/T9A4uxG+nWfLGYWuAQdGPgTi8+xlTN BXgsa//cffxkkudE5ENzETblqxggtWfW4M67+SSFtPp4RY0hRYrEtN17EGD29sFXTfmc0dS 2rdeoOX1Vcemybs4MdXK5768/CpGKqE6FB7a6Su+RndG+INpjKYS3E0BHo6e3tRlpnCROVp XycHYPrKVKcfWAxnAVMHw== X-UI-Out-Filterresults: notjunk:1; V03:K0://S+ii35B3M=:FNzxgK13dAHmVjv1O0wfRs gUT3Ku6sGTjIFDYSn/twLaA2Q7IrtANrxLHMlU4+09eBmQpoOfTo59KrfLOClDTYf6YIp/K6l Asm9eCCWy57v7NBjibgQy2yLrksB8+H+LBwSXBRFLlTZbWW43pYzw98sTjkAyruDgWS3doa7w 4r9xjaUErfoECx4lPNEiYcHSWJvR6m9b7FVv/F85LkGHNy4J9Sp1Vt/A4TwQc1u239SYCkN4R jmi5re0FtKs37m4dYC6UyP+QIfJnnwMwq44T67bNzAqFdbBul7TEmkqMgFhZEaQPc89u1K4jF 6IT/gLhc7Kfkab+4pn/zZZ5OHcqksTW3oszF8FB//bNX1ruTP/YwwPmDTADv7cHZbsEb6uYwH JFtAeugZkPsM2NWPF6fJ9NKqF8ubWl+ftAhLZKO3xru8tAsLVcqH8mv25PNk+5FJP0zYixV25 cX5BQOHXGFP0pbPfLwD9mJ2qAt+llkwIzcyjO2CHghlrI4NK7wXQOtuTnqyZuS+pUkWjFvpCh Uk/oqlZohRMemUAhkz+XvdZazfARQG4ARwHyH39dKjtmCm1NnaH0Vd/QUzi0blYMrzCsR4PcL iFBwDXDkZ363y0dZu3zIeJUnZSzgqfA4vyjLmgOfpPCPM9Jgot6rtMX3KVcJecqq7qPtohFuW djY05QQ8+WZhaeymQRpCAGnE+rhyJBbDFxLrV+rA3+UTMXQZB83V62+BppkdPPoPQOm/XOe3s kKglXWHtIEptPOCQoLEq3EprMHQ7s0sj7qELEEyxpawmlLfa7Holk/ZBGjptmNWJgTUGgT+Op OTVIAgMfc89XFWG+ji6v/kyvLk6vYeP/xpjl+/ZDVPM/TSpqHS+I21XXsjbEWlTmqwabYAted 3AaMdh7W4Wr2SwtjWT/NHBjSfm29EsTIhT2cwZaASj/BhxA9BDZgncwMOijMgyCG2TrQxH3xG i2qjHTF3ochW52yPz3la3d7kwCRsoqBGg1ehmLBh/U12m8R6z19jVh0xm728fI08RvW/t7doM QqxakVPxlCCrm3uitqAEk/rXqHfdyzRWSQ0w3LoJv8a/4QcPgnFx3TDTzCphDfC3+lg0IKgUU VPRPcXFLb0F9NtHJ2IIWfxRCCMe0FhyLVoqcQ3+nLNCsIFvY9KcE5Md6ydCTclI9N/3OfuP4q VWXvCWe5YzWsMEQWrln1GQuKGt+b8dtS1buDdS/o4xCHUzopcxqp1Y4UF++ObnwGWplOoOMNy GoKneThLnegc8F9HY Subject: [Buildroot] [PATCH v1 2/2] package/qt5webkit: add patch to fix ICU related compile failure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julien Corjon , Andrea Simeoni , =?utf-8?q?Ga=C3=ABl_Portay?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes (usage of ICU U16_NEXT() macro without trailing semicolon): platform/graphics/SegmentedFontData.cpp:65:9: error: expected ‘;’ before ‘if’ dom/Document.cpp:3850:5: error: expected ‘;’ before ‘if’ dom/Document.cpp:3855:9: error: expected ‘;’ before ‘if’ dom/Document.cpp:3918:9: error: expected ‘;’ before ‘if’ Signed-off-by: Peter Seiderer --- ...005-Fix-ICU-related-compile-failures.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch diff --git a/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch b/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch new file mode 100644 index 0000000000..1a99eb7f84 --- /dev/null +++ b/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch @@ -0,0 +1,67 @@ +From 38e3436db7222ac403a405db7e0fd1d472f1704a Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 2 Feb 2020 10:51:00 +0100 +Subject: [PATCH] Fix ICU related compile failures. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The ICU macro U16_NEXT() needs a trailing semicolon. + +Fixes: + + platform/graphics/SegmentedFontData.cpp:65:9: error: expected ‘;’ before ‘if’ + dom/Document.cpp:3850:5: error: expected ‘;’ before ‘if’ + dom/Document.cpp:3855:9: error: expected ‘;’ before ‘if’ + dom/Document.cpp:3918:9: error: expected ‘;’ before ‘if’ + +Signed-off-by: Peter Seiderer +--- + Source/WebCore/dom/Document.cpp | 6 +++--- + Source/WebCore/platform/graphics/SegmentedFontData.cpp | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp +index af63b141..26f7312b 100644 +--- a/Source/WebCore/dom/Document.cpp ++++ b/Source/WebCore/dom/Document.cpp +@@ -3846,12 +3846,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -3914,7 +3914,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S + const UChar* s = qualifiedName.characters(); + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(s, i, length, c) ++ U16_NEXT(s, i, length, c); + if (c == ':') { + if (sawColon) { + ec = NAMESPACE_ERR; +diff --git a/Source/WebCore/platform/graphics/SegmentedFontData.cpp b/Source/WebCore/platform/graphics/SegmentedFontData.cpp +index efb20a8c..99b3e86c 100644 +--- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp ++++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp +@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length) + { + UChar32 c; + for (int i = 0; i < length; ) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!containsCharacter(c)) + return false; + } +-- +2.25.0 +