Fix build with icu-59.

3 files changed, 51 insertions, 1 deletions

diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 442e98d103a..c574ded2cab 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.94 2017/04/13 16:58:14 jperkin Exp $
+$NetBSD: distinfo,v 1.95 2017/04/25 10:37:26 wiz Exp $
 
 SHA1 (webkitgtk-2.12.4.tar.xz) = ebfe6015d81129b6a13a9596d065c54e9c1b93f6
 RMD160 (webkitgtk-2.12.4.tar.xz) = 9bccd3c05f3c6a28d36f2bb5fdb3a9a58be10539
 SHA512 (webkitgtk-2.12.4.tar.xz) = c512f36679e0f8278544faad70e3b79108ddb4cd52339c5fb784cbb83857c2d30fd240b3e91dd9ecc1b1195f3086844e0716c8284d992b75b4feffda749d73be
 Size (webkitgtk-2.12.4.tar.xz) = 11708368 bytes
 SHA1 (patch-CMakeLists.txt) = c48c0e5d33f378b7ecf31fffef609fb2501e5cd3
+SHA1 (patch-Source_JavaScriptCore_API_JSStringRef.cpp) = 419425db19f685335eab01099d0a941614a2a99c
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 0d82552c6cc1f4885a2bcc539963c966216c977c
@@ -16,6 +17,7 @@ SHA1 (patch-Source_WebCore_platform_FileSystem.cpp) = adef1a42c4e210f0a3dcb82807
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
 SHA1 (patch-Source_WebKit2_CMakeLists.txt) = 10a3fca678095ad04ce43e6d291e3907a44f67b4
 SHA1 (patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 7fbaf11853209cbfea5bb370d35ac985eb30f7ef
+SHA1 (patch-Source_WebKit2_Shared_API_c_WKString.cpp) = 0a735e069ad6412e5c7850067ade0abe24487c1f
 SHA1 (patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp) = 8af6225e01c0fbae866110c3aad46eae5c55ac9e
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 09a837ee65cdc79cc22220ce713e346fe8752c50
 SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 92a0d1563eda8a30a80c4ca3e115e8320d306bf5
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp
new file mode 100644
index 00000000000..0bac5030b75
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp
@@ -0,0 +1,33 @@
+$NetBSD: patch-Source_JavaScriptCore_API_JSStringRef.cpp,v 1.1 2017/04/25 10:37:26 wiz Exp $
+
+Fix build with icu-59.
+
+--- Source/JavaScriptCore/API/JSStringRef.cpp.orig	2016-07-20 12:15:22.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)
+@@ -87,7 +87,7 @@ const JSChar* JSStringGetCharactersPtr(J
+ {
+     if (!string)
+         return nullptr;
+-    return string->characters();
++    return (const JSChar*)string->characters();
+ }
+ 
+ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
diff --git a/www/webkit-gtk/patches/patch-Source_WebKit2_Shared_API_c_WKString.cpp b/www/webkit-gtk/patches/patch-Source_WebKit2_Shared_API_c_WKString.cpp
new file mode 100644
index 00000000000..f9414ff78c2
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-Source_WebKit2_Shared_API_c_WKString.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WebKit2_Shared_API_c_WKString.cpp,v 1.1 2017/04/25 10:37:26 wiz Exp $
+
+Fix build with icu-59.
+
+--- Source/WebKit2/Shared/API/c/WKString.cpp.orig	2016-08-22 12:21:08.000000000 +0000
++++ Source/WebKit2/Shared/API/c/WKString.cpp
+@@ -61,7 +61,7 @@ size_t WKStringGetCharacters(WKStringRef
+     unsigned unsignedBufferLength = std::min<size_t>(bufferLength, std::numeric_limits<unsigned>::max());
+     auto substring = toImpl(stringRef)->stringView().substring(0, unsignedBufferLength);
+ 
+-    substring.getCharactersWithUpconvert(static_cast<UChar*>(buffer));
++    substring.getCharactersWithUpconvert((UChar*)(buffer));
+     return substring.length();
+ }
+