commit df7a26437aafb8ff89c3aa3ccd6444f793e59ed3 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Nov 25 12:27:23 2017 +1100 qtwebkit: 5.9.0 -> 5.9.1 diff --git a/qtwebkit/.footprint b/qtwebkit/.footprint index 47ae888ac..0b9f829c8 100644 --- a/qtwebkit/.footprint +++ b/qtwebkit/.footprint @@ -2,42 +2,42 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/qt5/ drwxr-xr-x root/root usr/include/qt5/QtWebKit/ -drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.9.0/ -drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/ -drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/ --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/bytearraytestdata.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qhttpheader_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qquicknetworkreply_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qquicknetworkrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qquickurlschemedelegate_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qquickwebpage_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qquickwebpage_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qquickwebview_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qquickwebview_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qrawwebview_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qrawwebview_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qtwebsecurityorigin_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebchannelwebkittransport_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebdatabase_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebdownloaditem_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebdownloaditem_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebelement_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebhistory_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebiconimageprovider_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebkittest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebloadrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebnavigationhistory_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebnavigationhistory_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebnavigationrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebpermissionrequest_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebplugindatabase_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebpreferences_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebpreferences_p_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebscriptworld.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebscriptworld_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/qwebsecurityorigin_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/testwindow.h --rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/util.h +drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.9.1/ +drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/ +drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/ +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/bytearraytestdata.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qhttpheader_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquicknetworkreply_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquicknetworkrequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquickurlschemedelegate_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquickwebpage_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquickwebpage_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquickwebview_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qquickwebview_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qrawwebview_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qrawwebview_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qtwebsecurityorigin_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebchannelwebkittransport_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebdatabase_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebdownloaditem_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebdownloaditem_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebelement_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebhistory_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebiconimageprovider_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebkittest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebloadrequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebnavigationhistory_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebnavigationhistory_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebnavigationrequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebpermissionrequest_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebplugindatabase_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebpreferences_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebpreferences_p_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebscriptworld.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebscriptworld_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/qwebsecurityorigin_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/testwindow.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKit/5.9.1/QtWebKit/private/util.h -rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebDatabase -rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebElement -rw-rw-r-- root/root usr/include/qt5/QtWebKit/QWebElementCollection @@ -70,13 +70,13 @@ drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.9.0/QtWebKit/private/ -rw-rw-r-- root/root usr/include/qt5/QtWebKit/qwebsecurityorigin.h -rw-rw-r-- root/root usr/include/qt5/QtWebKit/qwebsettings.h drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.9.0/ -drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.9.0/QtWebKitWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.9.0/QtWebKitWidgets/private/ --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.0/QtWebKitWidgets/private/qwebframe_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.0/QtWebKitWidgets/private/qwebinspector_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.0/QtWebKitWidgets/private/qwebpage_p.h --rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.0/QtWebKitWidgets/private/qwebviewaccessible_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.9.1/ +drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/ +drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/private/ +-rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/private/qwebframe_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/private/qwebinspector_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/private/qwebpage_p.h +-rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/5.9.1/QtWebKitWidgets/private/qwebviewaccessible_p.h -rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/QGraphicsWebView -rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/QWebFrame -rw-rw-r-- root/root usr/include/qt5/QtWebKitWidgets/QWebHitTestResult @@ -102,16 +102,16 @@ drwxr-xr-x root/root usr/lib/cmake/Qt5WebKitWidgets/ -rw-r--r-- root/root usr/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake -rw-r--r-- root/root usr/lib/libQt5WebKit.la -rw-r--r-- root/root usr/lib/libQt5WebKit.prl -lrwxrwxrwx root/root usr/lib/libQt5WebKit.so -> libQt5WebKit.so.5.9.0 -lrwxrwxrwx root/root usr/lib/libQt5WebKit.so.5 -> libQt5WebKit.so.5.9.0 -lrwxrwxrwx root/root usr/lib/libQt5WebKit.so.5.9 -> libQt5WebKit.so.5.9.0 --rwxr-xr-x root/root usr/lib/libQt5WebKit.so.5.9.0 +lrwxrwxrwx root/root usr/lib/libQt5WebKit.so -> libQt5WebKit.so.5.9.1 +lrwxrwxrwx root/root usr/lib/libQt5WebKit.so.5 -> libQt5WebKit.so.5.9.1 +lrwxrwxrwx root/root usr/lib/libQt5WebKit.so.5.9 -> libQt5WebKit.so.5.9.1 +-rwxr-xr-x root/root usr/lib/libQt5WebKit.so.5.9.1 -rw-r--r-- root/root usr/lib/libQt5WebKitWidgets.la -rw-r--r-- root/root usr/lib/libQt5WebKitWidgets.prl -lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so -> libQt5WebKitWidgets.so.5.9.0 -lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so.5 -> libQt5WebKitWidgets.so.5.9.0 -lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so.5.9 -> libQt5WebKitWidgets.so.5.9.0 --rwxr-xr-x root/root usr/lib/libQt5WebKitWidgets.so.5.9.0 +lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so -> libQt5WebKitWidgets.so.5.9.1 +lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so.5 -> libQt5WebKitWidgets.so.5.9.1 +lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so.5.9 -> libQt5WebKitWidgets.so.5.9.1 +-rwxr-xr-x root/root usr/lib/libQt5WebKitWidgets.so.5.9.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebKit.pc -rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebKitWidgets.pc diff --git a/qtwebkit/.md5sum b/qtwebkit/.md5sum index b29a2e118..0ccc04cb5 100644 --- a/qtwebkit/.md5sum +++ b/qtwebkit/.md5sum @@ -1,2 +1 @@ -492b78259568db236fe637faafdba9bd QTBUG-60532.patch -1fc0ed873cc9326b823a8a83126714f5 qtwebkit-opensource-src-5.9.0.tar.xz +c7a5eb579c2476ff54f8cff2111b0910 qtwebkit-opensource-src-5.9.1.tar.xz diff --git a/qtwebkit/.signature b/qtwebkit/.signature index 361d4c711..581ca52b3 100644 --- a/qtwebkit/.signature +++ b/qtwebkit/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SHSopsWLiHIykc3Ybq90QWOtPI7XhaTL/oa7oz5+GRb7zlfay/XrtsMwlCvHuXMPKDMfeehCi74dMVabMG5pQ4= -SHA256 (Pkgfile) = ad358f2d475fa00d2d7ae9ebff19286576f2e7053ee174155d8c25ff9094d477 -SHA256 (.footprint) = 9338ea36920305245f9e092a29966fe725d8e3263824fb1dec1767807922bd7b -SHA256 (qtwebkit-opensource-src-5.9.0.tar.xz) = 8dad193b740055a998312e04a040f2e32a923c0823b2d239b24eab08276a4e04 -SHA256 (QTBUG-60532.patch) = da435d36b9129f6f097ca57244c28668114c2a2205af1d8e2a6706ca9fb06ae1 +RWSE3ohX2g5d/fzZqy/RzFDTBm3/H3rfA8YDPxV7xgEiUrbtBuVz4L4Wk+AbsVZO0ZM9Qx3aO4gtLmqmJSlHGMnR+8WrZMcauQE= +SHA256 (Pkgfile) = a402b40e74f9d118005b19f28366a8e4746b9364c53fba7a46d5d92421e4a490 +SHA256 (.footprint) = 4330f1d93669cb4f69124ee8442e60a44fd65690443ceb7321e7e17c0557ef45 +SHA256 (qtwebkit-opensource-src-5.9.1.tar.xz) = 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf diff --git a/qtwebkit/Pkgfile b/qtwebkit/Pkgfile index b8283c0f4..b2b7ab24d 100644 --- a/qtwebkit/Pkgfile +++ b/qtwebkit/Pkgfile @@ -1,22 +1,19 @@ # Description: QtWebKit for qt5. # URL: https://www.qt.io/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Tsaop, leeroy at cock dot li # Depends on: qt5 ruby icu name=qtwebkit -version=5.9.0 -release=2 -source=(https://download.qt.io/community_releases/${version::3}/$version-final/$name-opensource-src-$version.tar.xz - QTBUG-60532.patch) +version=5.9.1 +release=1 +source=(https://download.qt.io/archive/qt/${version::3}/$version/submodules/$name-opensource-src-$version.tar.xz) build() { cd $name-opensource-src-$version - patch -p1 -i $SRC/QTBUG-60532.patch - install -d build cd build + qmake-qt5 .. make make INSTALL_ROOT=$PKG install diff --git a/qtwebkit/QTBUG-60532.patch b/qtwebkit/QTBUG-60532.patch deleted file mode 100644 index 9a60ef0d4..000000000 --- a/qtwebkit/QTBUG-60532.patch +++ /dev/null @@ -1,91 +0,0 @@ -From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev <annulen@yandex.ru> -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 <allan.jensen@qt.io> ---- - 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 812f3d4..77a3fd0 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<const UChar*>(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<const UChar*>(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<const JSChar*>(string->characters()); - } - - size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) -diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp -index 0b57f01..05e2733 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<const UChar*>(winTimeZoneName)); - #else - struct tm gtm = t; - char timeZoneName[70]; -diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h -index 9df2c95..f5d6121 100644 ---- a/Source/WTF/wtf/TypeTraits.h -+++ b/Source/WTF/wtf/TypeTraits.h -@@ -72,6 +72,9 @@ namespace WTF { - template<> struct IsInteger<unsigned long> { static const bool value = true; }; - template<> struct IsInteger<long long> { static const bool value = true; }; - template<> struct IsInteger<unsigned long long> { 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<char16_t> { static const bool value = true; }; -+#endif - #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) - template<> struct IsInteger<wchar_t> { 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 cbac67d..23400a6 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<UChar*>(buffer), bufferLength)); -+ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength)); - } - - size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) --- -2.7.4