From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Tue, 13 Jan 2009 10:27:37 +0000 (+0000)
Subject: - Rebase to 1.2.34 and patches from Fedora.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=14b9d3129380df35921dea1da26e3c9c1beb2cf3;p=fedora-mingw.git

- Rebase to 1.2.34 and patches from Fedora.
- Requires pkgconfig.
- Add documentation.
---

diff --git a/.hgignore b/.hgignore
index 2ed5fb6..0c89cb3 100644
--- a/.hgignore
+++ b/.hgignore
@@ -59,6 +59,7 @@ libgsf/libgsf-1.14.10.tar.bz2
 libidn/libidn-1.9.tar.gz
 libjpeg/jpegsrc.v6b.tar.gz
 libpng/libpng-1.2.31.tar.bz2
+libpng/libpng-1.2.34.tar.bz2
 libsigc++20/libsigc++-2.2.2.tar.bz2
 libssh2/libssh2-0.18.tar.gz
 libvirt/libvirt-0.4.5.tar.gz
diff --git a/libpng/libpng-multilib.patch b/libpng/libpng-multilib.patch
new file mode 100644
index 0000000..8b10eb9
--- /dev/null
+++ b/libpng/libpng-multilib.patch
@@ -0,0 +1,23 @@
+Use pkg-config to report libpng version and installation directories.
+
+
+diff -Naur libpng-1.2.31.orig/scripts/libpng-config.in libpng-1.2.31/scripts/libpng-config.in
+--- libpng-1.2.31.orig/scripts/libpng-config.in	2008-05-29 13:37:58.000000000 -0400
++++ libpng-1.2.31/scripts/libpng-config.in	2008-08-23 16:57:20.000000000 -0400
+@@ -8,11 +8,11 @@
+ 
+ # Modeled after libxml-config.
+ 
+-version="@PNGLIB_VERSION@"
+-prefix="@prefix@"
+-exec_prefix="@exec_prefix@"
+-libdir="@libdir@"
+-includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
++version=`pkg-config --modversion libpng`
++prefix=`pkg-config --variable prefix libpng`
++exec_prefix=`pkg-config --variable exec_prefix libpng`
++libdir=`pkg-config --variable libdir libpng`
++includedir=`pkg-config --variable includedir libpng`
+ libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
+ all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
+ I_opts="-I${includedir}"
diff --git a/libpng/libpng-ztxt-bug.patch b/libpng/libpng-ztxt-bug.patch
deleted file mode 100644
index 7168cf7..0000000
--- a/libpng/libpng-ztxt-bug.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch for CVE-2008-3964
-
-
-diff -ru4NwbB libpng-1.2.31/pngpread.c libpng-1.2.32beta01/pngpread.c
---- libpng-1.2.31/pngpread.c	2008-08-21 05:54:13.254898477 -0500
-+++ libpng-1.2.32beta01/pngpread.c	2008-09-06 07:03:43.043602194 -0500
-@@ -1278,9 +1278,9 @@
- 
-                tmp = text;
-                text = (png_charp)png_malloc(png_ptr, text_size +
-                   (png_uint_32)(png_ptr->zbuf_size 
--                  - png_ptr->zstream.avail_out));
-+                  - png_ptr->zstream.avail_out + 1));
-                png_memcpy(text, tmp, text_size);
-                png_free(png_ptr, tmp);
-                png_memcpy(text + text_size, png_ptr->zbuf,
-                   png_ptr->zbuf_size - png_ptr->zstream.avail_out);
diff --git a/libpng/mingw32-libpng.spec b/libpng/mingw32-libpng.spec
index eeefa0f..be5c145 100644
--- a/libpng/mingw32-libpng.spec
+++ b/libpng/mingw32-libpng.spec
@@ -5,34 +5,36 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-libpng
-Version:        1.2.31
-Release:        5%{?dist}
+Version:        1.2.34
+Release:        1%{?dist}
 Summary:        MinGW Windows Libpng library
 
 License:        zlib
 URL:            http://www.libpng.org/pub/png/
 Source0:        ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
-Patch1: libpng-pngconf.patch
-Patch2: libpng-ztxt-bug.patch
+Patch0:         libpng-multilib.patch
+Patch1:         libpng-pngconf.patch
 
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-filesystem >= 41
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-zlib
 
+Requires:       pkgconfig
+
 %description
 MinGW Windows Libpng library.
 
 
 %prep
 %setup -q -n libpng-%{version}
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{_mingw32_configure}
@@ -56,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
 %{_mingw32_bindir}/libpng-3.dll
 %{_mingw32_bindir}/libpng-config
 %{_mingw32_bindir}/libpng12-0.dll
@@ -73,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 1.2.34-1
+- Rebase to 1.2.34 and patches from Fedora.
+- Requires pkgconfig.
+- Add documentation.
+
 * Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-5
 - Rename mingw -> mingw32.