summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-03-08 14:03:48 +0000
committerJustin Lecher <jlec@gentoo.org>2011-03-08 14:03:48 +0000
commit1b5b1cc4dbaffdb8d472d64715adf13e0e2e1dfb (patch)
tree03b64d1b0858cb578286e2e9fe5d9416952acced /dev-tcltk/tkimg
parentVersion bump and old version cleaup (diff)
downloadgentoo-2-1b5b1cc4dbaffdb8d472d64715adf13e0e2e1dfb.tar.gz
gentoo-2-1b5b1cc4dbaffdb8d472d64715adf13e0e2e1dfb.tar.bz2
gentoo-2-1b5b1cc4dbaffdb8d472d64715adf13e0e2e1dfb.zip
tclxml-expat
Diffstat (limited to 'dev-tcltk/tkimg')
-rw-r--r--dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo.patch59
1 files changed, 0 insertions, 59 deletions
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo.patch b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo.patch
index 7788e3f70e85..7c7dcadede92 100644
--- a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo.patch
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo.patch
@@ -1,62 +1,3 @@
-diff --git a/jpeg/jpeg.c b/jpeg/jpeg.c
-index d687325..d6b876b 100644
---- a/jpeg/jpeg.c
-+++ b/jpeg/jpeg.c
-@@ -55,6 +55,7 @@
- #include <stdio.h>
-
- #include "tcl.h"
-+#include "init.c"
- #include "jpegtcl.h"
-
- static int SetupJPegLibrary(Tcl_Interp *interp);
-@@ -62,7 +63,6 @@ static int SetupJPegLibrary(Tcl_Interp *interp);
- #define MORE_INITIALIZATION \
- if (SetupJPegLibrary (interp) != TCL_OK) { return TCL_ERROR; }
-
--#include "init.c"
-
- /* system includes */
- #include <stdlib.h>
-diff --git a/libjpeg/Makefile.in b/libjpeg/Makefile.in
-index 411b309..a575177 100644
---- a/libjpeg/Makefile.in
-+++ b/libjpeg/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 = jpegtcl.c jpegtclStubInit.c
-+PKG_OBJECTS = jpegtcl.o jpegtclStubInit.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@ -ljpeg
- STLIB_LD = @STLIB_LD@
- TCL_DEFS = @TCL_DEFS@
- TCL_BIN_DIR = @TCL_BIN_DIR@
-diff --git a/libjpeg/jpegtclDecls.h b/libjpeg/jpegtclDecls.h
-index 9d2ae2e..0afc148 100644
---- a/libjpeg/jpegtclDecls.h
-+++ b/libjpeg/jpegtclDecls.h
-@@ -20,8 +20,8 @@
- #undef EXTERN
-
- #include "jpegtclDeclsMask.h"
--#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>
- #include "jpegtclDeclsUnmask.h"
-
- /*
diff --git a/libpng/Makefile.in b/libpng/Makefile.in
index b84c3c5..9078062 100644
--- a/libpng/Makefile.in