icu/makefile.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 6d9d3f52ae7dcd4428ab420f4c856b8046e0d1b5 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Wed Feb 20 16:54:45 2013 +0100 Don't cripple the icu data CorelDraw and MS Publisher importers use icu for conversions between 8-bit character sets and UTF8. In some cases even between UTF16 and UTF8. Thus we need the relevant data. Use the default icu-provided data for the while. Change-Id: I0f0f838cc3a0ce88b2d2a1bfd62b6c4ae98de9d3 Reviewed-on: https://gerrit.libreoffice.org/2296 Reviewed-by: Tor Lillqvist <t...@iki.fi> Tested-by: Tor Lillqvist <t...@iki.fi> (cherry picked from commit aeaa4fb859e2422a4952bda022e7a40ccbd86b9f) Reviewed-on: https://gerrit.libreoffice.org/2297 Reviewed-by: Eike Rathke <er...@redhat.com> Reviewed-by: Petr Mladek <pmla...@suse.cz> Tested-by: Petr Mladek <pmla...@suse.cz> diff --git a/icu/makefile.mk b/icu/makefile.mk index c92d9f9..fbe36fb 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -84,7 +84,8 @@ EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=0 # If you do that, upload a new subset data zip file with just the MD5 part of the name changed # appropriately. Let's not bother trying to list what stuff has been removed in the file name. # Describe it in the comment above instead. -CONFIGURE_ACTION=unzip $(TARFILE_LOCATION)/$(ICU_DATA_SUBSET_ZIP) && mv icudt49l.dat data/in && +#CONFIGURE_ACTION=unzip $(TARFILE_LOCATION)/$(ICU_DATA_SUBSET_ZIP) && mv icudt49l.dat data/in && +CONFIGURE_ACTION= .IF "$(GUI)"=="UNX"
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits