Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 0EC107A1B9 for ; Mon, 24 Apr 2017 15:40:14 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id B38B884DF4; Mon, 24 Apr 2017 15:40:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 447FF84DE6 for ; Mon, 24 Apr 2017 15:40:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 12zUaThRFJGt for ; Mon, 24 Apr 2017 15:40:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8514C84D72 for ; Mon, 24 Apr 2017 15:40:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 807B2FBE4; Mon, 24 Apr 2017 15:40:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1493048412188980" MIME-Version: 1.0 Date: Mon, 24 Apr 2017 15:40:12 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/www/webkit24-gtk To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20170424154012.807B2FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1493048412188980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Mon Apr 24 15:40:12 UTC 2017 Modified Files: pkgsrc/www/webkit24-gtk: distinfo pkgsrc/www/webkit24-gtk/patches: patch-Source_WTF_wtf_Platform.h Added Files: pkgsrc/www/webkit24-gtk/patches: patch-Source_JavaScriptCore_API_JSStringRef.cpp Log Message: Fix build with icu-59. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/webkit24-gtk/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/webkit24-gtk/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1493048412188980 Content-Disposition: inline Content-Length: 4934 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/webkit24-gtk/distinfo diff -u pkgsrc/www/webkit24-gtk/distinfo:1.5 pkgsrc/www/webkit24-gtk/distinfo:1.6 --- pkgsrc/www/webkit24-gtk/distinfo:1.5 Sat Dec 3 16:30:05 2016 +++ pkgsrc/www/webkit24-gtk/distinfo Mon Apr 24 15:40:12 2017 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.5 2016/12/03 16:30:05 martin Exp $ +$NetBSD: distinfo,v 1.6 2017/04/24 15:40:12 wiz Exp $ SHA1 (webkitgtk-2.4.11.tar.xz) = e425ae86084ab6335dadb368c9e8f53600665d54 RMD160 (webkitgtk-2.4.11.tar.xz) = e1f72498f911465f5ba152313dd9c62ae8d5eee6 SHA512 (webkitgtk-2.4.11.tar.xz) = 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb Size (webkitgtk-2.4.11.tar.xz) = 9869100 bytes +SHA1 (patch-Source_JavaScriptCore_API_JSStringRef.cpp) = 633d5e3fa945cb443ea8c58337ba6ec78fc093b2 SHA1 (patch-Source_JavaScriptCore_ForwardingHeaders_JavaScriptCore_JSCallbackFunction.h) = 79122450435eb12a57086d18e5410eec131c33b2 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 2ff343ac53b14af0692754a44059e7d2ea969b96 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 69221390dd5fdac55abf341c5ae3a03267e38ae6 @@ -12,7 +13,7 @@ SHA1 (patch-Source_JavaScriptCore_heap_M SHA1 (patch-Source_JavaScriptCore_runtime_VM.cpp) = ddc2a6edfc43df78b06e215412b2d1af1cf5777a SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = bce39efce126793c2a33ab99224ca44860273a5b -SHA1 (patch-Source_WTF_wtf_Platform.h) = a2357c134c0e8ad1df7f0ef949ed8fa3cfc4c5fa +SHA1 (patch-Source_WTF_wtf_Platform.h) = 1d7954be841df6b99934721706a9deafc69d250b SHA1 (patch-Source_WTF_wtf_dtoa_utils.h) = 3e00331ef4ea5dd71a07f0952da089ccd67a9e66 SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 2835657e04cdbc0cc7be8a6793061f0b98f84224 SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = 6d3b9ee1559a18c17229698e44246f13c77278c9 Index: pkgsrc/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h diff -u pkgsrc/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h:1.2 pkgsrc/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h:1.3 --- pkgsrc/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h:1.2 Sat Dec 3 16:30:05 2016 +++ pkgsrc/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h Mon Apr 24 15:40:12 2017 @@ -1,9 +1,9 @@ -$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.2 2016/12/03 16:30:05 martin Exp $ +$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.3 2017/04/24 15:40:12 wiz Exp $ Add support for sparc and sparc64, disable ASSEMBLER and YARR_JIT for now ---- Source/WTF/wtf/Platform.h.orig 2016-04-10 08:48:36.000000000 +0200 -+++ Source/WTF/wtf/Platform.h 2016-12-02 18:12:33.703875988 +0100 +--- Source/WTF/wtf/Platform.h.orig 2016-04-10 06:48:36.000000000 +0000 ++++ Source/WTF/wtf/Platform.h @@ -153,6 +153,18 @@ #define WTF_CPU_BIG_ENDIAN 1 #endif @@ -53,4 +53,3 @@ Add support for sparc and sparc64, disab /* If the Disassembler is enabled, then the Assembler must be enabled as well: */ #if ENABLE(DISASSEMBLER) - Added files: Index: pkgsrc/www/webkit24-gtk/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp diff -u /dev/null pkgsrc/www/webkit24-gtk/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp:1.1 --- /dev/null Mon Apr 24 15:40:12 2017 +++ pkgsrc/www/webkit24-gtk/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp Mon Apr 24 15:40:12 2017 @@ -0,0 +1,33 @@ +$NetBSD: patch-Source_JavaScriptCore_API_JSStringRef.cpp,v 1.1 2017/04/24 15:40:12 wiz Exp $ + +Fix build with icu-59.1. + +--- Source/JavaScriptCore/API/JSStringRef.cpp.orig 2016-04-10 06:48:36.000000000 +0000 ++++ 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((const UChar*)chars, numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CStrin + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying((const UChar*)chars, numChars)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef str + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return (const JSChar *)string->characters(); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) --_----------=_1493048412188980--