[gnumeric] win32: update zlib to 1.2.4

[Morten Welinder <mortenw src gnome org>]

commit 460da55044bff4a0633cc9c51b54bfe1667dc5a7
Author: Morten Welinder <terra gnome org>
Date:   Fri Mar 26 19:23:01 2010 -0400

    win32: update zlib to 1.2.4

 tools/win32/moduleset.in       |    6 +-
 tools/win32/patches/zlib.patch |  215 +++++++++++++++-------------------------
 2 files changed, 82 insertions(+), 139 deletions(-)
---
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 770d1fe..13c6dd6 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -42,9 +42,9 @@
     <autotools id="zlib"
 	makeargs="-f win32/Makefile.gcc"
 	makeinstallargs="-f win32/Makefile.gcc -e install">
-	<branch repo="zlib.net" module="zlib-1.2.3.tar.gz"
-		version="1.2.3"
-		md5sum="debc62758716a169df9f62e6ab2bc634">
+	<branch repo="zlib.net" module="zlib-1.2.4.tar.gz"
+		version="1.2.4"
+		md5sum="47f6ed51b3c83a8534f9228531effa18">
 	    <patch file="&patch_dir;zlib.patch"/>
 	</branch>
     </autotools>
diff --git a/tools/win32/patches/zlib.patch b/tools/win32/patches/zlib.patch
index 9d29024..61e7ba6 100644
--- a/tools/win32/patches/zlib.patch
+++ b/tools/win32/patches/zlib.patch
@@ -1,136 +1,79 @@
-diff -cNr win32/Makefile.gcc win32/Makefile.gcc
-*** win32/Makefile.gcc	2003-08-01 23:49:00.000000000 -0400
---- win32/Makefile.gcc	2008-07-06 10:55:58.000000000 -0400
-***************
-*** 24,37 ****
-  # the DLL name should be changed from "zlib1.dll".
-  
-  STATICLIB = libz.a
-! SHAREDLIB = zlib1.dll
-! IMPLIB    = libzdll.a
-  
-  #LOC = -DASMV
-  #LOC = -DDEBUG -g
-  
-! CC = gcc
-! CFLAGS = $(LOC) -O3 -Wall
-  
-  AS = $(CC)
-  ASFLAGS = $(LOC) -Wall
---- 24,37 ----
-  # the DLL name should be changed from "zlib1.dll".
-  
-  STATICLIB = libz.a
-! SHAREDLIB = libz.dll
-! IMPLIB    = libz.dll.a
-  
-  #LOC = -DASMV
-  #LOC = -DDEBUG -g
-  
-! #CC = gcc
-! #CFLAGS = $(LOC) -O3 -Wall
-  
-  AS = $(CC)
-  ASFLAGS = $(LOC) -Wall
-***************
-*** 42,63 ****
-  AR = ar
-  ARFLAGS = rcs
-  
-! RC = windres
-  RCFLAGS = --define GCC_WINDRES
-  
-  CP = cp -fp
-  # If GNU install is available, replace $(CP) with install.
-  INSTALL = $(CP)
-  RM = rm -f
-  
-! prefix = /usr/local
-! exec_prefix = $(prefix)
-  
-  OBJS = adler32.o compress.o crc32.o deflate.o gzio.o infback.o \
-         inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
-  OBJA =
-  
-! all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example minigzip example_d minigzip_d
-  
-  test: example minigzip
-  	./example
---- 42,67 ----
-  AR = ar
-  ARFLAGS = rcs
-  
-! RC = $(WINDRES)
-  RCFLAGS = --define GCC_WINDRES
-  
-+ #DLLWRAP = dllwrap
-+ 
-  CP = cp -fp
-  # If GNU install is available, replace $(CP) with install.
-  INSTALL = $(CP)
-  RM = rm -f
-  
-! #prefix = /usr/local
-! exec_prefix = $(prefix)/bin
-! INCLUDE_PATH= $(prefix)/include
-! LIBRARY_PATH= $(prefix)/lib
-  
-  OBJS = adler32.o compress.o crc32.o deflate.o gzio.o infback.o \
-         inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
-  OBJA =
-  
-! all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB)
-  
-  test: example minigzip
-  	./example
-***************
-*** 76,87 ****
-  $(STATICLIB): $(OBJS) $(OBJA)
-  	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
-  
-- $(IMPLIB): $(SHAREDLIB)
-  
-! $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
-! 	dllwrap --driver-name $(CC) --def win32/zlib.def \
-! 	  --implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o
-! 	strip $@
-  
-  example: example.o $(STATICLIB)
-  	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
---- 80,90 ----
-  $(STATICLIB): $(OBJS) $(OBJA)
-  	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
-  
-  
-! $(SHAREDLIB) $(IMPLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
-! 	$(CC) -shared -o $@ $(OBJS) $(OBJA) zlibrc.o
-! 	$(DLLTOOL) --def win32/zlib.def --dllname $(SHAREDLIB) --output-lib $(IMPLIB)
-! 	$(STRIP) $(SHAREDLIB)
-  
-  example: example.o $(STATICLIB)
-  	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
-***************
-*** 104,115 ****
-  .PHONY: install uninstall clean
-  
-  install: zlib.h zconf.h $(LIB)
-- 	- if not exist $(INCLUDE_PATH)/nul mkdir $(INCLUDE_PATH)
-- 	- if not exist $(LIBRARY_PATH)/nul mkdir $(LIBRARY_PATH)
-  	-$(INSTALL) zlib.h $(INCLUDE_PATH)
-  	-$(INSTALL) zconf.h $(INCLUDE_PATH)
-- 	-$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
-  	-$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)
-  
-  uninstall:
-  	-$(RM) $(INCLUDE_PATH)/zlib.h
---- 107,116 ----
-  .PHONY: install uninstall clean
-  
-  install: zlib.h zconf.h $(LIB)
-  	-$(INSTALL) zlib.h $(INCLUDE_PATH)
-  	-$(INSTALL) zconf.h $(INCLUDE_PATH)
-  	-$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)
-+ 	-$(INSTALL) $(SHAREDLIB) $(exec_prefix)
-  
-  uninstall:
-  	-$(RM) $(INCLUDE_PATH)/zlib.h
+--- zlib-1.2.4/win32/Makefile.gcc~	2010-02-23 11:00:23.000000000 -0500
++++ zlib-1.2.4/win32/Makefile.gcc	2010-03-26 19:21:15.000000000 -0400
+@@ -24,14 +24,14 @@
+ # the DLL name should be changed from "zlib1.dll".
+ 
+ STATICLIB = libz.a
+-SHAREDLIB = zlib1.dll
+-IMPLIB    = libzdll.a
++SHAREDLIB = libz.dll
++IMPLIB    = libz.dll.a
+ 
+ #LOC = -DASMV
+ #LOC = -DDEBUG -g
+ 
+-CC = gcc
+-CFLAGS = $(LOC) -O3 -Wall
++#CC = gcc
++#CFLAGS = $(LOC) -O3 -Wall
+ 
+ AS = $(CC)
+ ASFLAGS = $(LOC) -Wall
+@@ -42,7 +42,7 @@
+ AR = ar
+ ARFLAGS = rcs
+ 
+-RC = windres
++RC = $(WINDRES)
+ RCFLAGS = --define GCC_WINDRES
+ 
+ STRIP = strip
+@@ -52,14 +52,15 @@
+ INSTALL = $(CP)
+ RM = rm -f
+ 
+-prefix = /usr/local
+-exec_prefix = $(prefix)
++exec_prefix = $(prefix)/bin
++INCLUDE_PATH= $(prefix)/include
++LIBRARY_PATH= $(prefix)/lib
+ 
+ OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
+        gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+ OBJA =
+ 
+-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe
++all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB)
+ 
+ test: example.exe minigzip.exe
+ 	./example
+@@ -78,12 +79,10 @@
+ $(STATICLIB): $(OBJS) $(OBJA)
+ 	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
+ 
+-$(IMPLIB): $(SHAREDLIB)
+-
+-$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+-	$(CC) -shared -Wl,--out-implib,$(IMPLIB) \
+-	-o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+-	$(STRIP) $@
++$(SHAREDLIB) $(IMPLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
++	$(CC) -shared -o $@ $(OBJS) $(OBJA) zlibrc.o
++	$(DLLTOOL) --def win32/zlib.def --dllname $(SHAREDLIB) --output-lib $(IMPLIB)
++	$(STRIP) $(SHAREDLIB)
+ 
+ example.exe: example.o $(STATICLIB)
+ 	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
+@@ -106,11 +105,9 @@
+ .PHONY: install uninstall clean
+ 
+ install: zlib.h zconf.h $(LIB)
+-	- if not exist $(INCLUDE_PATH)/nul mkdir $(INCLUDE_PATH)
+-	- if not exist $(LIBRARY_PATH)/nul mkdir $(LIBRARY_PATH)
+ 	-$(INSTALL) zlib.h $(INCLUDE_PATH)
+ 	-$(INSTALL) zconf.h $(INCLUDE_PATH)
+-	-$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
++	-$(INSTALL) $(STATICLIB) $(exec_prefix)
+ 	-$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)
+ 
+ uninstall: