From 6b362bb8ade9f6f46df58c9cda8bfa2b004b5a9b 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: libz

Author: Sergei Golovan

Description: Patch enables dynamic linking to system-wide zlib.

 It's a Debian-specific hack and isn't supposed to be sent upstream.

Last-Modified: Wed, 31 Jan 2018 11:43:41 +0300

---

 tkimg/zlib/Makefile.in    |   4 +-

 tkimg/zlib/configure      | 178 --------------------------------------

 tkimg/zlib/configure.ac   |   5 --

 tkimg/zlib/zlibtclDecls.h |   2 +-

 4 files changed, 3 insertions(+), 186 deletions(-)

diff --git a/tkimg/zlib/Makefile.in b/tkimg/zlib/Makefile.in

index 703f2272..04f74095 100755

--- a/tkimg/zlib/Makefile.in

+++ b/tkimg/zlib/Makefile.in

@@ -158,9 +158,9 @@ DEFS		= @DEFS@ $(PKG_CFLAGS)

 CONFIG_CLEAN_FILES = Makefile

 CPPFLAGS	= @CPPFLAGS@

-LIBS		= @PKG_LIBS@ @LIBS@

+LIBS		= @PKG_LIBS@ @LIBS@ -lz

 AR		= @AR@

-CFLAGS		= @CFLAGS@ -DZEXTERN=MODULE_SCOPE -DZLIB_CONST

+CFLAGS		= @CFLAGS@ -DZEXTERN=MODULE_SCOPE -DZLIB_CONST -DMODULE_SCOPE=extern

 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

 .SUFFIXES: .c .$(OBJEXT)

diff --git a/tkimg/zlib/configure b/tkimg/zlib/configure

index 2726bb4d..968f7627 100755

--- a/tkimg/zlib/configure

+++ b/tkimg/zlib/configure

@@ -5618,184 +5618,6 @@ printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h

     done

-

-

-    vars="../compat/zlib/adler32.c	../compat/zlib/compress.c	../compat/zlib/crc32.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="../compat/zlib/deflate.c	../compat/zlib/gzclose.c	../compat/zlib/gzlib.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="../compat/zlib/gzread.c	../compat/zlib/gzwrite.c	../compat/zlib/infback.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="../compat/zlib/inffast.c	../compat/zlib/inflate.c	../compat/zlib/inftrees.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="../compat/zlib/trees.c	../compat/zlib/uncompr.c	../compat/zlib/zutil.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="zlibtcl.h zlibtclDecls.h"

     for i in $vars; do

 	# check for existence, be strict because it is installed

diff --git a/tkimg/zlib/configure.ac b/tkimg/zlib/configure.ac

index 135c7000..c80807ef 100755

--- a/tkimg/zlib/configure.ac

+++ b/tkimg/zlib/configure.ac

@@ -50,11 +50,6 @@ TEA_SETUP_COMPILER

 #-----------------------------------------------------------------------

 TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c])

-TEA_ADD_SOURCES([../compat/zlib/adler32.c	../compat/zlib/compress.c	../compat/zlib/crc32.c])

-TEA_ADD_SOURCES([../compat/zlib/deflate.c	../compat/zlib/gzclose.c	../compat/zlib/gzlib.c])

-TEA_ADD_SOURCES([../compat/zlib/gzread.c	../compat/zlib/gzwrite.c	../compat/zlib/infback.c])

-TEA_ADD_SOURCES([../compat/zlib/inffast.c	../compat/zlib/inflate.c	../compat/zlib/inftrees.c])

-TEA_ADD_SOURCES([../compat/zlib/trees.c	../compat/zlib/uncompr.c	../compat/zlib/zutil.c])

 TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h])

diff --git a/tkimg/zlib/zlibtclDecls.h b/tkimg/zlib/zlibtclDecls.h

index c2ebb631..0e751336 100755

--- a/tkimg/zlib/zlibtclDecls.h

+++ b/tkimg/zlib/zlibtclDecls.h

@@ -28,7 +28,7 @@

 EXTERN int Zlibtcl_Init(Tcl_Interp *interp);

 EXTERN int Zlibtcl_SafeInit(Tcl_Interp *interp);

-#include "../compat/zlib/zlib.h"

+#include "/usr/include/zlib.h"

 #undef gzgetc /* Became a macro in zlib 1.2.7 */

-- 

2.33.7