FreeBSD Bugzilla – Attachment 186490 Details for
Bug 222270
java/openjfx8-devel: fails to build with ICU 59.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
openjfx8.diff
openjfx8.diff (text/plain), 3.45 KB, created by
Tobias Kortkamp
on 2017-09-17 22:26:55 UTC
(
hide
)
Description:
openjfx8.diff
Filename:
MIME Type:
Creator:
Tobias Kortkamp
Created:
2017-09-17 22:26:55 UTC
Size:
3.45 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 450019) >+++ Makefile (working copy) >@@ -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 >Index: files/patch-icu59 >=================================================================== >--- files/patch-icu59 (nonexistent) >+++ files/patch-icu59 (working copy) >@@ -0,0 +1,64 @@ >+------------------------------------------------------------------------ >+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]; >+--- modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h.orig 2017-07-22 15:59:03 UTC >++++ modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h >+@@ -18,7 +18,7 @@ >+ #if PLATFORM(JAVA) && OS(WINDOWS) >+ typedef wchar_t UChar; >+ #else >+-typedef uint16_t UChar; >++typedef char16_t UChar; >+ #endif >+ >+ // #ifdef UChar32
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
tobik
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 222270
:
186310
|
186490
|
186500
|
186570