feat: Set icu timezone files dir 09/283509/1 accepted/tizen/base/20221111.060728 accepted/tizen/base/20221115.103744
authorDongHun Kwak <dh0128.kwak@samsung.com>
Fri, 28 Oct 2022 01:22:48 +0000 (10:22 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Fri, 28 Oct 2022 01:23:18 +0000 (10:23 +0900)
Set icu timezone files dir

Change-Id: I10285a450c4bc62da6e24c994eaa910d4f4938b1

packaging/Set_icu_timezone_files_dir.patch [new file with mode: 0644]
packaging/icu.spec

diff --git a/packaging/Set_icu_timezone_files_dir.patch b/packaging/Set_icu_timezone_files_dir.patch
new file mode 100644 (file)
index 0000000..a669d04
--- /dev/null
@@ -0,0 +1,26 @@
+diff --git a/source/common/putil.cpp b/source/common/putil.cpp
+index 6c23bffb2..040615528 100644
+--- a/source/common/putil.cpp
++++ b/source/common/putil.cpp
+@@ -1518,7 +1518,11 @@ static void U_CALLCONV TimeZoneDataDirInitFn(UErrorCode &status) {
+         return;\r
+     }\r
\r
+-    const char *dir = "";\r
++#ifdef _TIZEN_FEATURE_\r
++      const char *dir = "/opt/share/icu_tzdata";\r
++#else\r
++      const char *dir = getenv("ICU_TIMEZONE_FILES_DIR");\r
++#endif\r
\r
+ #if defined(ICU_TIMEZONE_FILES_DIR_PREFIX_ENV_VAR)\r
+     char timezonefilesdir_path_buffer[PATH_MAX];\r
+@@ -1537,7 +1541,7 @@ static void U_CALLCONV TimeZoneDataDirInitFn(UErrorCode &status) {
+ # endif\r
\r
+ #else\r
+-    dir = getenv("ICU_TIMEZONE_FILES_DIR");\r
++    // dir = getenv("ICU_TIMEZONE_FILES_DIR");\r
+ #endif // U_PLATFORM_HAS_WINUWP_API\r
\r
+ #if defined(U_TIMEZONE_FILES_DIR)\r
index 22c812a..5e9c2ea 100644 (file)
@@ -19,6 +19,7 @@ Source3:   Disable-the-default-LDFLAGSICUDT.patch
 Source4:   Add_PIE_option_for_tzcode.patch
 Source5:   Set_define_false_and_true.patch
 Source6:   Change_localtime_path.patch
+Source7:   Set_icu_timezone_files_dir.patch
 
 Source1001:    icu.manifest
 BuildRequires: autoconf
@@ -68,6 +69,7 @@ cp %{SOURCE1001} .
 %{__patch} -p1 < %{SOURCE4}
 %{__patch} -p1 < %{SOURCE5}
 %{__patch} -p1 < %{SOURCE6}
+%{__patch} -p1 < %{SOURCE7}
 
 %if "%{?profile}" == "tv"
 cp %{SOURCE1} ./source/tools/tzcode