Attachment 186520 Details for Bug 222433 – ICU 59 version

[patch] ICU 59 version

icu59-c++11-only.diff (text/plain), 4.54 KB, created by Jan Beich on 2017-09-18 21:54:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-09-18 21:54:14 UTC

Size: 4.54 KB

patch

obsolete

>From 4c1cc401aa7bf696660b642df24660a693238859 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Mon, 18 Sep 2017 21:47:10 +0000
>Subject: [PATCH] devel/icu: drop C++98 support in consumers
>
>PR:		222433
>Exp-run by:	???
>---
> devel/icu/Makefile                              |  2 +-
> devel/icu/files/patch-common_unicode_platform.h | 18 --------------
> devel/icu/files/patch-common_unicode_umachine.h | 11 ---------
> devel/icu/files/patch-common_unicode_unistr.h   | 33 -------------------------
> 4 files changed, 1 insertion(+), 63 deletions(-)
> delete mode 100644 devel/icu/files/patch-common_unicode_umachine.h
> delete mode 100644 devel/icu/files/patch-common_unicode_unistr.h
>
>diff --git a/devel/icu/Makefile b/devel/icu/Makefile
>index 707944ac2681..ba6ee8c4cf36 100644
>--- a/devel/icu/Makefile
>+++ b/devel/icu/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	icu
> DISTVERSION=	59_1
>-PORTREVISION?=	0 # keep for icu-lx
>+PORTREVISION?=	1 # keep for icu-lx
> PORTEPOCH?=	1
> CATEGORIES?=	devel
> MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PORTVERSION}/
>diff --git a/devel/icu/files/patch-common_unicode_platform.h b/devel/icu/files/patch-common_unicode_platform.h
>index 60c8a8446aa2..9caba85783a7 100644
>--- a/devel/icu/files/patch-common_unicode_platform.h
>+++ b/devel/icu/files/patch-common_unicode_platform.h
>@@ -11,21 +11,3 @@
>  #elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__)
>      /* gcc */
>  #   define U_IS_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
>-@@ -498,11 +498,15 @@
>- #   define U_CPLUSPLUS_VERSION 1
>- #endif
>- 
>--#if (U_PLATFORM == U_PF_AIX || U_PLATFORM == U_PF_OS390) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11)
>-+#if defined(__cplusplus) && (U_CPLUSPLUS_VERSION < 11)
>- // add in std::nullptr_t
>- namespace std {
>-+#if (U_PLATFORM == U_PF_AIX || U_PLATFORM == U_PF_OS390)
>-   typedef decltype(nullptr) nullptr_t;
>--};
>-+#elif defined(__GNUC__) && !defined(__clang__)
>-+  typedef __decltype(__null) nullptr_t;
>-+#endif
>-+}
>- #endif
>- 
>- /**
>diff --git a/devel/icu/files/patch-common_unicode_umachine.h b/devel/icu/files/patch-common_unicode_umachine.h
>deleted file mode 100644
>index b5495e6df585..000000000000
>--- a/devel/icu/files/patch-common_unicode_umachine.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- common/unicode/umachine.h.orig	2017-03-16 19:01:12 UTC
>-+++ common/unicode/umachine.h
>-@@ -295,7 +295,7 @@ typedef int8_t UBool;
>-  * If 1, then char16_t is a typedef and not a real type (yet)
>-  * @internal
>-  */
>--#if (U_PLATFORM == U_PF_AIX) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11)
>-+#if defined(__cplusplus) && (U_CPLUSPLUS_VERSION < 11)
>- // for AIX, uchar.h needs to be included
>- # include <uchar.h>
>- # define U_CHAR16_IS_TYPEDEF 1
>diff --git a/devel/icu/files/patch-common_unicode_unistr.h b/devel/icu/files/patch-common_unicode_unistr.h
>deleted file mode 100644
>index 334f3633af18..000000000000
>--- a/devel/icu/files/patch-common_unicode_unistr.h
>+++ /dev/null
>@@ -1,33 +0,0 @@
>---- common/unicode/unistr.h.orig	2017-03-29 04:44:37 UTC
>-+++ common/unicode/unistr.h
>-@@ -117,12 +117,20 @@ class UnicodeStringAppendable;  // unicode/appendable.
>-  * The string parameter must be a C string literal.
>-  * The length of the string, not including the terminating
>-  * <code>NUL</code>, must be specified as a constant.
>-+ * The U_STRING_DECL macro should be invoked exactly once for one
>-+ * such string variable before it is used.
>-  * @stable ICU 2.0
>-  */
>- #if !U_CHAR16_IS_TYPEDEF
>- # define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, u ## cs, _length)
>-+#elif defined(U_DECLARE_UTF16)
>-+# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t *)U_DECLARE_UTF16(cs), _length)
>-+#elif U_SIZEOF_WCHAR_T==U_SIZEOF_UCHAR && (U_CHARSET_FAMILY==U_ASCII_FAMILY || (U_SIZEOF_UCHAR == 2 && defined(U_WCHAR_IS_UTF16)))
>-+# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t *)L ## cs, _length)
>-+#elif U_SIZEOF_UCHAR==1 && U_CHARSET_FAMILY==U_ASCII_FAMILY
>-+# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t *)cs, _length)
>- #else
>--# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t*)u ## cs, _length)
>-+# define UNICODE_STRING(cs, _length) icu::UnicodeString(cs, _length, US_INV)
>- #endif
>- 
>- /**
>-@@ -3985,7 +3993,7 @@ UnicodeString::isBufferWritable() const
>- inline const char16_t *
>- UnicodeString::getBuffer() const {
>-   if(fUnion.fFields.fLengthAndFlags&(kIsBogus|kOpenGetBuffer)) {
>--    return nullptr;
>-+    return NULL;
>-   } else if(fUnion.fFields.fLengthAndFlags&kUsingStackBuffer) {
>-     return fUnion.fStackFields.fBuffer;
>-   } else {

Actions: View | Diff

Attachments on bug 222433: 186520 | 190361