From 8a99d76cbf61320263998695d63586ffca6b7064 Mon Sep 17 00:00:00 2001
From: "Vladimir D. Seleznev" <vseleznv@altlinux.org>
Date: Sun, 17 May 2020 18:32:45 +0300
Subject: [PATCH] DEBIAN: libpng

Author: Sergei Golovan
Description: Patch allows one to build libtk-img using the system-wide libpng.
 The patch is a Debian-specific hack and isn't supposed to be forwarded upstream.
Last-modified: Wed, 31 Jan 2018 11:42:36 +0300
---
 tkimg/libpng/Makefile.in   |  4 ++--
 tkimg/libpng/configure     | 44 --------------------------------------
 tkimg/libpng/configure.ac  |  9 --------
 tkimg/libpng/pngtclDecls.h |  4 +++-
 4 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/tkimg/libpng/Makefile.in b/tkimg/libpng/Makefile.in
index b6ffc33f..f32cd3f0 100755
--- a/tkimg/libpng/Makefile.in
+++ b/tkimg/libpng/Makefile.in
@@ -162,9 +162,9 @@ DEFS		= @DEFS@ $(PKG_CFLAGS)
 CONFIG_CLEAN_FILES = Makefile
 
 CPPFLAGS	= @CPPFLAGS@
-LIBS		= @PKG_LIBS@ @LIBS@
+LIBS		= @PKG_LIBS@ @LIBS@ -lpng16
 AR		= @AR@
-CFLAGS		= @CFLAGS@ -DPNG_IMPEXP=MODULE_SCOPE -DPNG_EXTERN=MODULE_SCOPE
+CFLAGS		= @CFLAGS@ -DPNG_IMPEXP=MODULE_SCOPE -DPNG_EXTERN=MODULE_SCOPE -DMODULE_SCOPE=extern
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 
 .SUFFIXES: .c .$(OBJEXT)
diff --git a/tkimg/libpng/configure b/tkimg/libpng/configure
index e97800e0..ff244ec8 100755
--- a/tkimg/libpng/configure
+++ b/tkimg/libpng/configure
@@ -5917,50 +5917,6 @@ fi
 
 
 
-
-    vars="
-         ../compat/libpng/arm/arm_init.c ../compat/libpng/arm/filter_neon_intrinsics.c ../compat/libpng/arm/palette_neon_intrinsics.c
-	../compat/libpng/png.c	        ../compat/libpng/pngerror.c	../compat/libpng/pngmem.c
-	../compat/libpng/pngpread.c	../compat/libpng/pngread.c	../compat/libpng/pngrio.c
-	../compat/libpng/pngrtran.c	../compat/libpng/pngrutil.c	../compat/libpng/pngset.c
-	../compat/libpng/pngtrans.c	../compat/libpng/pngwio.c	../compat/libpng/pngwrite.c
-	../compat/libpng/pngwtran.c	../compat/libpng/pngwutil.c	../compat/libpng/pngget.c
-"
-    for i in $vars; do
-	case $i in
-	    \$*)
-		# allow $-var names
-		PKG_SOURCES="$PKG_SOURCES $i"
-		PKG_OBJECTS="$PKG_OBJECTS $i"
-		;;
-	    *)
-		# check for existence - allows for generic/win/unix VPATH
-		# To add more dirs here (like 'src'), you have to update VPATH
-		# in Makefile.in as well
-		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
-		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
-		    -a ! -f "${srcdir}/macosx/$i" \
-		    ; then
-		    as_fn_error $? "could not find source file '$i'" "$LINENO" 5
-		fi
-		PKG_SOURCES="$PKG_SOURCES $i"
-		# this assumes it is in a VPATH dir
-		i=`basename $i`
-		# handle user calling this before or after TEA_SETUP_COMPILER
-		if test x"${OBJEXT}" != x ; then
-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
-		else
-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
-		fi
-		PKG_OBJECTS="$PKG_OBJECTS $j"
-		;;
-	esac
-    done
-
-
-
-
-
     vars="pngtcl.h pngtclDecls.h"
     for i in $vars; do
 	# check for existence, be strict because it is installed
diff --git a/tkimg/libpng/configure.ac b/tkimg/libpng/configure.ac
index a182d776..ed872160 100755
--- a/tkimg/libpng/configure.ac
+++ b/tkimg/libpng/configure.ac
@@ -64,15 +64,6 @@ IMG_SRCPATH(zlibtcl)
 
 TEA_ADD_SOURCES([pngtcl.c pngtclStubInit.c])
 
-TEA_ADD_SOURCES([
-         ../compat/libpng/arm/arm_init.c ../compat/libpng/arm/filter_neon_intrinsics.c ../compat/libpng/arm/palette_neon_intrinsics.c
-	../compat/libpng/png.c	        ../compat/libpng/pngerror.c	../compat/libpng/pngmem.c
-	../compat/libpng/pngpread.c	../compat/libpng/pngread.c	../compat/libpng/pngrio.c
-	../compat/libpng/pngrtran.c	../compat/libpng/pngrutil.c	../compat/libpng/pngset.c
-	../compat/libpng/pngtrans.c	../compat/libpng/pngwio.c	../compat/libpng/pngwrite.c
-	../compat/libpng/pngwtran.c	../compat/libpng/pngwutil.c	../compat/libpng/pngget.c
-])
-
 TEA_ADD_HEADERS([pngtcl.h pngtclDecls.h])
 TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${zlibtcl_SRC_PATH}`\"])
 TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${zlibtcl_BUILD_PATH}`\"])
diff --git a/tkimg/libpng/pngtclDecls.h b/tkimg/libpng/pngtclDecls.h
index 82eb8a47..d394525b 100755
--- a/tkimg/libpng/pngtclDecls.h
+++ b/tkimg/libpng/pngtclDecls.h
@@ -28,7 +28,9 @@
 EXTERN int Pngtcl_Init(Tcl_Interp *interp);
 EXTERN int Pngtcl_SafeInit(Tcl_Interp *interp);
 
-#include "../compat/libpng/png.h"
+#undef PNG_IMPEXP
+#include "/usr/include/png.h"
+#define PNG_IMPEXP extern
 
 /* !BEGIN!: Do not edit below this line. */
 
-- 
2.33.7