Use bundled copy of libpng14 until bug #378261 is solved since this package is required by multiple reverse dependencies.

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

3 files changed, 233 insertions, 1 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 7bbfa8107da5..9ea074742ee0 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.29 2011/09/19 16:18:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.30 2011/10/03 20:04:57 ssuominen Exp $
+
+*tkimg-1.4.20100510-r1 (03 Oct 2011)
+
+  03 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +tkimg-1.4.20100510-r1.ebuild,
+  +files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch:
+  Use bundled copy of libpng14 until bug #378261 is solved since this package
+  is required by multiple reverse dependencies.
 
   19 Sep 2011; Justin Lecher <jlec@gentoo.org> tkimg-1.4.ebuild,
   tkimg-1.4-r1.ebuild, tkimg-1.5_pre324.ebuild:
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch
new file mode 100644
index 000000000000..f63b9bcaa2eb
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch
@@ -0,0 +1,162 @@
+diff --git a/libpng/pngtclDecls.h b/libpng/pngtclDecls.h
+index 834bd23..259e069 100644
+--- a/libpng/pngtclDecls.h
++++ b/libpng/pngtclDecls.h
+@@ -309,7 +309,7 @@ PNGTCLAPI void		png_data_freer(png_structp png_ptr,
+ 				png_uint_32 mask);
+ /* 98 */
+ PNGTCLAPI png_voidp	png_malloc_default(png_structp png_ptr,
+-				png_uint_32 size);
++				png_alloc_size_t size);
+ /* 99 */
+ PNGTCLAPI void		png_free_default(png_structp png_ptr, png_voidp ptr);
+ /* Slot 100 is reserved */
+@@ -1067,10 +1067,10 @@ typedef struct PngtclStubs {
+     void (*png_read_endPtr) (png_structp png_ptr, png_infop info_ptr); /* 59 */
+     void (*png_destroy_info_structPtr) (png_structp png_ptr, png_infopp info_ptr_ptr); /* 60 */
+     void (*png_destroy_read_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); /* 61 */
+-    void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); /* 62 */
++/*    void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); */ /* 62 */
+     void (*png_destroy_write_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr); /* 63 */
+     void *reserved64;
+-    void (*png_write_destroyPtr) (png_structp png_ptr); /* 65 */
++/*    void (*png_write_destroyPtr) (png_structp png_ptr); */ /* 65 */
+     void (*png_set_crc_actionPtr) (png_structp png_ptr, int crit_action, int ancil_action); /* 66 */
+     void (*png_set_filterPtr) (png_structp png_ptr, int method, int filters); /* 67 */
+     void (*png_set_filter_heuristicsPtr) (png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs); /* 68 */
+diff --git a/libpng/pngtclStubInit.c b/libpng/pngtclStubInit.c
+index f8d2d9b..3309ee9 100644
+--- a/libpng/pngtclStubInit.c
++++ b/libpng/pngtclStubInit.c
+@@ -197,10 +197,10 @@ const PngtclStubs pngtclStubs = {
+     png_read_end, /* 59 */
+     png_destroy_info_struct, /* 60 */
+     png_destroy_read_struct, /* 61 */
+-    png_read_destroy, /* 62 */
++/*    png_read_destroy, */ /* 62 */
+     png_destroy_write_struct, /* 63 */
+     NULL, /* 64 */
+-    png_write_destroy, /* 65 */
++/*    png_write_destroy, */ /* 65 */
+     png_set_crc_action, /* 66 */
+     png_set_filter, /* 67 */
+ #if !defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) || !defined(PNG_FLOATING_POINT_SUPPORTED)
+diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
+index 4592093..e32f5d2 100644
+--- a/libtiff/Makefile.in
++++ b/libtiff/Makefile.in
+@@ -35,8 +35,8 @@
+ 
+ # tif_fax3sm is special. It is generated.
+ 
+-PKG_SOURCES	= @PKG_SOURCES@ tif_fax3sm.c
+-PKG_OBJECTS	= @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT)
++PKG_SOURCES	= tifftcl.c tifftclStubInit.c 
++PKG_OBJECTS	= tifftcl.o tifftclStubInit.o 
+ 
+ PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
+ PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
+@@ -109,7 +109,7 @@ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -ltiff
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+diff --git a/libtiff/tifftclDecls.h b/libtiff/tifftclDecls.h
+index b30485d..7dd700b 100644
+--- a/libtiff/tifftclDecls.h
++++ b/libtiff/tifftclDecls.h
+@@ -24,8 +24,9 @@
+ #undef INLINE
+ 
+ #include "tifftclDeclsMask.h"
+-#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/tif_predict.h"
+ #include "tifftclDeclsUnmask.h"
+ 
+diff --git a/tiff/tiff.c b/tiff/tiff.c
+index a5d5949..826da9a 100644
+--- a/tiff/tiff.c
++++ b/tiff/tiff.c
+@@ -17,6 +17,7 @@
+ #include "tcl.h"
+ #include "tifftcl.h"
+ #include "zlibtcl.h"
++#include "init.c"
+ 
+ #ifdef HAVE_STDLIB_H
+ #undef HAVE_STDLIB_H
+@@ -29,7 +30,6 @@ static int SetupTiffLibrary(Tcl_Interp *interp);
+ #define MORE_INITIALIZATION \
+     if (SetupTiffLibrary (interp) != TCL_OK) { return TCL_ERROR; }
+ 
+-#include "init.c"
+ 
+ #include "tiffInt.h"
+ 
+diff --git a/zlib/Makefile.in b/zlib/Makefile.in
+index cb71481..eb51145 100644
+--- a/zlib/Makefile.in
++++ b/zlib/Makefile.in
+@@ -33,8 +33,8 @@
+ # $(srcdir) or in the generic, win or unix subdirectory.
+ #========================================================================
+ 
+-PKG_SOURCES	= @PKG_SOURCES@
+-PKG_OBJECTS	= @PKG_OBJECTS@
++PKG_SOURCES	= zlibtcl.c zlibtclStubInit.c
++PKG_OBJECTS	= zlibtcl.o zlibtclStubInit.o
+ 
+ PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
+ PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
+@@ -107,7 +107,7 @@ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lz
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+diff --git a/zlib/configure.in b/zlib/configure.in
+index 292d3aa..bc045d6 100644
+--- a/zlib/configure.in
++++ b/zlib/configure.in
+@@ -51,17 +51,12 @@ 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_HEADERS([zlibtclDeclsMask.h zlibtclDeclsUnmask.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 c91496f..630abc7 100644
+--- a/zlib/zlibtclDecls.h
++++ b/zlib/zlibtclDecls.h
+@@ -16,7 +16,7 @@
+ 
+ #include "tcl.h"
+ #include "zlibtclDeclsMask.h"
+-#include "../compat/zlib/zlib.h"
++#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h"
+ #include "zlibtclDeclsUnmask.h"
+ 
+ /* !BEGIN!: Do not edit below this line. */
diff --git a/dev-tcltk/tkimg/tkimg-1.4.20100510-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4.20100510-r1.ebuild
new file mode 100644
index 000000000000..3b5a1b36193b
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.20100510-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4.20100510-r1.ebuild,v 1.1 2011/10/03 20:04:57 ssuominen Exp $
+
+EAPI="3"
+
+inherit eutils prefix virtualx
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://sourceforge.net/projects/tkimg/"
+# src built with:
+# svn export https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-1.4.YYYYMMDD
+# tar cvfj tkimg-1.4.YYYYMMDD.tar.bz2  tkimg-1.4.YYYYMMDD
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+IUSE="doc"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-lang/tk
+	>=dev-tcltk/tcllib-1.11
+	virtual/jpeg
+	media-libs/tiff"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Use bundled libpng14 temporarily to workaround #378261
+	epatch \
+		"${FILESDIR}"/${P}-gentoo+use_bundled_libpng14.patch \
+		"${FILESDIR}"/${P}-boolean.patch
+
+	eprefixify \
+		libjpeg/jpegtclDecls.h \
+		libtiff/tifftclDecls.h \
+		zlib/zlibtclDecls.h
+}
+
+src_test() {
+	Xemake test || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_ROOT="${D}" \
+		install || die "emake install failed"
+	# Make library links
+	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+		bl=$(basename $l)
+		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+	done
+
+	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins demo.tcl || die
+		insinto /usr/share/doc/${PF}/html
+		doins -r doc/* || die
+	fi
+}