Skip to content

C
core
Kaydet (Commit) ce9bf0f8 authored tarafından Peter Foley's avatar Peter Foley
Dosyalara gözat
Seçenekler

upgrade icu to 51.1 

Change-Id: I1c0d5ca4b2f88ca48225fcdbeb978f27fa91f7a6
Reviewed-on: https://gerrit.libreoffice.org/2953Tested-by: 's avatarLibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: 's avatarPeter Foley <pefoley2@verizon.net>
üst 428ae24e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 126 deletions
RepositoryExternal.mk
Dosyayı görüntüle @ ce9bf0f8
......@@ -1081,9 +1081,11 @@ gb_ICU_suffix:=
endif
define gb_LinkTarget__use_icu_headers
$(call gb_LinkTarget_use_package,$(1),icu)
$(call gb_LinkTarget_use_unpacked,$(1),icu)
$(call gb_LinkTarget_set_include,$(1),\
$(ISYSTEM)$(OUTDIR)/inc/external \
$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source \
$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/common \
$$(INCLUDE) \
)
......
config_host.mk.in
Dosyayı görüntüle @ ce9bf0f8
......@@ -240,7 +240,6 @@ export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@
export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@
export ICECREAM_RUN=@ICECREAM_RUN@
export ICU_MAJOR=@ICU_MAJOR@
export ICU_MICRO=@ICU_MICRO@
export ICU_MINOR=@ICU_MINOR@
export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@
export ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER@
......
configure.ac
Dosyayı görüntüle @ ce9bf0f8
......@@ -8242,9 +8242,8 @@ SYSTEM_GENBRK=
SYSTEM_GENCCODE=
SYSTEM_GENCMN=
ICU_MAJOR=49
ICU_MAJOR=51
ICU_MINOR=1
ICU_MICRO=1
ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="YES"
......@@ -8269,7 +8268,6 @@ if test "$with_system_icu" = "yes"; then
ICU_VERSION=`$ICUCONFIG --noverify --version 2>/dev/null || $ICUCONFIG --version`
ICU_MAJOR=`echo $ICU_VERSION | cut -d"." -f1`
ICU_MINOR=`echo $ICU_VERSION | cut -d"." -f2`
ICU_MICRO=`echo $ICU_VERSION | cut -d"." -f3`
if test "$ICU_MAJOR" -ge "49" -o \( "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "2" \); then
AC_MSG_RESULT([OK, $ICU_VERSION])
......@@ -8347,7 +8345,6 @@ AC_SUBST(SYSTEM_GENCCODE)
AC_SUBST(SYSTEM_GENCMN)
AC_SUBST(ICU_MAJOR)
AC_SUBST(ICU_MINOR)
AC_SUBST(ICU_MICRO)
AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER)
......
download.lst
Dosyayı görüntüle @ ce9bf0f8
......@@ -39,7 +39,7 @@ export GLIBC_TARBALL := 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
export ICU_TARBALL := 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
export ICU_TARBALL := 6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz
export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
export JFREEREPORT_FLUTE_TARBALL := d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
export JFREEREPORT_LIBBASE_TARBALL := eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
......
icu/ExternalPackage_icu.mk
Dosyayı görüntüle @ ce9bf0f8
This diff is collapsed.
icu/UnpackedTarball_icu.mk
Dosyayı görüntüle @ ce9bf0f8
......@@ -13,20 +13,16 @@ $(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,icu,\
icu/icu4c.9948.mlym-crash.patch \
icu/icu4c-bsd.patch \
icu/icu4c-build.patch \
icu/icu4c.8198.revert.icu5431.patch \
icu/icu4c.7601.Indic-ccmp.patch \
icu/icu4c-aix.patch \
icu/icu4c-wchar_t.patch \
icu/icu4c-warnings.patch \
icu/icu4c.9313.cygwin.patch \
icu/icu4c-macosx.patch \
icu/icu4c-solarisgcc.patch \
icu/icu4c-mkdir.patch \
icu/icu4c-buffer-overflow.patch \
icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch \
icu/icu4c-CVE-2013-0900_umutex.patch \
icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
))
......
icu/icu4c-CVE-2013-0900_umutex.patch deleted 100644 → 0
Dosyayı görüntüle @ 428ae24e
diff -ruN icu.orig/source/common/locid.cpp icu/source/common/locid.cpp
--- build/icu.orig/source/common/locid.cpp 2013-03-06 21:27:35.170696967 +0100
+++ build/icu/source/common/locid.cpp 2013-03-06 21:29:47.711378977 +0100
@@ -53,7 +53,7 @@
static Locale *gLocaleCache = NULL;
// gDefaultLocaleMutex protects all access to gDefaultLocalesHashT and gDefaultLocale.
-static UMutex gDefaultLocaleMutex = U_MUTEX_INITIALIZER;
+static UMTX gDefaultLocaleMutex = NULL;
static UHashtable *gDefaultLocalesHashT = NULL;
static Locale *gDefaultLocale = NULL;
icu/icu4c-bsd.patch deleted 100644 → 0
Dosyayı görüntüle @ 428ae24e
--- misc/icu/source/common/putilimp.h 2012-06-01 10:52:52.000000000 -0400
+++ misc/build/icu/source/common/putilimp.h 2012-08-21 13:32:58.000000000 -0400
@@ -117,6 +117,8 @@
# define U_TIMEZONE __timezone
#elif U_PLATFORM_USES_ONLY_WIN32_API
# define U_TIMEZONE _timezone
+#elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__)
+ /* not defined */
#elif U_PLATFORM == U_PF_OS400
/* not defined */
#else
--- misc/icu/source/common/unicode/platform.h 2012-08-21 16:53:20.957449000 -0400
+++ misc/build/icu/source/common/unicode/platform.h 2012-08-21 17:02:16.000000000 -0400
@@ -131,7 +131,7 @@
# include <android/api-level.h>
#elif defined(linux) || defined(__linux__) || defined(__linux)
# define U_PLATFORM U_PF_LINUX
-#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
# define U_PLATFORM U_PF_BSD
#elif defined(sun) || defined(__sun)
/* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */
icu/icu4c-build.patch
Dosyayı görüntüle @ ce9bf0f8
......@@ -41,17 +41,6 @@
"\t.section \".rodata\"\n"
"\t.align 8\n"
--- misc/icu/source/common/stringpiece.cpp 2010-09-29 20:37:20.000000000 +0200
+++ misc/build/icu/source/common/stringpiece.cpp 2011-03-15 10:57:24.722045561 +0100
@@ -75,7 +75,7 @@
* Visual Studios 9.0.
* Cygwin with MSVC 9.0 also complains here about redefinition.
*/
-#if (!defined(_MSC_VER) || (_MSC_VER > 1500)) && !defined(CYGWINMSVC)
+#if (!defined(_MSC_VER) && !defined(CYGWINMSVC))
const int32_t StringPiece::npos;
#endif
--- misc/icu/source/config/mh-darwin 2010-09-29 20:37:36.000000000 +0200
+++ misc/build/icu/source/config/mh-darwin 2011-03-15 10:56:26.653056004 +0100
@@ -25,11 +25,7 @@
......@@ -75,9 +64,9 @@
-FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
-MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
-
## Compilation rules
## Compilation and dependency rules
%.$(STATIC_O): $(srcdir)/%.c
$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
$(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<)
@@ -80,16 +72,10 @@
## Versioned libraries rules
......
icu/icu4c-solarisgcc.patch
Dosyayı görüntüle @ ce9bf0f8
diff -uriwb build/icu.old/source/aclocal.m4 misc/build/icu/source/aclocal.m4
--- build/icu.old/source/aclocal.m4 2012-04-05 21:49:28.000000000 +0100
+++ build/icu/source/aclocal.m4 2012-06-21 15:44:57.299256932 +0100
@@ -455,7 +455,7 @@
case "${host}" in
*-*-solaris*)
CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long"
- CFLAGS="$CFLAGS -D__STDC__=0";;
+ CFLAGS="$CFLAGS -std=c99";;
*-*-hpux*)
echo "# Note: We are not using '-ansi' with HP/UX GCC because int64_t broke, see <http://bugs.icu-project.org/trac/ticket/8493>"
CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
@@ -474,10 +474,6 @@
if test "$GXX" = yes
then
CXXFLAGS="$CXXFLAGS -W -Wall -ansi -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
- case "${host}" in
- *-*-solaris*)
- CXXFLAGS="$CXXFLAGS -D__STDC__=0";;
- esac
else
case "${host}" in
*-*-cygwin)
diff -uriwb build/icu.old/source/common/uposixdefs.h misc/build/icu/source/common/uposixdefs.h
--- build/icu.old/source/common/uposixdefs.h 2012-04-05 21:46:18.000000000 +0100
+++ build/icu/source/common/uposixdefs.h 2012-06-21 15:45:17.613369477 +0100
......@@ -33,26 +10,3 @@ diff -uriwb build/icu.old/source/common/uposixdefs.h misc/build/icu/source/commo
# define _XOPEN_SOURCE_EXTENDED 1
#endif
diff -uriwb build/icu.old/source/configure misc/build/icu/source/configure
--- build/icu.old/source/configure 2012-04-05 21:49:28.000000000 +0100
+++ build/icu/source/configure 2012-06-21 15:44:42.817030445 +0100
@@ -4264,7 +4264,7 @@
case "${host}" in
*-*-solaris*)
CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long"
- CFLAGS="$CFLAGS -D__STDC__=0";;
+ CFLAGS="$CFLAGS -std=c99";;
*-*-hpux*)
echo "# Note: We are not using '-ansi' with HP/UX GCC because int64_t broke, see <http://bugs.icu-project.org/trac/ticket/8493>"
CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
@@ -4283,10 +4283,6 @@
if test "$GXX" = yes
then
CXXFLAGS="$CXXFLAGS -W -Wall -ansi -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
- case "${host}" in
- *-*-solaris*)
- CXXFLAGS="$CXXFLAGS -D__STDC__=0";;
- esac
else
case "${host}" in
*-*-cygwin)
icu/icu4c.9313.cygwin.patch deleted 100644 → 0
Dosyayı görüntüle @ 428ae24e
--- misc/icu/source/icudefs.mk.in
+++ misc/build/icu/source/icudefs.mk.in
@@ -266,9 +266,9 @@
include @platform_make_fragment@
# Current full path directory.
-CURR_FULL_DIR=$(shell pwd | sed 's/ /\\ /g')
+CURR_FULL_DIR?=$(shell pwd | sed 's/ /\\ /g')
# Current full path directory for use in source code in a -D compiler option.
-CURR_SRCCODE_FULL_DIR=$(shell pwd | sed 's/ /\\ /')
+CURR_SRCCODE_FULL_DIR?=$(shell pwd | sed 's/ /\\ /')
# When shared libraries are disabled and static libraries are enabled,
# the C++ compiler must be used to link in the libraries for the tools.
libcdr/ExternalProject_libcdr.mk
Dosyayı görüntüle @ ce9bf0f8
......@@ -29,7 +29,9 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
&& export ICU_LIBS=" " \
&& export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),-I$(OUTDIR)/inc/external, )" \
&& export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\
$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \
&& ./configure \
--with-pic \
--enable-static \
......
libmspub/ExternalProject_libmspub.mk
Dosyayı görüntüle @ ce9bf0f8
......@@ -27,7 +27,9 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\
$(call gb_ExternalProject_get_state_target,libmspub,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
&& export ICU_LIBS=" " && export ICU_CFLAGS="-I$(OUTDIR)/inc/external" \
&& export ICU_LIBS=" " \
&& export ICU_CFLAGS="$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/common" \
&& export LIBMSPUB_CFLAGS="$(WPG_CFLAGS) $(WPD_CFLAGS)" \
&& export LIBMSPUB_LIBS="$(WPG_LIBS) $(WPD_LIBS)" \
&& ./configure \
......
scp2/InstallModule_ooo.mk
Dosyayı görüntüle @ ce9bf0f8
......@@ -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)
......
scp2/source/ooo/file_library_ooo.scp
Dosyayı görüntüle @ ce9bf0f8
......@@ -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
......
vcl/generic/glyphs/gcach_layout.cxx
Dosyayı görüntüle @ ce9bf0f8
......@@ -108,6 +108,7 @@ public:
: mrServerFont( rFont )
{}
using LEFontInstance::getFontTable;
virtual const void* getFontTable(LETag tableTag) const;
virtual le_int32 getUnitsPerEM() const;
virtual float getXPixelsPerEm() const;
......
writerfilter/Library_writerfilter.mk
Dosyayı görüntüle @ ce9bf0f8
......@@ -87,6 +87,7 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\
$(eval $(call gb_Library_use_externals,writerfilter,\
boost_headers \
icu_headers \
libxml2 \
))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment