# HG changeset patch
# User Mark Brand <mabrand@mabrand.nl>
# Date 1327870393 -3600
# Node ID f3d0fe4cc1368034a8c821592636f344224e10cd
# Parent  5edcb1f916a9d3b66cc57c0a1aa6c0ffc529348f
update package zlib

diff -r 5edcb1f916a9 -r f3d0fe4cc136 src/zlib-1-win32-static.patch
--- a/src/zlib-1-win32-static.patch	Mon Jan 30 15:10:26 2012 +0100
+++ b/src/zlib-1-win32-static.patch	Sun Jan 29 21:53:13 2012 +0100
@@ -1,31 +1,47 @@
 This file is part of mingw-cross-env.
 See doc/index.html for further information.
 
-diff -r 5a13d390f989 Makefile.in
---- a/Makefile.in	Tue Apr 20 14:59:46 2010 +0200
-+++ b/Makefile.in	Tue Apr 20 17:46:22 2010 +0200
-@@ -167,8 +167,8 @@
+Contains ad hoc patches for cross building.
+
+From dfe5701faf3683be7ea53885c58d4bd3499c4d1c Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Sun, 29 Jan 2012 21:51:03 +0100
+Subject: [PATCH] workarounds for mingw-cross-env
+
+
+diff --git a/Makefile.in b/Makefile.in
+index ea430bf..f2573e7 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -188,11 +188,11 @@ install-libs: $(LIBS)
  	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
  	-@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)
 +	[ -z '$(STATICLIB)'  ] || cp $(STATICLIB)  $(DESTDIR)$(libdir)
-+	[ -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 -r 5a13d390f989 configure
---- a/configure	Tue Apr 20 14:59:46 2010 +0200
-+++ b/configure	Tue Apr 20 17:46:22 2010 +0200
-@@ -122,10 +122,7 @@
+ 	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
+ 	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
+ 	-@if test -n "$(SHAREDLIBV)"; then \
+-	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
++	  [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
+ 	  echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
+ 	  chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
+ 	  echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
+diff --git a/configure b/configure
+index 780317c..6e6a033 100755
+--- a/configure
++++ b/configure
+@@ -180,10 +180,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then
    CYGWIN* | Cygwin* | cygwin* | OS/2*)
          EXE='.exe' ;;
-   MINGW*|mingw*)
+   MINGW* | mingw*)
 -# temporary bypass
          rm -f $test.[co] $test $test$shared_ext
--        echo "Please use win32/Makefile.gcc instead."
+-        echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
 -        exit 1
          LDSHARED=${LDSHARED-"$cc -shared"}
          LDSHAREDLIBC=""
          EXE='.exe' ;;
+-- 
+1.7.8.3
+
diff -r 5edcb1f916a9 -r f3d0fe4cc136 src/zlib.mk
--- a/src/zlib.mk	Mon Jan 30 15:10:26 2012 +0100
+++ b/src/zlib.mk	Sun Jan 29 21:53:13 2012 +0100
@@ -4,8 +4,8 @@
 # zlib
 PKG             := zlib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.5
-$(PKG)_CHECKSUM := 543fa9abff0442edca308772d6cef85557677e02
+$(PKG)_VERSION  := 1.2.6
+$(PKG)_CHECKSUM := 3d445731e4bfea1cd00f36567d77d6e5f5a19be9
 $(PKG)_SUBDIR   := zlib-$($(PKG)_VERSION)
 $(PKG)_FILE     := zlib-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://zlib.net/