Attachment 186310 Details for Bug 222270 – partial fix

[patch] partial fix

openjfx8-icu59.diff (text/plain), 6.49 KB, created by Jan Beich on 2017-09-12 21:45:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-09-12 21:45:09 UTC

Size: 6.49 KB

patch

obsolete

>From b34ab1b95207d02b13465cdaae319094be6adca7 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Tue, 12 Sep 2017 19:28:41 +0000
>Subject: [PATCH] java/openjfx8-devel: unbreak with ICU 59.1
>
>modules/web/src/main/native/Source/JavaScriptCore/API/JSStringRef.cpp:40:13: error: no matching function for call to 'create'
>    return &OpaqueJSString::create(chars, numChars).leakRef();
>            ^~~~~~~~~~~~~~~~~~~~~~
>modules/web/src/main/native/Source/JavaScriptCore/API/OpaqueJSString.h:48:32: note: candidate function not viable: no known conversion from 'const JSChar *' (aka 'const unsigned short *') to 'const LChar *' (aka 'const unsigned char *') for 1st argument
>    static Ref<OpaqueJSString> create(const LChar* characters, unsigned length)
>                               ^
>modules/web/src/main/native/Source/JavaScriptCore/API/OpaqueJSString.h:53:32: note: candidate function not viable: no known conversion from 'const JSChar *' (aka 'const unsigned short *') to 'const UChar *' (aka 'const char16_t *') for 1st argument
>    static Ref<OpaqueJSString> create(const UChar* characters, unsigned length)
>                               ^
>modules/web/src/main/native/Source/JavaScriptCore/API/OpaqueJSString.h:43:32: note: candidate function not viable: requires 0 arguments, but 2 were provided
>    static Ref<OpaqueJSString> create()
>                               ^
>modules/web/src/main/native/Source/JavaScriptCore/API/OpaqueJSString.h:58:53: note: candidate function not viable: requires 1 argument, but 2 were provided
>    JS_EXPORT_PRIVATE static RefPtr<OpaqueJSString> create(const String&);
>                                                    ^
>modules/web/src/main/native/Source/JavaScriptCore/API/JSStringRef.cpp:65:35: error: no matching function for call to 'createWithoutCopying'
>    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef();
>                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>modules/web/src/main/native/Source/WTF/wtf/text/StringImpl.h:385:50: note: candidate function not viable: no known conversion from 'const JSChar *' (aka 'const unsigned short *') to 'const UChar *' (aka 'const char16_t *') for 1st argument
>    WTF_EXPORT_STRING_API static Ref<StringImpl> createWithoutCopying(const UChar* characters, unsigned length);
>                                                 ^
>modules/web/src/main/native/Source/WTF/wtf/text/StringImpl.h:386:50: note: candidate function not viable: no known conversion from 'const JSChar *' (aka 'const unsigned short *') to 'const LChar *' (aka 'const unsigned char *') for 1st argument
>    WTF_EXPORT_STRING_API static Ref<StringImpl> createWithoutCopying(const LChar* characters, unsigned length);
>                                                 ^
>modules/web/src/main/native/Source/JavaScriptCore/API/JSStringRef.cpp:90:12: error: cannot initialize return object of type 'const JSChar *' (aka 'const unsigned short *') with an rvalue of type 'const UChar *' (aka 'const char16_t *')
>    return string->characters();
>           ^~~~~~~~~~~~~~~~~~~~
>
>PR:		222270
>Obtained from:	upstream (WebKit, rebased)
>---
> java/openjfx8-devel/Makefile          |  2 +-
> java/openjfx8-devel/files/patch-icu59 | 53 +++++++++++++++++++++++++++++++++++
> 2 files changed, 54 insertions(+), 1 deletion(-)
> create mode 100644 java/openjfx8-devel/files/patch-icu59
>
>diff --git a/java/openjfx8-devel/Makefile b/java/openjfx8-devel/Makefile
>index 9fa20bcb5bb0..bea2792c31e4 100644
>--- a/java/openjfx8-devel/Makefile
>+++ b/java/openjfx8-devel/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	openjfx8
> PORTVERSION=	20170722
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	java x11-toolkits devel
> MASTER_SITES=	https://bitbucket.org/tobik/openjfx-rt/get/freebsd${PORTVERSION}${EXTRACT_SUFX}?dummy=/
> PKGNAMESUFFIX=	-devel
>diff --git a/java/openjfx8-devel/files/patch-icu59 b/java/openjfx8-devel/files/patch-icu59
>new file mode 100644
>index 000000000000..a070dba84b98
>--- /dev/null
>+++ b/java/openjfx8-devel/files/patch-icu59
>@@ -0,0 +1,53 @@
>+------------------------------------------------------------------------
>+r216187 | annulen@yandex.ru | 2017-05-05 00:33:41 +0900 (Fri, 05 May 2017) | 28 lines
>+
>+Fix compilation with ICU 59.1
>+https://bugs.webkit.org/show_bug.cgi?id=171612
>+
>+Reviewed by Mark Lam.
>+
>+ICU 59.1 has broken source compatibility. Now it defines UChar as
>+char16_t, which does not allow automatic type conversion from unsigned
>+short in C++ code.
>+
>+--- modules/web/src/main/native/Source/JavaScriptCore/API/JSStringRef.cpp.orig	2017-07-22 15:59:03 UTC
>++++ modules/web/src/main/native/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* 
>+ JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
>+ {
>+     initializeThreading();
>+-    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef();
>++    return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars)).leakRef();
>+ }
>+ 
>+ JSStringRef JSStringRetain(JSStringRef string)
>+@@ -87,7 +87,7 @@ const JSChar* JSStringGetCharactersPtr(JSStringRef str
>+ {
>+     if (!string)
>+         return nullptr;
>+-    return string->characters();
>++    return reinterpret_cast<const JSChar*>(string->characters());
>+ }
>+ 
>+ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
>+--- modules/web/src/main/native/Source/JavaScriptCore/runtime/DateConversion.cpp.orig	2017-07-22 15:59:03 UTC
>++++ modules/web/src/main/native/Source/JavaScriptCore/runtime/DateConversion.cpp
>+@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, Date
>+ #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];

Actions: View | Diff

Attachments on bug 222270: 186310 | 186490 | 186500 | 186570