rpms/libpng10/devel libpng-1.0.52-abifix.patch, NONE, 1.1 libpng10.spec, 1.37, 1.38

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/libpng10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24095

Modified Files:
	libpng10.spec 
Added Files:
	libpng-1.0.52-abifix.patch 
Log Message:
add upstream fix reinstating PNG_READ_16_TO_8_SUPPORTED and PNG_READ_GRAY_TO_RGB_SUPPORTED (not defined in 1.0.51 and 1.0.52), causing API/ABI regressions (#555485)

libpng-1.0.52-abifix.patch:
 pngconf.h |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE libpng-1.0.52-abifix.patch ---
  Removed "#ifdef PNG_1_0_X / #endif" surrounding
    PNG_READ_16_TO_8_SUPPORTED and PNG_READ_GRAY_TO_RGB_SUPPORTED
    in pngconf.h.  These were added in libpng-1.2.41beta08 and libpng-1.0.51,
    which introduced a binary incompatibility with libpng-1.0.50.

  This patch addresses #555485 (gnome-libs FTBFS)
 
diff -ur libpng-1.0.52/pngconf.h libpng-1.0.53beta01/pngconf.h
--- libpng-1.0.52/pngconf.h	2010-01-03 05:03:11.000000000 +0000
+++ libpng-1.0.53beta01/pngconf.h	2010-01-14 15:42:38.000000000 +0000
@@ -624,22 +624,18 @@
 #  ifndef PNG_NO_READ_BACKGROUND
 #    define PNG_READ_BACKGROUND_SUPPORTED
 #  endif
-#ifndef PNG_1_0_X
 #  ifndef PNG_NO_READ_16_TO_8
 #    define PNG_READ_16_TO_8_SUPPORTED
 #  endif
-#endif
 #  ifndef PNG_NO_READ_FILLER
 #    define PNG_READ_FILLER_SUPPORTED
 #  endif
 #  ifndef PNG_NO_READ_GAMMA
 #    define PNG_READ_GAMMA_SUPPORTED
 #  endif
-#ifndef PNG_1_0_X
 #  ifndef PNG_NO_READ_GRAY_TO_RGB
 #    define PNG_READ_GRAY_TO_RGB_SUPPORTED
 #  endif
-#endif
 #  ifndef PNG_NO_READ_SWAP_ALPHA
 #    define PNG_READ_SWAP_ALPHA_SUPPORTED
 #  endif


Index: libpng10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- libpng10.spec	4 Jan 2010 21:02:24 -0000	1.37
+++ libpng10.spec	15 Jan 2010 10:03:55 -0000	1.38
@@ -1,12 +1,13 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
 Version:	1.0.52
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
 Patch0:		libpng-1.0.51-soname.patch
+Patch1:		libpng-1.0.52-abifix.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
 Conflicts:	libpng < 2:1.2.0
@@ -38,6 +39,9 @@ libpng10-devel.
 # We want an soname of 2.%{version}
 %patch0 -p1 -b .soname
 
+# Upstream patch fixing ABI regression (#555485)
+%patch1 -p1 -b .abifix
+
 %build
 %configure \
 	--disable-static \
@@ -111,6 +115,11 @@ libpng10-devel.
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Fri Jan  7 2010 Paul Howarth <paul at city-fan.org> 1.0.52-2
+- add upstream fix reinstating PNG_READ_16_TO_8_SUPPORTED and
+  PNG_READ_GRAY_TO_RGB_SUPPORTED (not defined in 1.0.51 and 1.0.52),
+  causing API/ABI regressions (#555485)
+
 * Mon Jan  4 2010 Paul Howarth <paul at city-fan.org> 1.0.52-1
 - update to 1.0.52 (minor changes, see ANNOUNCE for details)