[Libreoffice-commits] core.git: icu/Module_icu.mk icu/UnpackedTarball_icu_data.mk icu/UnpackedTarball_icu.mk

[Fridrich Å trba]

 icu/Module_icu.mk               |    1 -
 icu/UnpackedTarball_icu.mk      |    6 ------
 icu/UnpackedTarball_icu_data.mk |   22 ----------------------
 3 files changed, 29 deletions(-)

New commits:
commit 2939a57e11a5dc8cadecdc5fae46ee17172ce110
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Feb 21 08:27:18 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: I7914bf8a792cf72b34335a0a423b2304b30a26b4

diff --git a/icu/Module_icu.mk b/icu/Module_icu.mk
index 524147b..46e02d3 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 329c1af..e1ace9c 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 9b15ad9..0000000
--- 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: