summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2008-12-03 11:26:02 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2008-12-03 11:26:02 +0000
commit47502a149f3f95000e4b80cb30146ff82f723b65 (patch)
tree39a03684fa280507342fc404c8239f9b3f4d416b /dev-tcltk
parentFix bug 249035. (diff)
downloadgentoo-2-47502a149f3f95000e4b80cb30146ff82f723b65.tar.gz
gentoo-2-47502a149f3f95000e4b80cb30146ff82f723b65.tar.bz2
gentoo-2-47502a149f3f95000e4b80cb30146ff82f723b65.zip
subversion snapshot bump and removed embedded system libs (patch inspired from fedora)
(Portage version: 2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Diffstat (limited to 'dev-tcltk')
-rw-r--r--dev-tcltk/tkimg/ChangeLog10
-rw-r--r--dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch221
-rw-r--r--dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild (renamed from dev-tcltk/tkimg/tkimg-1.3.20081104.ebuild)21
3 files changed, 246 insertions, 6 deletions
diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 296c60eb5171..4d780a387cdf 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-tcltk/tkimg
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.4 2008/11/05 19:54:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.5 2008/12/03 11:26:01 bicatali Exp $
+
+*tkimg-1.3.20081202 (03 Dec 2008)
+
+ 03 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+ +files/tkimg-1.3.20081202-systemlibs.patch, -tkimg-1.3.20081104.ebuild,
+ +tkimg-1.3.20081202.ebuild:
+ subversion snapshot bump and removed embedded system libs (patch inspired
+ from fedora)
*tkimg-1.3.20081104 (05 Nov 2008)
diff --git a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch
new file mode 100644
index 000000000000..183ce94fb442
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch
@@ -0,0 +1,221 @@
+diff -Nur tkimg-1.3.20081202.orig/libjpeg/tcl/jpegtclDecls.h tkimg-1.3.20081202/libjpeg/tcl/jpegtclDecls.h
+--- tkimg-1.3.20081202.orig/libjpeg/tcl/jpegtclDecls.h 2008-10-22 11:55:37.933226000 +0100
++++ tkimg-1.3.20081202/libjpeg/tcl/jpegtclDecls.h 2008-12-02 19:54:15.180187733 +0000
+@@ -19,10 +19,10 @@
+ /* undef Tcl macros that conflict with libjpeg stuff (sigh) */
+ #undef EXTERN
+
+-#include <jpegtclDeclsMask.h>
+-#include <../jpeglib.h>
+-#include <../jerror.h>
+-#include <jpegtclDeclsUnmask.h>
++#include "jpegtclDeclsMask.h"
++#include </usr/include/jpeglib.h>
++#include </usr/include/jerror.h>
++#include "jpegtclDeclsUnmask.h"
+
+ /*
+ * And recreate the definition of "tcl.h", we need it below.
+diff -Nur tkimg-1.3.20081202.orig/libjpeg/tcl/Makefile.in tkimg-1.3.20081202/libjpeg/tcl/Makefile.in
+--- tkimg-1.3.20081202.orig/libjpeg/tcl/Makefile.in 2008-10-23 17:09:37.830043000 +0100
++++ tkimg-1.3.20081202/libjpeg/tcl/Makefile.in 2008-12-02 19:54:15.180187733 +0000
+@@ -33,8 +33,8 @@
+ # $(srcdir) or in the generic, win or unix subdirectory.
+ #========================================================================
+
+-PKG_SOURCES = @PKG_SOURCES@
+-PKG_OBJECTS = @PKG_OBJECTS@
++PKG_SOURCES = jpegtcl.c jpegtclStubInit.c
++PKG_OBJECTS = jpegtcl.o jpegtclStubInit.o
+
+ PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
+ PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
+@@ -106,7 +106,7 @@
+ RANLIB_STUB = @RANLIB_STUB@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@
+ SHLIB_LD = @SHLIB_LD@
+-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ljpeg
+ STLIB_LD = @STLIB_LD@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_BIN_DIR = @TCL_BIN_DIR@
+diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/Makefile.in tkimg-1.3.20081202/libpng/tcl/Makefile.in
+--- tkimg-1.3.20081202.orig/libpng/tcl/Makefile.in 2008-10-23 17:09:37.830043000 +0100
++++ tkimg-1.3.20081202/libpng/tcl/Makefile.in 2008-12-02 19:54:19.759763931 +0000
+@@ -37,8 +37,8 @@
+ # $(srcdir) or in the generic, win or unix subdirectory.
+ #========================================================================
+
+-PKG_SOURCES = @PKG_SOURCES@
+-PKG_OBJECTS = @PKG_OBJECTS@
++PKG_SOURCES = pngtcl.c pngtclStubInit.c
++PKG_OBJECTS = pngtcl.o pngtclStubInit.o
+
+ PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
+ PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
+@@ -110,7 +110,7 @@
+ RANLIB_STUB = @RANLIB_STUB@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@
+ SHLIB_LD = @SHLIB_LD@
+-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lpng12
+ STLIB_LD = @STLIB_LD@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_BIN_DIR = @TCL_BIN_DIR@
+diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/pngtclDecls.h tkimg-1.3.20081202/libpng/tcl/pngtclDecls.h
+--- tkimg-1.3.20081202.orig/libpng/tcl/pngtclDecls.h 2008-10-22 11:55:37.933226000 +0100
++++ tkimg-1.3.20081202/libpng/tcl/pngtclDecls.h 2008-12-02 19:54:19.763764769 +0000
+@@ -16,7 +16,7 @@
+
+ #include <tcl.h>
+ #include <pngtclDeclsMask.h>
+-#include <../png.h>
++#include </usr/include/libpng12/png.h>
+ #include <pngtclDeclsUnmask.h>
+
+ /* !BEGIN!: Do not edit below this line. */
+@@ -221,15 +221,15 @@
+ png_infopp info_ptr_ptr,
+ png_infopp end_info_ptr_ptr));
+ /* 62 */
+-EXTERN void png_read_destroy _ANSI_ARGS_((png_structp png_ptr,
+- png_infop info_ptr, png_infop end_info_ptr));
++/*EXTERN void png_read_destroy _ANSI_ARGS_((png_structp png_ptr,
++ png_infop info_ptr, png_infop end_info_ptr));*/
+ /* 63 */
+ EXTERN void png_destroy_write_struct _ANSI_ARGS_((
+ png_structpp png_ptr_ptr,
+ png_infopp info_ptr_ptr));
+ /* Slot 64 is reserved */
+ /* 65 */
+-EXTERN void png_write_destroy _ANSI_ARGS_((png_structp png_ptr));
++/*EXTERN void png_write_destroy _ANSI_ARGS_((png_structp png_ptr));*/
+ /* 66 */
+ EXTERN void png_set_crc_action _ANSI_ARGS_((png_structp png_ptr,
+ int crit_action, int ancil_action));
+@@ -1171,10 +1171,10 @@
+ void (*png_read_end) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr)); /* 59 */
+ void (*png_destroy_info_struct) _ANSI_ARGS_((png_structp png_ptr, png_infopp info_ptr_ptr)); /* 60 */
+ void (*png_destroy_read_struct) _ANSI_ARGS_((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr)); /* 61 */
+- void (*png_read_destroy) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)); /* 62 */
++/* void (*png_read_destroy) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)); */ /* 62 */
+ void (*png_destroy_write_struct) _ANSI_ARGS_((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)); /* 63 */
+ void *reserved64;
+- void (*png_write_destroy) _ANSI_ARGS_((png_structp png_ptr)); /* 65 */
++/* void (*png_write_destroy) _ANSI_ARGS_((png_structp png_ptr)); */ /* 65 */
+ void (*png_set_crc_action) _ANSI_ARGS_((png_structp png_ptr, int crit_action, int ancil_action)); /* 66 */
+ void (*png_set_filter) _ANSI_ARGS_((png_structp png_ptr, int method, int filters)); /* 67 */
+ void (*png_set_filter_heuristics) _ANSI_ARGS_((png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs)); /* 68 */
+diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/pngtclStubInit.c tkimg-1.3.20081202/libpng/tcl/pngtclStubInit.c
+--- tkimg-1.3.20081202.orig/libpng/tcl/pngtclStubInit.c 2008-10-22 13:06:38.458408000 +0100
++++ tkimg-1.3.20081202/libpng/tcl/pngtclStubInit.c 2008-12-02 19:54:19.763764769 +0000
+@@ -205,10 +205,10 @@
+ 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 -Nur tkimg-1.3.20081202.orig/libtiff/tcl/Makefile.in tkimg-1.3.20081202/libtiff/tcl/Makefile.in
+--- tkimg-1.3.20081202.orig/libtiff/tcl/Makefile.in 2008-10-23 17:09:37.830043000 +0100
++++ tkimg-1.3.20081202/libtiff/tcl/Makefile.in 2008-12-02 19:54:28.771023604 +0000
+@@ -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@
+@@ -108,7 +108,7 @@
+ 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 -Nur tkimg-1.3.20081202.orig/libtiff/tcl/tifftclDecls.h tkimg-1.3.20081202/libtiff/tcl/tifftclDecls.h
+--- tkimg-1.3.20081202.orig/libtiff/tcl/tifftclDecls.h 2008-10-22 11:55:37.933226000 +0100
++++ tkimg-1.3.20081202/libtiff/tcl/tifftclDecls.h 2008-12-02 19:54:28.775023325 +0000
+@@ -24,9 +24,11 @@
+ #undef INLINE
+
+ #include <tifftclDeclsMask.h>
+-#include <../libtiff/tiffio.h>
+-#include <../libtiff/tiffiop.h>
+-#include <../libtiff/tif_predict.h>
++#include "../libtiff/tiffiop.h"
++#include </usr/include/tiff.h>
++#include </usr/include/tiffio.h>
++#include "../libtiff/tiffiop.h"
++#include "../libtiff/tif_predict.h"
+ #include <tifftclDeclsUnmask.h>
+
+ /* !BEGIN!: Do not edit below this line. */
+diff -Nur tkimg-1.3.20081202.orig/libz/tcl/configure.in tkimg-1.3.20081202/libz/tcl/configure.in
+--- tkimg-1.3.20081202.orig/libz/tcl/configure.in 2007-10-13 00:39:51.771426000 +0100
++++ tkimg-1.3.20081202/libz/tcl/configure.in 2008-12-02 19:54:25.307377006 +0000
+@@ -47,16 +47,12 @@
+ #-----------------------------------------------------------------------
+
+ TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c])
+-TEA_ADD_SOURCES([../adler32.c ../compress.c ../crc32.c])
+-TEA_ADD_SOURCES([../deflate.c ../gzio.c ../infback.c])
+-TEA_ADD_SOURCES([../inffast.c ../inflate.c ../inftrees.c])
+-TEA_ADD_SOURCES([../trees.c ../uncompr.c ../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 -Nur tkimg-1.3.20081202.orig/libz/tcl/Makefile.in tkimg-1.3.20081202/libz/tcl/Makefile.in
+--- tkimg-1.3.20081202.orig/libz/tcl/Makefile.in 2008-10-23 17:09:37.830043000 +0100
++++ tkimg-1.3.20081202/libz/tcl/Makefile.in 2008-12-02 19:54:25.307377006 +0000
+@@ -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@
+@@ -106,7 +106,7 @@
+ 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 -Nur tkimg-1.3.20081202.orig/libz/tcl/zlibtclDecls.h tkimg-1.3.20081202/libz/tcl/zlibtclDecls.h
+--- tkimg-1.3.20081202.orig/libz/tcl/zlibtclDecls.h 2008-10-22 11:55:37.933226000 +0100
++++ tkimg-1.3.20081202/libz/tcl/zlibtclDecls.h 2008-12-02 19:54:25.307377006 +0000
+@@ -17,7 +17,7 @@
+
+ #include <tcl.h>
+ #include <zlibtclDeclsMask.h>
+-#include <../zlib.h>
++#include </usr/include/zlib.h>
+ #include <zlibtclDeclsUnmask.h>
+
+ /* !BEGIN!: Do not edit below this line. */
diff --git a/dev-tcltk/tkimg/tkimg-1.3.20081104.ebuild b/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
index 12cd194adff8..fef339efcdfd 100644
--- a/dev-tcltk/tkimg/tkimg-1.3.20081104.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
@@ -1,11 +1,14 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.3.20081104.ebuild,v 1.1 2008/11/05 19:54:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild,v 1.1 2008/12/03 11:26:01 bicatali Exp $
inherit eutils
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.3.YYYYMMDD
+# tar cvfj tkimg-1.3.YYYYMMDD.tar.bz2 tkimg-1.3.YYYYMMDD
SRC_URI="mirror://gentoo/${P}.tar.bz2"
IUSE="doc"
@@ -15,8 +18,14 @@ KEYWORDS="~alpha ~amd64 ~sparc ~x86"
DEPEND="dev-lang/tk
media-libs/libpng
+ media-libs/jpeg
media-libs/tiff"
+src_unpack() {
+ unpack ${A}
+ epatch "${FILESDIR}"/${P}-systemlibs.patch
+}
+
src_install() {
emake \
DESTDIR="${D}" \
@@ -28,9 +37,11 @@ src_install() {
dosym Img1.3/${bl} /usr/$(get_libdir)/${bl}
done
- doman doc/man/*
dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
- insinto /usr/share/doc/${PF}
- doins -r demo
- use doc && dohtml doc/html
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ doins demo.tcl || die
+ insinto /usr/share/doc/${PF}/html
+ doins -r doc/* || die
+ fi
}