From patchwork Thu Nov 16 14:23:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 838603 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FMU6VwTx"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yd3mR1J71z9s7M for ; Fri, 17 Nov 2017 01:39:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1CCE78782F; Thu, 16 Nov 2017 14:39:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sZpxiW7yr7OV; Thu, 16 Nov 2017 14:39:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 96AFB87802; Thu, 16 Nov 2017 14:39:27 +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 7B9C11C221A for ; Thu, 16 Nov 2017 14:23:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 760568732F for ; Thu, 16 Nov 2017 14:23:17 +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 kB+juYgzfvCk for ; Thu, 16 Nov 2017 14:23:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1B80A8728D for ; Thu, 16 Nov 2017 14:23:16 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id 70so406142wmf.1 for ; Thu, 16 Nov 2017 06:23:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=hJ81t0aTLNlKvA0L68dWGU6gn/+9oeHlnd+KVj5ejxE=; b=FMU6VwTxVcY4FhZOVx+/3r0C+y6HcCC+sNjVPgPXIqnay6pglnmsiidWau7ujN9AI/ QP1PA20UStMx2XK/Fj3gtMUdoKnyVVewsVUH3tbnGKsAdDUfXrCu1ceFpdd/EgEY+sq4 ZJVgwnGossWYgbNRLffvTPtmetyElUW2nUYoyEInWraOCqbDAHInxRp4mDlfEwsQqN5p e6odFL6YPheMQ6Y+x/3iShjZNsYomow8b1yDPLGJntyXutX4hsiykLABk9ue2RqSlv9D 2z9v9tUtEjL0rXhVmSTOT6xl/atuJYYokLswIgcofQPPtfdwxQRNR9ps2H4jf1v4pp+D wvdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=hJ81t0aTLNlKvA0L68dWGU6gn/+9oeHlnd+KVj5ejxE=; b=pp3KIgrrAoQFhMPOSoY90oaHbXixGxXuo0ClJN/31B4b3JM+nDN8rJlpOdGPe5e53Y AdKZonlx+m+cNNSypIv55QJXf0uCe778JJyGpvbbyMh1JSbTaU/lWkbcysW7/HDjJVSI a/+16TGMjVfz0bO0Y+hnKg4OTELw7UzQ9wLqhWPc8rJHWLQ+2834nRBnbKUjPlSemkSS /PAAqRz7DDcIqH9HDZMgAUZdNgFjPD6PQkuLiafcVTVfedl4ozFg+FGrKsRQeg+K9NqD pOvzfk3pJdGahjuNQ6sBCuAIhsRb+W7quvWsoT3Y9ByXSVNlL28H2PDV4pdLvt2ZowYa yB1Q== X-Gm-Message-State: AJaThX7iKLNvuv+IuLsh27CPSG/vcKcpdAn0Ch0r/vYqBE19QvZ82Wy5 OPLyWRZ6pm3FC1Wz8ai6M7HWALMj X-Google-Smtp-Source: AGs4zMYsL8Y7DsJqaMHNRgpoKKcrq65tZWqrw2I2L/JBmgZGFAB+56hlEGrBEru8qPovGyyDRbXkkQ== X-Received: by 10.80.147.16 with SMTP id m16mr2942671eda.121.1510842194203; Thu, 16 Nov 2017 06:23:14 -0800 (PST) Received: from dell.be.48ers.dk (d51a5bc31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id w28sm1244778edl.16.2017.11.16.06.23.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Nov 2017 06:23:13 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.89) (envelope-from ) id 1eFL4N-0007gi-Iv; Thu, 16 Nov 2017 15:23:07 +0100 From: Peter Korsgaard To: buildroot@buildroot.org, ps.report@gmx.net Date: Thu, 16 Nov 2017 15:23:05 +0100 Message-Id: <20171116142305.29500-2-peter@korsgaard.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171116142305.29500-1-peter@korsgaard.com> References: <20171116142305.29500-1-peter@korsgaard.com> Subject: [Buildroot] [PATCH 2/2] qt5webkit: backport upstream icu-59 fix from 5.9 branch to 5.6.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" icu-59.x slightly changed the API, breaking qt5webkit builds. For details, see: https://bugreports.qt.io/browse/QTBUG-60532 Signed-off-by: Peter Korsgaard --- .../5.6.3/0004-Fix-compilation-with-ICU-59.patch | 93 ++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch diff --git a/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch b/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch new file mode 100644 index 0000000000..f3b590eadd --- /dev/null +++ b/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch @@ -0,0 +1,93 @@ +From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Thu, 4 May 2017 15:12:37 +0300 +Subject: [PATCH] Fix compilation with ICU 59 + +Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 + +Task-number: QTBUG-60532 +Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 +Reviewed-by: Allan Sandfeld Jensen +Signed-off-by: Peter Korsgaard +--- + Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++--- + Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- + Source/WTF/wtf/TypeTraits.h | 3 +++ + Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- + 4 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp +index 812f3d413..77a3fd0f4 100644 +--- a/Source/JavaScriptCore/API/JSStringRef.cpp ++++ b/Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(chars, numChars).leakRef(); ++ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return reinterpret_cast(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp +index 0b57f012d..05e27338b 100644 +--- a/Source/JavaScriptCore/runtime/DateConversion.cpp ++++ b/Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index 9df2c95cf..f5d6121fd 100644 +--- a/Source/WTF/wtf/TypeTraits.h ++++ b/Source/WTF/wtf/TypeTraits.h +@@ -72,6 +72,9 @@ namespace WTF { + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; ++#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) ++ template<> struct IsInteger { static const bool value = true; }; ++#endif + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger { static const bool value = true; }; + #endif +diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp +index cbac67dd8..23400a64e 100644 +--- a/Source/WebKit2/Shared/API/c/WKString.cpp ++++ b/Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) +-- +2.11.0 +