dev-tcltk/tkimg: Correct zlib-fedora patch; drop old patches

(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)

3 files changed, 6 insertions, 248 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 8c194b3d10f4..e5b420ed54b4 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.50 2012/10/06 09:49:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.51 2012/10/07 09:55:44 jlec Exp $
+
+  07 Oct 2012; Justin Lecher <jlec@gentoo.org>
+  files/tkimg-1.4-zlib127-gzgetc_fix.patch,
+  -files/tkimg-1.5_pre324-unbundle.patch:
+  Correct zlib-fedora patch; drop old patches
 
 *tkimg-1.4-r7 (06 Oct 2012)
 
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-zlib127-gzgetc_fix.patch b/dev-tcltk/tkimg/files/tkimg-1.4-zlib127-gzgetc_fix.patch
index 1b9ce158ca73..64584f5ebbed 100644
--- a/dev-tcltk/tkimg/files/tkimg-1.4-zlib127-gzgetc_fix.patch
+++ b/dev-tcltk/tkimg/files/tkimg-1.4-zlib127-gzgetc_fix.patch
@@ -13,15 +13,6 @@ diff -up tkimg1.4/zlib/zlibtcl.decls.gzgetc_fix tkimg1.4/zlib/zlibtcl.decls
 diff -up tkimg1.4/zlib/zlibtclDecls.h.gzgetc_fix tkimg1.4/zlib/zlibtclDecls.h
 --- tkimg1.4/zlib/zlibtclDecls.h.gzgetc_fix	2012-07-31 14:55:12.754307116 -0400
 +++ tkimg1.4/zlib/zlibtclDecls.h	2012-07-31 14:55:17.520307957 -0400
-@@ -120,7 +120,7 @@ ZEXTERN char *		gzgets(gzFile file, char
- /* 38 */
- ZEXTERN int		gzputc(gzFile file, int c);
- /* 39 */
--ZEXTERN int		gzgetc(gzFile file);
-+ZEXTERN int		gzgetc_(gzFile file);
- /* 40 */
- ZEXTERN int		gzflush(gzFile file, int flush);
- /* 41 */
 @@ -179,7 +179,7 @@ typedef struct ZlibtclStubs {
      int (*gzputsPtr) (gzFile file, const char *s); /* 36 */
      char * (*gzgetsPtr) (gzFile file, char *buf, int len); /* 37 */
diff --git a/dev-tcltk/tkimg/files/tkimg-1.5_pre324-unbundle.patch b/dev-tcltk/tkimg/files/tkimg-1.5_pre324-unbundle.patch
deleted file mode 100644
index 30cfafa8b307..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.5_pre324-unbundle.patch
+++ /dev/null
@@ -1,238 +0,0 @@
- libjpeg/configure.in      |   21 +--------------------
- libjpeg/jpegtclDecls.h    |    4 ++--
- libpng/configure.in       |   10 +---------
- libpng/pngtclDecls.h      |    2 +-
- libtiff/configure.in      |   19 ++-----------------
- libtiff/tifftcl.decls     |    3 ---
- libtiff/tifftclDecls.h    |    7 +++----
- libtiff/tifftclStubInit.c |    1 -
- zlib/configure.in         |    7 +------
- zlib/zlibtclDecls.h       |    2 +-
- 10 files changed, 12 insertions(+), 64 deletions(-)
-
-diff --git a/libjpeg/configure.in b/libjpeg/configure.in
-index ebf24a1..c38f766 100644
---- a/libjpeg/configure.in
-+++ b/libjpeg/configure.in
-@@ -54,30 +54,11 @@ JPEG_CC=$CC
- 
- TEA_ADD_SOURCES([jpegtcl.c jpegtclStubInit.c])
- 
--TEA_ADD_SOURCES([
--	../compat/libjpeg/jcapimin.c	../compat/libjpeg/jcapistd.c	../compat/libjpeg/jccoefct.c
--	../compat/libjpeg/jccolor.c	../compat/libjpeg/jcdctmgr.c	../compat/libjpeg/jchuff.c
--	../compat/libjpeg/jcinit.c	../compat/libjpeg/jcmainct.c	../compat/libjpeg/jcmarker.c
--	../compat/libjpeg/jcmaster.c	../compat/libjpeg/jcomapi.c	../compat/libjpeg/jcparam.c
--	../compat/libjpeg/jcarith.c	../compat/libjpeg/jcprepct.c	../compat/libjpeg/jcsample.c
--	../compat/libjpeg/jctrans.c	../compat/libjpeg/jdapimin.c	../compat/libjpeg/jdapistd.c
--	../compat/libjpeg/jdatadst.c	../compat/libjpeg/jdatasrc.c	../compat/libjpeg/jdcoefct.c
--	../compat/libjpeg/jdcolor.c	../compat/libjpeg/jddctmgr.c	../compat/libjpeg/jdhuff.c
--	../compat/libjpeg/jdinput.c	../compat/libjpeg/jdmainct.c	../compat/libjpeg/jdmarker.c
--	../compat/libjpeg/jdmaster.c	../compat/libjpeg/jdmerge.c	../compat/libjpeg/jdarith.c
--	../compat/libjpeg/jdpostct.c	../compat/libjpeg/jdsample.c	../compat/libjpeg/jdtrans.c
--	../compat/libjpeg/jerror.c	../compat/libjpeg/jfdctflt.c	../compat/libjpeg/jfdctfst.c
--	../compat/libjpeg/jfdctint.c	../compat/libjpeg/jidctflt.c	../compat/libjpeg/jidctfst.c
--	../compat/libjpeg/jidctint.c	../compat/libjpeg/jaricom.c	../compat/libjpeg/jquant1.c
--	../compat/libjpeg/jquant2.c	../compat/libjpeg/jutils.c	../compat/libjpeg/jmemmgr.c
--	../compat/libjpeg/jmemansi.c
--])
--
- TEA_ADD_HEADERS([jpegtcl.h jpegtclDecls.h])
- 
- TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
- TEA_ADD_INCLUDES([-I\"./libjpeg\"])
--TEA_ADD_LIBS([])
-+TEA_ADD_LIBS([-ljpeg])
- TEA_ADD_CFLAGS([])
- TEA_ADD_STUB_SOURCES([jpegtclStubLib.c])
- TEA_ADD_SOURCES([jpegtclStubLib.c])
-diff --git a/libjpeg/jpegtclDecls.h b/libjpeg/jpegtclDecls.h
-index e4cd005..34106b0 100644
---- a/libjpeg/jpegtclDecls.h
-+++ b/libjpeg/jpegtclDecls.h
-@@ -33,8 +33,8 @@ EXTERN int Jpegtcl_SafeInit(Tcl_Interp *interp);
- #if !defined(NO_PROTOTYPES) && !defined(HAVE_PROTOTYPES)
- #   define HAVE_PROTOTYPES 1
- #endif
--#include "../compat/libjpeg/jpeglib.h"
--#include "../compat/libjpeg/jerror.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/jpeglib.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/jerror.h"
- 
- /* !BEGIN!: Do not edit below this line. */
- 
-diff --git a/libpng/configure.in b/libpng/configure.in
-index 4bfe863..7380680 100644
---- a/libpng/configure.in
-+++ b/libpng/configure.in
-@@ -65,19 +65,11 @@ IMG_SRCPATH(zlibtcl)
- 
- TEA_ADD_SOURCES([pngtcl.c pngtclStubInit.c])
- 
--TEA_ADD_SOURCES([
--	../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}`\"])
- TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
--TEA_ADD_LIBS([-lm])
-+TEA_ADD_LIBS([-lm -lpng])
- TEA_ADD_CFLAGS([-DZLIBTCL_VERSION=\\\"${zlibtcl_VERSION}\\\"])
- TEA_ADD_STUB_SOURCES([pngtclStubLib.c])
- TEA_ADD_SOURCES([pngtclStubLib.c])
-diff --git a/libpng/pngtclDecls.h b/libpng/pngtclDecls.h
-index 32baeab..a535e25 100644
---- a/libpng/pngtclDecls.h
-+++ b/libpng/pngtclDecls.h
-@@ -28,7 +28,7 @@
- EXTERN int Pngtcl_Init(Tcl_Interp *interp);
- EXTERN int Pngtcl_SafeInit(Tcl_Interp *interp);
- 
--#include "../compat/libpng/png.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/png.h"
- 
- /* !BEGIN!: Do not edit below this line. */
- 
-diff --git a/libtiff/configure.in b/libtiff/configure.in
-index 64e5bdf..20a8dd1 100644
---- a/libtiff/configure.in
-+++ b/libtiff/configure.in
-@@ -68,7 +68,7 @@ else
-     TIFFHOST="$host"
- fi
- ${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
--	"--with-CC=$TIFFCC" $TIFFHOST
-+	$TIFFHOST
- mv -f tifftcl_confdefs.h confdefs.h
- 
- #-----------------------------------------------------------------------
-@@ -82,20 +82,6 @@ mv -f tifftcl_confdefs.h confdefs.h
- 
- TEA_ADD_SOURCES([tifftcl.c tifftclStubInit.c])
- 
--TEA_ADD_SOURCES([
--	../compat/libtiff/libtiff/tif_aux.c		../compat/libtiff/libtiff/tif_close.c		../compat/libtiff/libtiff/tif_codec.c
--	../compat/libtiff/libtiff/tif_compress.c	../compat/libtiff/libtiff/tif_dir.c		../compat/libtiff/libtiff/tif_dirinfo.c
--	../compat/libtiff/libtiff/tif_dirread.c	../compat/libtiff/libtiff/tif_dirwrite.c	../compat/libtiff/libtiff/tif_dumpmode.c
--	../compat/libtiff/libtiff/tif_error.c		../compat/libtiff/libtiff/tif_fax3.c
--	../compat/libtiff/libtiff/tif_getimage.c	../compat/libtiff/libtiff/tif_flush.c		../compat/libtiff/libtiff/tif_luv.c
--	../compat/libtiff/libtiff/tif_lzw.c		../compat/libtiff/libtiff/tif_next.c		../compat/libtiff/libtiff/tif_open.c
--	../compat/libtiff/libtiff/tif_packbits.c	../compat/libtiff/libtiff/tif_predict.c	../compat/libtiff/libtiff/tif_print.c
--	../compat/libtiff/libtiff/tif_read.c		../compat/libtiff/libtiff/tif_swab.c		../compat/libtiff/libtiff/tif_strip.c
--	../compat/libtiff/libtiff/tif_thunder.c	../compat/libtiff/libtiff/tif_tile.c		../compat/libtiff/libtiff/tif_version.c
--	../compat/libtiff/libtiff/tif_warning.c	../compat/libtiff/libtiff/tif_write.c
--	../compat/libtiff/libtiff/tif_color.c		../compat/libtiff/libtiff/tif_extension.c
--])
--
- TEA_ADD_HEADERS([tifftcl.h tifftclDecls.h])
- TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
- TEA_ADD_INCLUDES([-I\"./libtiff\"])
-@@ -133,7 +119,6 @@ if test "${TEA_PLATFORM}" = "windows" ; then
-     TEA_ADD_SOURCES([../compat/libtiff/libtiff/tif_win32.c])
- else
-     CLEANFILES=""
--    TEA_ADD_SOURCES([../compat/libtiff/libtiff/tif_unix.c])
- fi
- AC_SUBST(CLEANFILES)
- 
-@@ -198,7 +183,7 @@ TEA_MAKE_LIB
- if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
-     TEA_ADD_LIBS([user32.lib])
- else
--    TEA_ADD_LIBS([-lm])
-+    TEA_ADD_LIBS([-lm -ltiff])
- fi
- 
- #--------------------------------------------------------------------
-diff --git a/libtiff/tifftcl.decls b/libtiff/tifftcl.decls
-index bed9be1..e7f1433 100644
---- a/libtiff/tifftcl.decls
-+++ b/libtiff/tifftcl.decls
-@@ -172,9 +172,6 @@ declare 48 {
- declare 49 {
-     int TIFFWriteDirectory(TIFF *tiffptr)
- }
--declare 50 {
--    int TIFFReassignTagToIgnore(enum TIFFIgnoreSense a, int b)
--}
- declare 51 {
-     void TIFFPrintDirectory(TIFF *tiffptr, FILE *a, long b)
- }
-diff --git a/libtiff/tifftclDecls.h b/libtiff/tifftclDecls.h
-index 1732cad..8ae1967 100644
---- a/libtiff/tifftclDecls.h
-+++ b/libtiff/tifftclDecls.h
-@@ -34,7 +34,9 @@ EXTERN int Tifftcl_SafeInit(Tcl_Interp *interp);
-  */
- #undef INLINE
- 
--#include "../compat/libtiff/libtiff/tiffio.h"
-+#include "../compat/libtiff/libtiff/tiffiop.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiff.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h"
- #include "../compat/libtiff/libtiff/tiffiop.h"
- #include "../compat/libtiff/libtiff/tif_predict.h"
- 
-@@ -150,9 +152,6 @@ TIFFTCLAPI int		TIFFSetField(TIFF *tiffptr, ttag_t a, ...);
- TIFFTCLAPI int		TIFFVSetField(TIFF *tiffptr, ttag_t a, va_list b);
- /* 49 */
- TIFFTCLAPI int		TIFFWriteDirectory(TIFF *tiffptr);
--/* 50 */
--TIFFTCLAPI int		TIFFReassignTagToIgnore(enum TIFFIgnoreSense a,
--				int b);
- /* 51 */
- TIFFTCLAPI void		TIFFPrintDirectory(TIFF *tiffptr, FILE *a, long b);
- /* 52 */
-diff --git a/libtiff/tifftclStubInit.c b/libtiff/tifftclStubInit.c
-index cf9448f..7302310 100644
---- a/libtiff/tifftclStubInit.c
-+++ b/libtiff/tifftclStubInit.c
-@@ -70,7 +70,6 @@ const TifftclStubs tifftclStubs = {
-     TIFFSetField, /* 47 */
-     TIFFVSetField, /* 48 */
-     TIFFWriteDirectory, /* 49 */
--    TIFFReassignTagToIgnore, /* 50 */
-     TIFFPrintDirectory, /* 51 */
-     TIFFReadScanline, /* 52 */
-     TIFFWriteScanline, /* 53 */
-diff --git a/zlib/configure.in b/zlib/configure.in
-index 713bc51..2aff164 100644
---- a/zlib/configure.in
-+++ b/zlib/configure.in
-@@ -51,16 +51,11 @@ 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])
- 
- TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
--TEA_ADD_LIBS([])
-+TEA_ADD_LIBS([-lz])
- TEA_ADD_CFLAGS([])
- TEA_ADD_STUB_SOURCES([zlibtclStubLib.c])
- TEA_ADD_SOURCES([zlibtclStubLib.c])
-diff --git a/zlib/zlibtclDecls.h b/zlib/zlibtclDecls.h
-index 2f7ecb2..d6666ab 100644
---- a/zlib/zlibtclDecls.h
-+++ b/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 "@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h"
- 
- /* !BEGIN!: Do not edit below this line. */
-