[packages/icu/DEVEL-icu-62] - updated to 62.1 (new soname) - updated cxx-pre11 patch
qboosh
qboosh at pld-linux.org
Wed Aug 1 19:46:56 CEST 2018
commit 6e79aa314729491cf5034fe8c3e154c9b1c1ba35
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Aug 1 19:48:50 2018 +0200
- updated to 62.1 (new soname)
- updated cxx-pre11 patch
icu-cxx-pre11.patch | 92 ++++++++++++++++++++++++++---------------------------
icu.spec | 8 ++---
2 files changed, 50 insertions(+), 50 deletions(-)
---
diff --git a/icu.spec b/icu.spec
index 3076f5a..4308ca9 100644
--- a/icu.spec
+++ b/icu.spec
@@ -6,12 +6,12 @@
Summary: International Components for Unicode
Summary(pl.UTF-8): Międzynarodowe komponenty dla unikodu
Name: icu
-Version: 59.1
-Release: 2
+Version: 62.1
+Release: 1
License: MIT-like
Group: Libraries
Source0: http://download.icu-project.org/files/icu4c/%{version}/%{name}4c-%{ver}-src.tgz
-# Source0-md5: 54923fa9fab5b2b83f235fb72523de37
+# Source0-md5: 490ad9d920158e0314e10ba74ae9a150
Patch0: %{name}-cxx-pre11.patch
URL: http://www.icu-project.org/
BuildRequires: autoconf >= 2.69
@@ -161,7 +161,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n libicu
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libicu*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libicu*.so.59
+%attr(755,root,root) %ghost %{_libdir}/libicu*.so.62
%files -n libicu-devel
%defattr(644,root,root,755)
diff --git a/icu-cxx-pre11.patch b/icu-cxx-pre11.patch
index 3a4457a..6267f69 100644
--- a/icu-cxx-pre11.patch
+++ b/icu-cxx-pre11.patch
@@ -9,9 +9,9 @@
// for AIX, uchar.h needs to be included
# include <uchar.h>
# define U_CHAR16_IS_TYPEDEF 1
---- icu/source/common/unicode/char16ptr.h.orig 2017-03-29 06:44:37.000000000 +0200
-+++ icu/source/common/unicode/char16ptr.h 2017-04-25 17:32:39.386782173 +0200
-@@ -61,12 +61,14 @@
+--- icu/source/common/unicode/char16ptr.h.orig 2018-07-15 12:07:07.749793344 +0200
++++ icu/source/common/unicode/char16ptr.h 2018-07-15 12:12:27.946456358 +0200
+@@ -59,12 +59,14 @@
*/
inline Char16Ptr(wchar_t *p);
#endif
@@ -19,34 +19,34 @@
/**
* nullptr constructor.
* @param p nullptr
- * @draft ICU 59
+ * @stable ICU 59
*/
inline Char16Ptr(std::nullptr_t p);
+#endif
/**
* Destructor.
- * @draft ICU 59
-@@ -114,7 +116,9 @@
+ * @stable ICU 59
+@@ -112,7 +114,9 @@
#if U_SIZEOF_WCHAR_T==2
- Char16Ptr::Char16Ptr(wchar_t *p) : p(cast(p)) {}
+ Char16Ptr::Char16Ptr(wchar_t *p) : p_(cast(p)) {}
#endif
+#ifdef U_HAS_NULLPTR_T
- Char16Ptr::Char16Ptr(std::nullptr_t p) : p(p) {}
+ Char16Ptr::Char16Ptr(std::nullptr_t p) : p_(p) {}
+#endif
Char16Ptr::~Char16Ptr() {
- U_ALIASING_BARRIER(p);
+ U_ALIASING_BARRIER(p_);
}
-@@ -130,7 +134,9 @@
+@@ -128,7 +132,9 @@
#if U_SIZEOF_WCHAR_T==2
- Char16Ptr::Char16Ptr(wchar_t *p) { u.wp = p; }
+ Char16Ptr::Char16Ptr(wchar_t *p) { u_.wp = p; }
#endif
+#ifdef U_HAS_NULLPTR_T
- Char16Ptr::Char16Ptr(std::nullptr_t p) { u.cp = p; }
+ Char16Ptr::Char16Ptr(std::nullptr_t p) { u_.cp = p; }
+#endif
Char16Ptr::~Char16Ptr() {}
- char16_t *Char16Ptr::get() const { return u.cp; }
-@@ -168,12 +174,14 @@
+ char16_t *Char16Ptr::get() const { return u_.cp; }
+@@ -164,12 +170,14 @@
*/
inline ConstChar16Ptr(const wchar_t *p);
#endif
@@ -54,33 +54,33 @@
/**
* nullptr constructor.
* @param p nullptr
- * @draft ICU 59
+ * @stable ICU 59
*/
inline ConstChar16Ptr(const std::nullptr_t p);
+#endif
/**
* Destructor.
-@@ -222,7 +230,9 @@
+@@ -218,7 +226,9 @@
#if U_SIZEOF_WCHAR_T==2
- ConstChar16Ptr::ConstChar16Ptr(const wchar_t *p) : p(cast(p)) {}
+ ConstChar16Ptr::ConstChar16Ptr(const wchar_t *p) : p_(cast(p)) {}
#endif
+#ifdef U_HAS_NULLPTR_T
- ConstChar16Ptr::ConstChar16Ptr(const std::nullptr_t p) : p(p) {}
+ ConstChar16Ptr::ConstChar16Ptr(const std::nullptr_t p) : p_(p) {}
+#endif
ConstChar16Ptr::~ConstChar16Ptr() {
- U_ALIASING_BARRIER(p);
+ U_ALIASING_BARRIER(p_);
}
-@@ -238,7 +248,9 @@
+@@ -234,7 +244,9 @@
#if U_SIZEOF_WCHAR_T==2
- ConstChar16Ptr::ConstChar16Ptr(const wchar_t *p) { u.wp = p; }
+ ConstChar16Ptr::ConstChar16Ptr(const wchar_t *p) { u_.wp = p; }
#endif
+#ifdef U_HASH_NULLPTR_T
- ConstChar16Ptr::ConstChar16Ptr(const std::nullptr_t p) { u.cp = p; }
+ ConstChar16Ptr::ConstChar16Ptr(const std::nullptr_t p) { u_.cp = p; }
+#endif
ConstChar16Ptr::~ConstChar16Ptr() {}
- const char16_t *ConstChar16Ptr::get() const { return u.cp; }
+ const char16_t *ConstChar16Ptr::get() const { return u_.cp; }
--- icu/source/common/unicode/platform.h.orig 2017-03-22 20:06:26.000000000 +0100
+++ icu/source/common/unicode/platform.h 2017-04-25 17:30:01.483450642 +0200
@@ -503,6 +503,10 @@
@@ -94,57 +94,57 @@
#endif
/**
---- icu/source/common/unicode/unistr.h.orig 2017-03-29 06:44:37.000000000 +0200
-+++ icu/source/common/unicode/unistr.h 2017-04-25 17:33:43.030114781 +0200
-@@ -3049,6 +3049,7 @@
- * Do not use #ifndef U_HIDE_DRAFT_API for the following constructor,
- * it should always be available regardless of U_HIDE_DRAFT_API status
- */
+--- icu/source/common/unicode/unistr.h.orig 2018-06-21 11:39:21.000000000 +0200
++++ icu/source/common/unicode/unistr.h 2018-07-15 12:18:27.783118913 +0200
+@@ -3026,6 +3026,7 @@
+ UnicodeString(ConstChar16Ptr(text)) {}
+ #endif
+
+#ifdef U_HAS_NULLPTR_T
/**
* nullptr_t constructor.
* Effectively the same as the default constructor, makes an empty string object.
-@@ -3060,6 +3061,7 @@
- * @draft ICU 59
+@@ -3037,6 +3038,7 @@
+ * @stable ICU 59
*/
UNISTR_FROM_STRING_EXPLICIT inline UnicodeString(const std::nullptr_t text);
+#endif
/**
* char16_t* constructor.
-@@ -3108,6 +3110,7 @@
- * Do not use #ifndef U_HIDE_DRAFT_API for the following constructor,
- * it should always be available regardless of U_HIDE_DRAFT_API status
- */
+@@ -3073,6 +3075,7 @@
+ UnicodeString(ConstChar16Ptr(text), length) {}
+ #endif
+
+#ifdef U_HAS_NULLPTR_T
/**
* nullptr_t constructor.
* Effectively the same as the default constructor, makes an empty string object.
-@@ -3116,6 +3119,7 @@
- * @draft ICU 59
+@@ -3081,6 +3084,7 @@
+ * @stable ICU 59
*/
inline UnicodeString(const std::nullptr_t text, int32_t length);
+#endif
/**
* Readonly-aliasing char16_t* constructor.
-@@ -3202,6 +3206,7 @@
- * Do not use #ifndef U_HIDE_DRAFT_API for the following constructor,
- * it should always be available regardless of U_HIDE_DRAFT_API status
- */
+@@ -3155,6 +3159,7 @@
+ UnicodeString(Char16Ptr(buffer), buffLength, buffCapacity) {}
+ #endif
+
+#ifdef U_HAS_NULLPTR_T
/**
* Writable-aliasing nullptr_t constructor.
* Effectively the same as the default constructor, makes an empty string object.
-@@ -3211,6 +3216,7 @@
- * @draft ICU 59
+@@ -3164,6 +3169,7 @@
+ * @stable ICU 59
*/
inline UnicodeString(std::nullptr_t buffer, int32_t buffLength, int32_t buffCapacity);
+#endif
#if U_CHARSET_IS_UTF8 || !UCONFIG_NO_CONVERSION
-@@ -3924,6 +3930,7 @@
+@@ -3875,6 +3881,7 @@
fUnion.fStackFields.fLengthAndFlags=kShortString;
}
@@ -152,7 +152,7 @@
inline UnicodeString::UnicodeString(const std::nullptr_t /*text*/) {
fUnion.fStackFields.fLengthAndFlags=kShortString;
}
-@@ -3935,6 +3942,7 @@
+@@ -3886,6 +3893,7 @@
inline UnicodeString::UnicodeString(std::nullptr_t /*buffer*/, int32_t /*buffLength*/, int32_t /*buffCapacity*/) {
fUnion.fStackFields.fLengthAndFlags=kShortString;
}
@@ -160,7 +160,7 @@
//========================================
// Read-only implementation methods
-@@ -3985,7 +3993,11 @@
+@@ -3936,7 +3944,11 @@
inline const char16_t *
UnicodeString::getBuffer() const {
if(fUnion.fFields.fLengthAndFlags&(kIsBogus|kOpenGetBuffer)) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icu.git/commitdiff/6e79aa314729491cf5034fe8c3e154c9b1c1ba35
More information about the pld-cvs-commit
mailing list