diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-23 12:32:31 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-30 14:23:14 +0000 |
| commit | ce9bf0f868304a95ace987f90dcf2466e70bfe51 (patch) | |
| tree | 8575d8b0e78cf21b9c8494d49f1c01b3b77d5f89 /scp2 | |
| parent | 428ae24e55b1b2d7c9578d0e8ac58bb8e202c3be (diff) | |
upgrade icu to 51.1
Change-Id: I1c0d5ca4b2f88ca48225fcdbeb978f27fa91f7a6
Reviewed-on: https://gerrit.libreoffice.org/2953
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index d4cd99eb81ed..ca87c36f6bab 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -168,7 +168,6 @@ endif $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ -DICU_MAJOR=$(ICU_MAJOR) \ -DICU_MINOR=$(ICU_MINOR) \ - -DICU_MICRO=$(ICU_MICRO) \ )) ifneq ($(SYSTEM_LIBXSLT),YES) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 292a05f4c52e..3be07e415feb 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -644,7 +644,7 @@ End File gid_File_Lib_Icudata LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT8(libicudata,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT6(libicudata,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else Name = STRING(CONCAT3(icudt,ICU_MAJOR,.dll)); #endif @@ -655,7 +655,7 @@ End File gid_File_Lib_Icui18n LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT8(libicui18n,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT6(libicui18n,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else Name = STRING(CONCAT3(icuin,ICU_MAJOR,.dll)); #endif @@ -666,7 +666,7 @@ End File gid_File_Lib_Icule LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT8(libicule,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT6(libicule,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else Name = STRING(CONCAT3(icule,ICU_MAJOR,.dll)); #endif @@ -677,7 +677,7 @@ End File gid_File_Lib_Icuuc LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT8(libicuuc,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT6(libicuuc,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else Name = STRING(CONCAT3(icuuc,ICU_MAJOR,.dll)); #endif |