diff options
| author | Eike Rathke <erack@redhat.com> | 2013-05-06 16:56:28 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-05-06 17:04:08 +0200 |
| commit | bc20557b9ffa774d98846097bb2e4b93e518c4b3 (patch) | |
| tree | e1f079f984c932e96d9755b0653527b51a94857c | |
| parent | 38b1b1aa4bf86653dd8363e85eb7e63d19d5b123 (diff) | |
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
| -rw-r--r-- | Makefile.fetch | 1 | ||||
| -rw-r--r-- | download.lst | 1 | ||||
| -rw-r--r-- | icu/UnpackedTarball_icu.mk | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 1381a37c8316..e743d62e4b17 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 8839108db8e1..1420a5da3113 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 e0837ace8893..91e3d5656bf5 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 \ |