diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-14 09:04:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-14 14:34:10 +0100 |
| commit | 82d1c1d9ebaf6e2f5eb81c05223d1f6bb7679bce (patch) | |
| tree | aad59757fad91e7a3161172bfffecbea26c8aeb6 | |
| parent | f5e727de55701b655ac98dc8054acfacf0e3cefc (diff) | |
bump zlib to 1.2.7
Change-Id: I003d1a8ff86f94c15b295e11ad109929708fa561
| -rw-r--r-- | ooo.lst.in | 2 | ||||
| -rw-r--r-- | zlib/makefile.mk | 10 | ||||
| -rw-r--r-- | zlib/zlib-dmakebuild.patch (renamed from zlib/zlib-1.2.5.patch) | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ooo.lst.in b/ooo.lst.in index 64e3d725ef35..e31a7916ae17 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -74,7 +74,7 @@ a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz -c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz +2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt b99fb620b1324b4ce79ee6998b507146-JLanguageTool-1.4.0.tar.bz2 diff --git a/zlib/makefile.mk b/zlib/makefile.mk index 8ec3a5e185f9..7a677e50cdb2 100644 --- a/zlib/makefile.mk +++ b/zlib/makefile.mk @@ -44,10 +44,10 @@ all: # --- Files -------------------------------------------------------- -TARFILE_NAME=zlib-1.2.5 -TARFILE_MD5=c735eab2d659a96e5a594c9e8541ad63 +TARFILE_NAME=zlib-1.2.7 +TARFILE_MD5=2ab442d169156f34c379c968f3f482dd -PATCH_FILES=zlib-1.2.5.patch +PATCH_FILES=zlib-dmakebuild.patch ADDITIONAL_FILES=makefile.mk #relative to CONFIGURE_DIR @@ -64,8 +64,8 @@ PATCHED_HEADERS=$(INCCOM)$/patched$/zlib.h # --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk ALLTAR: $(PATCHED_HEADERS) diff --git a/zlib/zlib-1.2.5.patch b/zlib/zlib-dmakebuild.patch index 3389b88c0ae9..6c2de996fa90 100644 --- a/zlib/zlib-1.2.5.patch +++ b/zlib/zlib-dmakebuild.patch @@ -1,5 +1,5 @@ ---- misc/zlib-1.2.5/makefile.mk Fri Mar 14 10:17:06 2008 -+++ misc/build/zlib-1.2.5/makefile.mk Fri Mar 14 10:16:56 2008 +--- misc/zlib-1.2.7/makefile.mk Fri Mar 14 10:17:06 2008 ++++ misc/build/zlib-1.2.7/makefile.mk Fri Mar 14 10:16:56 2008 @@ -1 +1,63 @@ -dummy +#************************************************************************* |