Makefile.fetch | 1 +
download.lst | 1 +
icu/UnpackedTarball_icu.mk | 6 ++++++
solenv/gbuild/UnpackedTarball.mk | 17 +++++++++++++++++
4 files changed, 25 insertions(+)
New commits:
commit bc20557b9ffa774d98846097bb2e4b93e518c4b3
Author: Eike Rathke <er...@redhat.com>
Date: Mon May 6 16:56:28 2013 +0200
added ICU 51 layout fix tarball, ticket 10107
With 428bde3591ff2fd2195097040dbe1480f1f4210f this should enable ICU to
bounds-check font tables as mentioned in
http://site.icu-project.org/download/51#TOC-Known-Issues
With this patch also needed is 7de7267f4cfcb455aabb09053c7ed681d4591867
otherwise application will crash.
Change-Id: I42e31778f762afc80ea21c1fb20952eab42791dc
diff --git a/Makefile.fetch b/Makefile.fetch
index 1381a37..e743d62 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -115,6 +115,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,HARFBUZZ,$(HARFBUZZ_TARBALL)) \
$(call fetch_Optional,HYPHEN,$(HYPHEN_TARBALL)) \
$(call fetch_Optional,ICU,$(ICU_TARBALL)) \
+ $(call fetch_Optional,ICU,$(ICU_51_LAYOUT_FIX_TARBALL)) \
$(call
fetch_Optional,JFREEREPORT,$(JFREEREPORT_FLOW_ENGINE_TARBALL)) \
$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_FLUTE_TARBALL))
\
$(call
fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBBASE_TARBALL)) \
diff --git a/download.lst b/download.lst
index 8839108..1420a5d 100644
--- a/download.lst
+++ b/download.lst
@@ -41,6 +41,7 @@ export HUNSPELL_TARBALL :=
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.g
export HARFBUZZ_TARBALL :=
90855e670c790c1fec4592908be3c0b8-harfbuzz-0.9.16.tar.bz2
export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
export ICU_TARBALL := 6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz
+export ICU_51_LAYOUT_FIX_TARBALL :=
7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.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
diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk
index e0837ac..91e3d56 100644
--- a/icu/UnpackedTarball_icu.mk
+++ b/icu/UnpackedTarball_icu.mk
@@ -11,6 +11,12 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu))
$(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL)))
+# *ONLY* for ICU 51(.1)!
+# http://site.icu-project.org/download/51#TOC-Known-Issues
+$(eval $(call gb_UnpackedTarball_set_pre_action,icu,\
+ $(GNUTAR) -x -z -f $(TARFILE_LOCATION)/$(ICU_51_LAYOUT_FIX_TARBALL) \
+))
+
$(eval $(call gb_UnpackedTarball_add_patches,icu,\
icu/icu4c.10129.wintz.patch \
icu/icu4c.9948.mlym-crash.patch \
commit 38b1b1aa4bf86653dd8363e85eb7e63d19d5b123
Author: David Tardon <dtar...@redhat.com>
Date: Fri May 3 16:53:09 2013 +0200
gbuild: add gb_UnpackedTarball_set_pre_action
This function is for running arbitrary command just after unpacking. It
turns out that gb_UnpackedTarball_set_post_action is not enough :-(
Change-Id: Ibad9d7fbcdd2b95a16cc838ad8773eef5c6da019
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 2342dc9..a62b42a 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -131,6 +131,9 @@ $(call gb_Output_announce,$(2),$(true),PAT,2)
$(call gb_Helper_abbreviate_dirs,\
( \
cd $(3) && \
+ $(if $(UNPACKED_PRE_ACTION),\
+ $(UNPACKED_PRE_ACTION) && \
+ ) \
$(if $(UNPACKED_FILES),\
mkdir -p $(sort $(dir $(UNPACKED_DESTFILES))) && \
$(call
gb_UnpackedTarball__copy_files,$(UNPACKED_FILES),$(UNPACKED_DESTFILES)) && \
@@ -193,6 +196,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) :
UNPACKED_FIX_EOL :=
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHES :=
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL :=
$(gb_UnpackedTarball_PATCHLEVEL_DEFAULT)
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION :=
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PRE_ACTION :=
$(call gb_UnpackedTarball_get_preparation_target,$(1)) :
$(gb_Module_CURRENTMAKEFILE)
$(call gb_UnpackedTarball_get_preparation_target,$(1)) :| $(dir $(call
gb_UnpackedTarball_get_target,$(1))).dir
@@ -288,6 +292,19 @@ endef
# Set arbitrary shell command to be run during unpack
#
+# The command is run at the very beginning, in freshly unpacked tarball.
+# The command is run in the unpacked directory. If more than one command
+# is used, care should be taken that the whole command fails if either
+# of the sub-commands fails.
+#
+# gb_UnpackedTarball_set_pre_action unpacked shell-command
+define gb_UnpackedTarball_set_pre_action
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PRE_ACTION := $(strip
$(2))
+
+endef
+
+# Set arbitrary shell command to be run during unpack
+#
# The command is run at the very end: after patching, C++ extension
# mangling and copying additional files in. The command is run in the
# unpacked directory. If more than one command is used, care should be
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
