mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't cripple the icu data

Browse Source 
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
This commit is contained in:
Fridrich Štrba
2013-02-21 08:27:18 +01:00
parent a3a93ad298
commit 2939a57e11
3 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
icu/Module_icu.mk
View File

@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,icu))
ifeq ($(SYSTEM_ICU),NO) ifeq ($(SYSTEM_ICU),NO)
$(eval $(call gb_Module_add_targets,icu,\ $(eval $(call gb_Module_add_targets,icu,\
UnpackedTarball_icu \ UnpackedTarball_icu \
UnpackedTarball_icu_data \
ExternalPackage_icu \ ExternalPackage_icu \
ExternalProject_icu \ ExternalProject_icu \
)) ))

6
icu/UnpackedTarball_icu.mk
View File

@@ -11,12 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu))
$(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL))) $(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,\ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
icu/icu4c.9948.mlym-crash.patch \ icu/icu4c.9948.mlym-crash.patch \
icu/icu4c-bsd.patch \ icu/icu4c-bsd.patch \

22
icu/UnpackedTarball_icu_data.mk
View File

@@ -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: