diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-02-21 08:27:18 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-02-21 08:28:43 +0100 |
| commit | 2939a57e11a5dc8cadecdc5fae46ee17172ce110 (patch) | |
| tree | 4ff13a5dd83b45d03a0b7abef348b16d23b7e08d /icu | |
| parent | a3a93ad2987bb702ed643f190b7f55ef9ebd8880 (diff) | |
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: I7914bf8a792cf72b34335a0a423b2304b30a26b4
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/Module_icu.mk | 1 | ||||
| -rw-r--r-- | icu/UnpackedTarball_icu.mk | 6 | ||||
| -rw-r--r-- | icu/UnpackedTarball_icu_data.mk | 22 |
3 files changed, 0 insertions, 29 deletions
diff --git a/icu/Module_icu.mk b/icu/Module_icu.mk index 524147b1e960..46e02d3de9d5 100644 --- a/icu/Module_icu.mk +++ b/icu/Module_icu.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,icu)) ifeq ($(SYSTEM_ICU),NO) $(eval $(call gb_Module_add_targets,icu,\ UnpackedTarball_icu \ - UnpackedTarball_icu_data \ ExternalPackage_icu \ ExternalProject_icu \ )) diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk index 329c1af36ce1..e1ace9c4b3b7 100644 --- a/icu/UnpackedTarball_icu.mk +++ b/icu/UnpackedTarball_icu.mk @@ -11,12 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu)) $(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL))) -$(call gb_UnpackedTarball_get_target,icu): $(call gb_UnpackedTarball_get_target,icu_data) -$(eval $(call gb_UnpackedTarball_set_post_action,icu,\ - cp $(call gb_UnpackedTarball_get_dir,icu_data)/icudt49l.dat \ - $(call gb_UnpackedTarball_get_dir,icu)/source/data/in/ \ -)) - $(eval $(call gb_UnpackedTarball_add_patches,icu,\ icu/icu4c.9948.mlym-crash.patch \ icu/icu4c-bsd.patch \ diff --git a/icu/UnpackedTarball_icu_data.mk b/icu/UnpackedTarball_icu_data.mk deleted file mode 100644 index 9b15ad9cb2cb..000000000000 --- a/icu/UnpackedTarball_icu_data.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,icu_data)) - -# Save space when using a bundled ICU by leaving out unneeded parts of the ICU data. Generated by -# the interactive web tool at http://apps.icu-project.org/datacustom/ICUData49.html by dropping -# the "Charset Mapping Tables". Probably we could carefully cherry-pick other items in the data to -# be dropped, too. A bit tedious using that web tool, though. - -# 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. -$(eval $(call gb_UnpackedTarball_set_tarball,icu_data,$(ICU_DATA_SUBSET_ZIP),0)) - -# vim: set noet sw=4 ts=4: |