From ee808bf878af942300156c223850e14fe53d1ccd Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Mon, 3 Feb 2014 15:53:44 -0600
Subject: [PATCH] [libpng12] Added "-D_SOLO" to contrib/pngminim makefiles (for
 zlib-1.2.6+)

---
 ANNOUNCE                          | 46 ++++++++++++++-----------------
 CHANGES                           |  3 ++
 contrib/pngminim/decoder/makefile |  2 +-
 contrib/pngminim/encoder/makefile |  2 +-
 contrib/pngminim/preader/makefile |  2 +-
 5 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index fc5ac911..26a225d0 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.2.51rc03 - February 3, 2014
+Libpng 1.2.51rc04 - February 3, 2014
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -9,36 +9,36 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   libpng-1.2.51rc03.tar.xz (LZMA-compressed, recommended)
-   libpng-1.2.51rc03.tar.gz
-   libpng-1.2.51rc03.tar.bz2
+   libpng-1.2.51rc04.tar.xz (LZMA-compressed, recommended)
+   libpng-1.2.51rc04.tar.gz
+   libpng-1.2.51rc04.tar.bz2
 
 Source files with LF line endings (for Unix/Linux) without the
 "configure" script
 
-   libpng-1.2.51rc03-no-config.tar.xz (LZMA-compressed, recommended)
-   libpng-1.2.51rc03-no-config.tar.gz
-   libpng-1.2.51rc03-no-config.tar.bz2
+   libpng-1.2.51rc04-no-config.tar.xz (LZMA-compressed, recommended)
+   libpng-1.2.51rc04-no-config.tar.gz
+   libpng-1.2.51rc04-no-config.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp1251r03.zip
-   lp1251r03.7z
-   lp1251r03.tar.bz2
+   lp1251r04.zip
+   lp1251r04.7z
+   lp1251r04.tar.bz2
 
 Project files
 
-   libpng-1.2.51rc03-project-netware.zip
-   libpng-1.2.51rc03-project-wince.zip
+   libpng-1.2.51rc04-project-netware.zip
+   libpng-1.2.51rc04-project-wince.zip
 
 Other information:
 
-   libpng-1.2.51rc03-README.txt
-   libpng-1.2.51rc03-KNOWNBUGS.txt
-   libpng-1.2.51rc03-LICENSE.txt
-   libpng-1.2.51rc03-Y2K-compliance.txt
-   libpng-1.2.51rc03-[previous version]-diff.txt
+   libpng-1.2.51rc04-README.txt
+   libpng-1.2.51rc04-KNOWNBUGS.txt
+   libpng-1.2.51rc04-LICENSE.txt
+   libpng-1.2.51rc04-Y2K-compliance.txt
+   libpng-1.2.51rc04-[previous version]-diff.txt
 
 Changes since the last public release (1.2.50):
 
@@ -73,6 +73,9 @@ version 1.2.51rc03 [February 3, 2014]
   Quiet unused variable warnings from clang by porting PNG_UNUSED() from
     libpng-1.4.6.
 
+version 1.2.51rc04 [February 3, 2014]
+  Added -DZ_SOLO to CFLAGS in contrib/pngminim/*/makefile
+
 version 1.0.61 and 1.2.51 [February 3, 2014]
   No changes.
 
@@ -84,12 +87,3 @@ or to glennrp at users.sourceforge.net
 
 Glenn R-P
 #endif
-
-version 1.0.61 and 1.2.51 [February 3, 2014]
-  No changes.
-
-(subscription required; visit
-https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe) or to glennrp at users.sourceforge.net
-
-Glenn R-P
diff --git a/CHANGES b/CHANGES
index e3976041..f70d4faf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2808,6 +2808,9 @@ version 1.2.51rc03 [February 3, 2014]
   Quiet unused variable warnings from clang by porting PNG_UNUSED() from
     libpng-1.4.6.
 
+version 1.2.51rc04 [February 3, 2014]
+  Added -DZ_SOLO to CFLAGS in contrib/pngminim/*/makefile
+
 version 1.0.61 and 1.2.51 [February 3, 2014]
   No changes.
 
diff --git a/contrib/pngminim/decoder/makefile b/contrib/pngminim/decoder/makefile
index 4c738396..e6a112bf 100644
--- a/contrib/pngminim/decoder/makefile
+++ b/contrib/pngminim/decoder/makefile
@@ -7,7 +7,7 @@ LD=$(CC)
 
 RM=rm -f
 
-CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -DZ_SOLO \
        -DdeflateParams\(a,b,c\)=Z_OK -I. -O1
 
 C=.c
diff --git a/contrib/pngminim/encoder/makefile b/contrib/pngminim/encoder/makefile
index dfde950e..73f20b55 100644
--- a/contrib/pngminim/encoder/makefile
+++ b/contrib/pngminim/encoder/makefile
@@ -7,7 +7,7 @@ LD=$(CC)
 
 RM=rm -f
 
-CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -I. -O1
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -DZ_SOLO -I. -O1
 
 C=.c
 O=.o
diff --git a/contrib/pngminim/preader/makefile b/contrib/pngminim/preader/makefile
index 717978d5..09722e7a 100644
--- a/contrib/pngminim/preader/makefile
+++ b/contrib/pngminim/preader/makefile
@@ -23,7 +23,7 @@ XLIB = -L/usr/X11R6/lib -lX11
 #LIBS = $(XLIB)
 LIBS = $(XLIB) -lm                      #platforms that need libm
 
-CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -DZ_SOLO \
        -DdeflateParams\(a,b,c\)=Z_OK -I. $(XINC) -O1
 
 C=.c