From 4b313b3b3796109a8f4b182be0c3efe1ec9fb447 Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Tue, 31 Jan 2012 12:08:14 +0100
Subject: [PATCH] mingw-w64: Update zlib to version 1.2.6, misc. minor
 improvements

Use the canonical zlib URL. Adjust our custom patch for version 1.2.6. Do
not hard-code the version number in gitignore.

Use "-o" with curl instead of redirecting stdout to avoid the output file
being created in case of errors.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
 src/mingw-w64/.gitignore              |  4 ++--
 src/mingw-w64/patch/zlib-config.patch | 45 +++++++++++++----------------------
 src/mingw-w64/release-zlib.sh         |  6 ++---
 3 files changed, 21 insertions(+), 34 deletions(-)
 rewrite src/mingw-w64/patch/zlib-config.patch (78%)

diff --git a/src/mingw-w64/.gitignore b/src/mingw-w64/.gitignore
index aabf2a90..411a7ab0 100644
--- a/src/mingw-w64/.gitignore
+++ b/src/mingw-w64/.gitignore
@@ -1,4 +1,4 @@
 /mingw-w64-*.zip
 /sysroot
-/zlib-1.2.5.tar.gz
-/zlib-1.2.5
+/zlib-*.tar.gz
+/zlib-*
diff --git a/src/mingw-w64/patch/zlib-config.patch b/src/mingw-w64/patch/zlib-config.patch
dissimilarity index 78%
index ef707326..9056017e 100644
--- a/src/mingw-w64/patch/zlib-config.patch
+++ b/src/mingw-w64/patch/zlib-config.patch
@@ -1,29 +1,16 @@
-diff --git a/configure b/configure
-index bd9edd2..23a9d60 100644
---- a/configure
-+++ b/configure
-@@ -119,9 +119,9 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
-   fi
-   case "$uname" in
-   Linux* | linux* | GNU | GNU/* | *BSD | DragonFly) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
--  CYGWIN* | Cygwin* | cygwin* | OS/2*)
-+  CYGWIN* | Cygwin* | cygwin* | OS/2* | MINGW*)
-         EXE='.exe' ;;
--  MINGW*|mingw*)
-+  DISABLED_MINGW*|mingw*)
- # temporary bypass
-         rm -f $test.[co] $test $test$shared_ext
-         echo "Please use win32/Makefile.gcc instead."
-diff --git a/Makefile.in b/Makefile.in
-index 5b15bd0..d35ffd9 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -168,7 +168,7 @@ install-libs: $(LIBS)
- 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
- 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
- 	cp $(STATICLIB) $(DESTDIR)$(libdir)
--	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
-+	test -z "$(SHAREDLIBV)" || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
- 	cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
- 	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
- 	-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
+diff --git a/configure b/configure
+index bd9edd2..23a9d60 100644
+--- a/configure
++++ b/configure
+@@ -177,9 +177,9 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then
+   *BSD | *bsd* | DragonFly)
+         LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"}
+         LDCONFIG="ldconfig -m" ;;
+-  CYGWIN* | Cygwin* | cygwin* | OS/2*)
++  CYGWIN* | Cygwin* | cygwin* | OS/2* | MINGW*)
+         EXE='.exe' ;;
+-  MINGW* | mingw*)
++  DISABLED_MINGW* | mingw*)
+ # temporary bypass
+         rm -f $test.[co] $test $test$shared_ext
+         echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
diff --git a/src/mingw-w64/release-zlib.sh b/src/mingw-w64/release-zlib.sh
index 5cbb10ae..48df930a 100644
--- a/src/mingw-w64/release-zlib.sh
+++ b/src/mingw-w64/release-zlib.sh
@@ -3,12 +3,12 @@
 cd "$(dirname "$0")"
 srcdir=$(pwd)
 
-mirror=http://www.zlib.net/
-file=zlib-1.2.5.tar.gz
+mirror=http://zlib.net/
+file=zlib-1.2.6.tar.gz
 dir=${file%.tar.gz}
 
 # download it
-test -f $file || curl $mirror$file > $file || exit
+test -f $file || curl $mirror$file -o $file || exit
 
 # unpack it
 test -d $dir || tar xzf $file || exit
-- 
2.11.4.GIT