icu-54

OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=56

baselibs.conf

@@ -1,4 +1,4 @@
-libicu53_1
+libicu54_1
 libicu-devel
 	requires -libicu-<targettype>
-	requires "libicu53_1-<targettype> = <version>"
+	requires "libicu54_1-<targettype> = <version>"

icu-fix-install-mode-files.diff

@@ -17,14 +17,14 @@ user account/DESTDIR install.
 	mkdir: cannot create directory '/usr/share/icu': Permission denied
 
 ---
- source/data/Makefile.in |   18 +++++++++---------
+ source/data/Makefile.in |   20 ++++++++++----------
- 1 file changed, 9 insertions(+), 9 deletions(-)
+ 1 file changed, 10 insertions(+), 10 deletions(-)
 
 Index: icu/source/data/Makefile.in
 ===================================================================
 --- icu.orig/source/data/Makefile.in
 +++ icu/source/data/Makefile.in
-@@ -191,15 +191,15 @@ endif
+@@ -196,16 +196,16 @@ endif
  install-local: $(PKGDATA_LIST) ./icupkg.inc packagedata $(OS390INSTALL)
  	$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR)
  ifeq ($(PKGDATA_MODE),files)
@@ -33,6 +33,7 @@ Index: icu/source/data/Makefile.in
 -	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(LANG_TREE)
 -	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(REGION_TREE)
 -	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(ZONE_TREE)
+-	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(UNIT_TREE)
 -	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE)
 -	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE)
 -	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE)
@@ -42,6 +43,7 @@ Index: icu/source/data/Makefile.in
 +	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(LANG_TREE)
 +	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(REGION_TREE)
 +	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(ZONE_TREE)
++	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(UNIT_TREE)
 +	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE)
 +	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE)
 +	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE)

icu-versioning.diff

@@ -29,7 +29,7 @@ directory anyway (/usr/share/icu/51.2/) — another point where ICU
 development seems to not pay enough attention.
 
 ---
- source/common/icuplug.c                 |    2 +-
+ source/common/icuplug.cpp               |    2 +-
  source/common/umapfile.c                |    6 +++---
  source/common/unicode/utypes.h          |    4 ++--
  source/common/unicode/uvernum.h         |    7 +++++--
@@ -42,19 +42,19 @@ development seems to not pay enough attention.
  source/tools/pkgdata/pkgdata.cpp        |    4 ++--
  11 files changed, 19 insertions(+), 11 deletions(-)
 
-Index: icu/source/common/icuplug.c
+Index: icu/source/common/icuplug.cpp
 ===================================================================
---- icu.orig/source/common/icuplug.c
+--- icu.orig/source/common/icuplug.cpp
-+++ icu/source/common/icuplug.c
++++ icu/source/common/icuplug.cpp
-@@ -744,7 +744,7 @@ uplug_init(UErrorCode *status) {
+@@ -751,7 +751,7 @@ uplug_init(UErrorCode *status) {
-     uprv_strncpy(plugin_file, plugin_dir, 2047);
+     pluginFile.append(plugin_dir, *status);
-     uprv_strncat(plugin_file, U_FILE_SEP_STRING,2047);
+     pluginFile.append(U_FILE_SEP_STRING, -1, *status);
-     uprv_strncat(plugin_file, "icuplugins",2047);
+     pluginFile.append("icuplugins", -1, *status);
--    uprv_strncat(plugin_file, U_ICU_VERSION_SHORT ,2047);
+-    pluginFile.append(U_ICU_VERSION_SHORT, -1, *status);
-+    uprv_strncat(plugin_file, U_ICU_VERSION_MAJOR_STR, 2047);
++    pluginFile.append(U_ICU_VERSION_MAJOR_STR, -1, *status);
-     uprv_strncat(plugin_file, ".txt" ,2047);
+     pluginFile.append(".txt", -1, *status);
  #endif
-         
+ 
 Index: icu/source/common/umapfile.c
 ===================================================================
 --- icu.orig/source/common/umapfile.c
@@ -104,8 +104,8 @@ Index: icu/source/common/unicode/uvernum.h
 @@ -58,6 +58,7 @@
   *  @stable ICU 2.4
   */
- #define U_ICU_VERSION_MAJOR_NUM 53
+ #define U_ICU_VERSION_MAJOR_NUM 54
-+#define U_ICU_VERSION_MAJOR_STR "53"
++#define U_ICU_VERSION_MAJOR_STR "54"
  
  /** The current ICU minor version as an integer.
   *  This value will change in the subsequent releases of ICU
@@ -113,7 +113,7 @@ Index: icu/source/common/unicode/uvernum.h
   *  This value will change in the subsequent releases of ICU
   *  @stable ICU 2.6
   */
--#define U_ICU_VERSION_SUFFIX _53
+-#define U_ICU_VERSION_SUFFIX _54
 +#define ___icu_version_expand(major, minor) _ ## major ## _ ## minor
 +#define ___icu_version_glue(major, minor) ___icu_version_expand(major, minor)
 +#define U_ICU_VERSION_SUFFIX ___icu_version_glue(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM)
@@ -124,8 +124,8 @@ Index: icu/source/common/unicode/uvernum.h
   *  This value will change in the subsequent releases of ICU
   *  @stable ICU 2.6
   */
--#define U_ICU_VERSION_SHORT "53"
+-#define U_ICU_VERSION_SHORT "54"
-+#define U_ICU_VERSION_SHORT "53_1"
++#define U_ICU_VERSION_SHORT "54_1"
  
  #ifndef U_HIDE_INTERNAL_API
  /** Data version in ICU4C.
@@ -206,7 +206,7 @@ Index: icu/source/tools/pkgdata/pkgdata.cpp
 ===================================================================
 --- icu.orig/source/tools/pkgdata/pkgdata.cpp
 +++ icu/source/tools/pkgdata/pkgdata.cpp
-@@ -1273,7 +1273,7 @@ static int32_t pkg_generateLibraryFile(c
+@@ -1346,7 +1346,7 @@ static int32_t pkg_generateLibraryFile(c
              length = uprv_strlen(pkgDataFlags[GENLIB]) + uprv_strlen(pkgDataFlags[LDICUDTFLAGS]) +
                       ((uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_VERSION_TMP])) * 2) +
                       uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[LD_SONAME]) +
@@ -215,7 +215,7 @@ Index: icu/source/tools/pkgdata/pkgdata.cpp
                       uprv_strlen(pkgDataFlags[RPATH_FLAGS]) + uprv_strlen(pkgDataFlags[BIR_FLAGS]) + BUFFER_PADDING_SIZE;
  #if U_PLATFORM == U_PF_CYGWIN
              length += uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_CYGWIN_VERSION]);
-@@ -1320,7 +1320,7 @@ static int32_t pkg_generateLibraryFile(c
+@@ -1393,7 +1393,7 @@ static int32_t pkg_generateLibraryFile(c
  #endif
                  objectFile,
                  pkgDataFlags[LD_SONAME],

icu.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sat Oct 11 15:55:39 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 54.1
+* Unicode 7.0: Unicode 7.0 adds a total of 2,834 characters,
+  encompassing 23 new scripts, two currency symbols (manat &
+  ruble), many new pictographic and geometric symbols, and
+  character additions to many existing scripts.
+* CLDR 26: 77 languages with 100% modern coverage, more & improved
+  data, many more measurement units.
+* ICU is now C++11
+- Remove icu-rpmlint.diff (solved differently upstream),
+  icu-fix-tests-depending-on-date.patch (solved differently
+  upstream, also take note of
+  http://bugs.icu-project.org/trac/ticket/10937 it may need to be
+  reinstated)
+
 -------------------------------------------------------------------
 Mon Sep  8 09:21:42 UTC 2014 - schwab@suse.de
 

icu.spec

@@ -16,11 +16,11 @@
 #
 
 
-%define lname	libicu53_1
+%define lname	libicu54_1
-%define amajor   53
+%define amajor   54
-%define aversion 53_1
+%define aversion 54_1
 Name:           icu
-Version:        53.1
+Version:        54.1
 Release:        0
 Summary:        International Components for Unicode
 License:        MIT
@@ -31,11 +31,9 @@ Source:         http://download.icu-project.org/files/icu4c/%version/icu4c-%aver
 Source2:        http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-docs.zip
 Source3:        sanitize_docs.sh
 Source100:      baselibs.conf
-Patch1:         icu-rpmlint.diff
 Patch2:         icu-remove-datetime.patch
 Patch3:         icu-versioning.diff
 Patch4:         icu-fix-install-mode-files.diff
-Patch5:         icu-fix-tests-depending-on-date.patch
 Patch6:         icu-error-reporting.diff
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -161,7 +159,7 @@ cd html
 unzip %SOURCE2
 cd ..
 
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
+%patch -P 2 -P 3 -P 4 -P 6 -p1
 
 %build
 cd source

icu4c-53_1-docs.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c700534d52b98615b4baffcf0502f37540604e67817625f05d6e2fbf98d0c0b
-size 7943243

icu4c-53_1-src.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28
-size 23218952

icu4c-54_1-docs.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:879fbfc4f0609c1ed113496ebea7dc5e531b95f2d8507ec50b2262adbe96b2e8
+size 7753514

icu4c-54_1-src.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3
+size 25485678