Bump to icu-59.1

    - Set U_DISABLE_RENAMING true (uconfig.h)

[Model] All
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] icu version upgrade
[Cause & Measure] icu version upgrade
[Checking Method] N/A

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: I8f8f13f9c5d19600e1695e33f10460232be54326
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/packaging/icu.spec b/packaging/icu.spec
index 610ea29..7fd6235 100644 (file)
--- a/packaging/icu.spec
+++ b/packaging/icu.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:      icu
-Version:   57.1
+Version:   59.1
 Release:   1
 Summary:   International Components for Unicode
 Group:     System/Libraries
@@ -108,7 +108,6 @@ chmod +x %{buildroot}/%{_libdir}/lib*.so.*
 %files -n libicu-devel
 %manifest %{name}.manifest
 %license LICENSE
-%{_includedir}/layout
 %{_includedir}/unicode
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/icu-*.pc

diff --git a/source/common/putil.cpp b/source/common/putil.cpp
index 023186c..41d673d 100644 (file)
--- a/source/common/putil.cpp
+++ b/source/common/putil.cpp
@@ -685,7 +685,7 @@ extern U_IMPORT char *U_TZNAME[];
 #define TZZONEINFO2     "../usr/share/lib/zoneinfo/"
 #define TZ_ENV_CHECK    "localtime"
 #else
-#define TZDEFAULT       "/etc/localtime"
+#define TZDEFAULT       "/opt/etc/localtime"
 #define TZZONEINFO      "/usr/share/zoneinfo/"
 #endif
 #if U_HAVE_DIRENT_H
@@ -1463,7 +1463,11 @@ static void U_CALLCONV TimeZoneDataDirInitFn(UErrorCode &status) {
         return;
     }
 #if U_PLATFORM_HAS_WINUWP_API == 0
-    const char *dir = getenv("ICU_TIMEZONE_FILES_DIR");
+#ifdef _TIZEN_FEATURE_
+       const char *dir = "/opt/share/icu_tzdata";
+#else
+       const char *dir = getenv("ICU_TIMEZONE_FILES_DIR");
+#endif
 #else
     // TODO: UWP does not support alternate timezone data directories at this time
     const char *dir = "";

diff --git a/source/common/unicode/uconfig.h b/source/common/unicode/uconfig.h
index c26fce4..e9e9f52 100644 (file)
--- a/source/common/unicode/uconfig.h
+++ b/source/common/unicode/uconfig.h
@@ -89,7 +89,7 @@
  * @internal
  */
 #ifndef U_DISABLE_RENAMING
-#define U_DISABLE_RENAMING 0
+#define U_DISABLE_RENAMING 1
 #endif
 
 /**

diff --git a/source/extra/uconv/Makefile.in b/source/extra/uconv/Makefile.in
index b614461..a4556af 100644 (file)
--- a/source/extra/uconv/Makefile.in
+++ b/source/extra/uconv/Makefile.in
@@ -44,8 +44,9 @@ CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
 CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit
+LDFLAGS += -pie
 LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 ifeq ($(PKGDATA_OPTS),)

diff --git a/source/tools/genbrk/Makefile.in b/source/tools/genbrk/Makefile.in
index cb7fcd8..8fd60f4 100644 (file)
--- a/source/tools/genbrk/Makefile.in
+++ b/source/tools/genbrk/Makefile.in
@@ -28,7 +28,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = genbrk.o

diff --git a/source/tools/genccode/Makefile.in b/source/tools/genccode/Makefile.in
index 948fd00..6ce584c 100644 (file)
--- a/source/tools/genccode/Makefile.in
+++ b/source/tools/genccode/Makefile.in
@@ -29,7 +29,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = genccode.o

diff --git a/source/tools/gencfu/Makefile.in b/source/tools/gencfu/Makefile.in
index 0563141..a84a3ec 100644 (file)
--- a/source/tools/gencfu/Makefile.in
+++ b/source/tools/gencfu/Makefile.in
@@ -28,7 +28,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gencfu.o

diff --git a/source/tools/gencmn/Makefile.in b/source/tools/gencmn/Makefile.in
index dd33fcd..7fa1662 100644 (file)
--- a/source/tools/gencmn/Makefile.in
+++ b/source/tools/gencmn/Makefile.in
@@ -29,7 +29,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gencmn.o

diff --git a/source/tools/gencnval/Makefile.in b/source/tools/gencnval/Makefile.in
index 4e0ab25..0941850 100644 (file)
--- a/source/tools/gencnval/Makefile.in
+++ b/source/tools/gencnval/Makefile.in
@@ -29,7 +29,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gencnval.o

diff --git a/source/tools/gendict/Makefile.in b/source/tools/gendict/Makefile.in
index 03eb07e..129edf7 100644 (file)
--- a/source/tools/gendict/Makefile.in
+++ b/source/tools/gendict/Makefile.in
@@ -28,7 +28,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gendict.o

diff --git a/source/tools/gennorm2/Makefile.in b/source/tools/gennorm2/Makefile.in
index 729a3d0..edf047f 100644 (file)
--- a/source/tools/gennorm2/Makefile.in
+++ b/source/tools/gennorm2/Makefile.in
@@ -24,7 +24,8 @@ CLEANFILES = *~ $(DEPS)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(srcdir) -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gennorm2.o n2builder.o

diff --git a/source/tools/genrb/Makefile.in b/source/tools/genrb/Makefile.in
index 7e2360b..3042a63 100644 (file)
--- a/source/tools/genrb/Makefile.in
+++ b/source/tools/genrb/Makefile.in
@@ -33,8 +33,9 @@ TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 # derb depends on icuio
 @ICUIO_TRUE@DERB = $(BINDIR)/$(DERB_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil -I$(top_srcdir)/io
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil -I$(top_srcdir)/io
 CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = errmsg.o genrb.o parse.o read.o reslist.o ustr.o rbutil.o \

diff --git a/source/tools/gensprep/Makefile.in b/source/tools/gensprep/Makefile.in
index 3ed8cd1..fb5ee3d 100644 (file)
--- a/source/tools/gensprep/Makefile.in
+++ b/source/tools/gensprep/Makefile.in
@@ -29,7 +29,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gensprep.o store.o

diff --git a/source/tools/icuinfo/Makefile.in b/source/tools/icuinfo/Makefile.in
index ddbb2ee..8ae1cbd 100644 (file)
--- a/source/tools/icuinfo/Makefile.in
+++ b/source/tools/icuinfo/Makefile.in
@@ -23,7 +23,8 @@ CLEANFILES = *~ $(DEPS) $(PLUGIN_OBJECTS) $(PLUGINFILE) $(PLUGIN)
 TARGET = icuinfo$(EXEEXT)
 
 CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil -I$(top_srcdir)/tools/ctestfw 
-CPPFLAGS+= -I$(top_srcdir)/i18n
+CPPFLAGS+= -fPIE -I$(top_srcdir)/i18n
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = icuinfo.o

diff --git a/source/tools/icupkg/Makefile.in b/source/tools/icupkg/Makefile.in
index 6a5a773..80eb581 100644 (file)
--- a/source/tools/icupkg/Makefile.in
+++ b/source/tools/icupkg/Makefile.in
@@ -28,7 +28,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = icupkg.o

diff --git a/source/tools/makeconv/Makefile.in b/source/tools/makeconv/Makefile.in
index 6447283..2cb0ac6 100644 (file)
--- a/source/tools/makeconv/Makefile.in
+++ b/source/tools/makeconv/Makefile.in
@@ -28,7 +28,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -fpermissive -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = makeconv.o ucnvstat.o genmbcs.o gencnvex.o

diff --git a/source/tools/pkgdata/Makefile.in b/source/tools/pkgdata/Makefile.in
index 13e1289..dd568be 100644 (file)
--- a/source/tools/pkgdata/Makefile.in
+++ b/source/tools/pkgdata/Makefile.in
@@ -32,7 +32,8 @@ endif
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 DEFS += -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\"
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 

diff --git a/source/tools/pkgdata/pkgdata.cpp b/source/tools/pkgdata/pkgdata.cpp
index ffcf459..0a0afa9 100644 (file)
--- a/source/tools/pkgdata/pkgdata.cpp
+++ b/source/tools/pkgdata/pkgdata.cpp
@@ -2142,6 +2142,9 @@ static void loadLists(UPKGOptions *o, UErrorCode *status)
     icu::CharString cmdBuf;
     UErrorCode status = U_ZERO_ERROR;
     const char cmd[] = "icu-config --incpkgdatafile";
+#if _TIZEN_FEATURE_
+    const char cmdPath[] = "/usr/bin/icu-config --incpkgdatafile";
+#endif
     char dirBuf[1024] = "";
     /* #1 try the same path where pkgdata was called from. */
     findDirname(progname, dirBuf, UPRV_LENGTHOF(dirBuf), &status);
@@ -2150,6 +2153,12 @@ static void loadLists(UPKGOptions *o, UErrorCode *status)
       if (cmdBuf[0] != 0) {
         cmdBuf.append( U_FILE_SEP_STRING, status );
       }
+#if _TIZEN_FEATURE_
+      else {
+        cmdBuf.append("/usr/bin/", status );
+      }
+#endif
+
       cmdBuf.append( cmd, status );
       
       if(verbose) {
@@ -2160,10 +2169,18 @@ static void loadLists(UPKGOptions *o, UErrorCode *status)
 
     if(p.isNull() || (n = fread(buf, 1, UPRV_LENGTHOF(buf)-1, p.getAlias())) <= 0) {
         if(verbose) {
+#if _TIZEN_FEATURE_
+            fprintf(stdout, "# Calling icu-config: %s\n", cmdPath);
+#else
             fprintf(stdout, "# Calling icu-config: %s\n", cmd);
+#endif
         }
 
+#if _TIZEN_FEATURE_
+        p.adoptInstead(popen(cmdPath, "r"));
+#else
         p.adoptInstead(popen(cmd, "r"));
+#endif
         if(p.isNull() || (n = fread(buf, 1, UPRV_LENGTHOF(buf)-1, p.getAlias())) <= 0) {
             fprintf(stderr, "%s: icu-config: No icu-config found. (fix PATH or use -O option)\n", progname);
             return -1;