[tkimg] remove deprecated libpng api function, add Requires: tk

[Tom Callaway]

commit c96f92d0705b1e01f4a780d2d1e5c49c6aa5fd50
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Nov 3 15:41:51 2014 -0500

    remove deprecated libpng api function, add Requires: tk

 tkimg-libpng-deprecated.patch |   60 +++++++++++++++++++++++++++++++++++++++++
 tkimg.spec                    |    9 +++++-
 2 files changed, 68 insertions(+), 1 deletions(-)
---
diff --git a/tkimg-libpng-deprecated.patch b/tkimg-libpng-deprecated.patch
new file mode 100644
index 0000000..d51f287
--- /dev/null
+++ b/tkimg-libpng-deprecated.patch
@@ -0,0 +1,60 @@
+diff -up tkimg1.4/libpng/pngtcl.decls.deprecated tkimg1.4/libpng/pngtcl.decls
+--- tkimg1.4/libpng/pngtcl.decls.deprecated	2014-11-03 15:31:52.371318438 -0500
++++ tkimg1.4/libpng/pngtcl.decls	2014-11-03 15:32:19.195134442 -0500
+@@ -633,9 +633,6 @@ declare 198 generic {!PNG_pHYs_SUPPORTED
+ declare 199 generic {!PNG_IO_STATE_SUPPORTED} {
+     png_uint_32 png_get_io_state(png_structp png_ptr)
+ }
+-declare 200 generic {!PNG_IO_STATE_SUPPORTED} {
+-    png_const_bytep png_get_io_chunk_name(png_structp png_ptr)
+-}
+ declare 201 generic {!PNG_READ_INT_FUNCTIONS_SUPPORTED PNG_USE_READ_MACROS} {
+     png_uint_32 png_get_uint_32(png_const_bytep buf)
+ }
+diff -up tkimg1.4/libpng/pngtclDecls.h.deprecated tkimg1.4/libpng/pngtclDecls.h
+--- tkimg1.4/libpng/pngtclDecls.h.deprecated	2014-11-03 15:30:59.314682376 -0500
++++ tkimg1.4/libpng/pngtclDecls.h	2014-11-03 15:31:43.003382697 -0500
+@@ -689,8 +689,7 @@ PNG_IMPEXP png_uint_32	png_get_pHYs_dpi(
+ 				png_uint_32 *res_y, int *unit_type);
+ /* 199 */
+ PNG_IMPEXP png_uint_32	png_get_io_state(png_const_structrp png_ptr);
+-/* 200 */
+-PNG_IMPEXP png_const_bytep png_get_io_chunk_name(png_structrp png_ptr);
++/* 200 - DEPRECATED */
+ /* 201 */
+ PNG_IMPEXP png_uint_32	png_get_uint_32(png_const_bytep buf);
+ /* 202 */
+@@ -1055,7 +1054,7 @@ typedef struct PngtclStubs {
+     float (*png_get_y_offset_inchesPtr) (png_const_structrp png_ptr, png_const_inforp info_ptr); /* 197 */
+     png_uint_32 (*png_get_pHYs_dpiPtr) (png_const_structrp png_ptr, png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type); /* 198 */
+     png_uint_32 (*png_get_io_statePtr) (png_const_structrp png_ptr); /* 199 */
+-    png_const_bytep (*png_get_io_chunk_namePtr) (png_structrp png_ptr); /* 200 */
++    /* 200 - DEPRECATED */
+     png_uint_32 (*png_get_uint_32Ptr) (png_const_bytep buf); /* 201 */
+     png_uint_16 (*png_get_uint_16Ptr) (png_const_bytep buf); /* 202 */
+     png_int_32 (*png_get_int_32Ptr) (png_const_bytep buf); /* 203 */
+@@ -1515,8 +1514,7 @@ PNG_IMPEXP const PngtclStubs *pngtclStub
+ 	(pngtclStubsPtr->png_get_pHYs_dpiPtr) /* 198 */
+ #define png_get_io_state \
+ 	(pngtclStubsPtr->png_get_io_statePtr) /* 199 */
+-#define png_get_io_chunk_name \
+-	(pngtclStubsPtr->png_get_io_chunk_namePtr) /* 200 */
++/* 200 - DEPRECATED */
+ #define png_get_uint_32 \
+ 	(pngtclStubsPtr->png_get_uint_32Ptr) /* 201 */
+ #define png_get_uint_16 \
+diff -up tkimg1.4/libpng/pngtclStubInit.c.deprecated tkimg1.4/libpng/pngtclStubInit.c
+--- tkimg1.4/libpng/pngtclStubInit.c.deprecated	2014-11-03 15:29:58.828097279 -0500
++++ tkimg1.4/libpng/pngtclStubInit.c	2014-11-03 15:30:13.706995218 -0500
+@@ -783,11 +783,7 @@ const PngtclStubs pngtclStubs = {
+ #else  /* !PNG_IO_STATE_SUPPORTED */
+     png_get_io_state, /* 199 */
+ #endif /* !PNG_IO_STATE_SUPPORTED */
+-#if !defined(PNG_IO_STATE_SUPPORTED)
+     0, /* 200 */
+-#else  /* !PNG_IO_STATE_SUPPORTED */
+-    png_get_io_chunk_name, /* 200 */
+-#endif /* !PNG_IO_STATE_SUPPORTED */
+ #if !defined(PNG_READ_INT_FUNCTIONS_SUPPORTED) || defined(PNG_USE_READ_MACROS)
+     0, /* 201 */
+ #else  /* !PNG_READ_INT_FUNCTIONS_SUPPORTED PNG_USE_READ_MACROS */
diff --git a/tkimg.spec b/tkimg.spec
index d819731..cdc1045 100644
--- a/tkimg.spec
+++ b/tkimg.spec
@@ -3,7 +3,7 @@
 
 Name:		tkimg
 Version:	1.4
-Release:	18%{?dist}
+Release:	19%{?dist}
 Summary:	Image support library for Tk
 Group:		Development/Libraries
 License:	BSD
@@ -22,6 +22,7 @@ Patch5:		tkimg-libtiff4.patch
 Patch6:		tkimg-zlib127-gzgetc_fix.patch
 # changes in libpng16
 Patch7:		tkimg-libpng16.patch
+Patch8:		tkimg-libpng-deprecated.patch
 
 # A request to allow building with system libraries has been submitted
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2292032&group_id=52039&atid=465495
@@ -32,6 +33,7 @@ BuildRequires:	libpng-devel >= 1.6
 BuildRequires:	libtiff-devel >= 4.0
 
 Requires: tcl(abi) = 8.6
+Requires: tk >= 8.6
 
 %description
 This package contains a collection of image format handlers for the Tk
@@ -65,6 +67,7 @@ rm -rf compat/libtiff
 %patch5 -p1 -b .tiff4
 %patch6 -p1 -b .gzgetc_fix
 %patch7 -p1 -b .png16
+%patch8 -p1 -b .deprecated
 
 %build
 %configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch} --disable-threads --enable-64bit
@@ -106,6 +109,10 @@ done
 %{tcl_sitearch}/Img1.4/*.a
 
 %changelog
+* Mon Nov  3 2014 Tom Callaway <spot at fedoraproject.org> - 1.4-19
+- add Requires: tk
+- remove deprecated libpng api bit
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild