| 1 |
ssuominen 11/10/03 20:04:57 |
| 2 |
|
| 3 |
Added: |
| 4 |
tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch |
| 5 |
Log: |
| 6 |
Use bundled copy of libpng14 until bug #378261 is solved since this package is required by multiple reverse dependencies. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch |
| 17 |
=================================================================== |
| 18 |
diff --git a/libpng/pngtclDecls.h b/libpng/pngtclDecls.h |
| 19 |
index 834bd23..259e069 100644 |
| 20 |
--- a/libpng/pngtclDecls.h |
| 21 |
+++ b/libpng/pngtclDecls.h |
| 22 |
@@ -309,7 +309,7 @@ PNGTCLAPI void png_data_freer(png_structp png_ptr, |
| 23 |
png_uint_32 mask); |
| 24 |
/* 98 */ |
| 25 |
PNGTCLAPI png_voidp png_malloc_default(png_structp png_ptr, |
| 26 |
- png_uint_32 size); |
| 27 |
+ png_alloc_size_t size); |
| 28 |
/* 99 */ |
| 29 |
PNGTCLAPI void png_free_default(png_structp png_ptr, png_voidp ptr); |
| 30 |
/* Slot 100 is reserved */ |
| 31 |
@@ -1067,10 +1067,10 @@ typedef struct PngtclStubs { |
| 32 |
void (*png_read_endPtr) (png_structp png_ptr, png_infop info_ptr); /* 59 */ |
| 33 |
void (*png_destroy_info_structPtr) (png_structp png_ptr, png_infopp info_ptr_ptr); /* 60 */ |
| 34 |
void (*png_destroy_read_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); /* 61 */ |
| 35 |
- void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); /* 62 */ |
| 36 |
+/* void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); */ /* 62 */ |
| 37 |
void (*png_destroy_write_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr); /* 63 */ |
| 38 |
void *reserved64; |
| 39 |
- void (*png_write_destroyPtr) (png_structp png_ptr); /* 65 */ |
| 40 |
+/* void (*png_write_destroyPtr) (png_structp png_ptr); */ /* 65 */ |
| 41 |
void (*png_set_crc_actionPtr) (png_structp png_ptr, int crit_action, int ancil_action); /* 66 */ |
| 42 |
void (*png_set_filterPtr) (png_structp png_ptr, int method, int filters); /* 67 */ |
| 43 |
void (*png_set_filter_heuristicsPtr) (png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs); /* 68 */ |
| 44 |
diff --git a/libpng/pngtclStubInit.c b/libpng/pngtclStubInit.c |
| 45 |
index f8d2d9b..3309ee9 100644 |
| 46 |
--- a/libpng/pngtclStubInit.c |
| 47 |
+++ b/libpng/pngtclStubInit.c |
| 48 |
@@ -197,10 +197,10 @@ const PngtclStubs pngtclStubs = { |
| 49 |
png_read_end, /* 59 */ |
| 50 |
png_destroy_info_struct, /* 60 */ |
| 51 |
png_destroy_read_struct, /* 61 */ |
| 52 |
- png_read_destroy, /* 62 */ |
| 53 |
+/* png_read_destroy, */ /* 62 */ |
| 54 |
png_destroy_write_struct, /* 63 */ |
| 55 |
NULL, /* 64 */ |
| 56 |
- png_write_destroy, /* 65 */ |
| 57 |
+/* png_write_destroy, */ /* 65 */ |
| 58 |
png_set_crc_action, /* 66 */ |
| 59 |
png_set_filter, /* 67 */ |
| 60 |
#if !defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) || !defined(PNG_FLOATING_POINT_SUPPORTED) |
| 61 |
diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in |
| 62 |
index 4592093..e32f5d2 100644 |
| 63 |
--- a/libtiff/Makefile.in |
| 64 |
+++ b/libtiff/Makefile.in |
| 65 |
@@ -35,8 +35,8 @@ |
| 66 |
|
| 67 |
# tif_fax3sm is special. It is generated. |
| 68 |
|
| 69 |
-PKG_SOURCES = @PKG_SOURCES@ tif_fax3sm.c |
| 70 |
-PKG_OBJECTS = @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT) |
| 71 |
+PKG_SOURCES = tifftcl.c tifftclStubInit.c |
| 72 |
+PKG_OBJECTS = tifftcl.o tifftclStubInit.o |
| 73 |
|
| 74 |
PKG_STUB_SOURCES = @PKG_STUB_SOURCES@ |
| 75 |
PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@ |
| 76 |
@@ -109,7 +109,7 @@ RANLIB = @RANLIB@ |
| 77 |
RANLIB_STUB = @RANLIB_STUB@ |
| 78 |
SHLIB_CFLAGS = @SHLIB_CFLAGS@ |
| 79 |
SHLIB_LD = @SHLIB_LD@ |
| 80 |
-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ |
| 81 |
+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ltiff |
| 82 |
STLIB_LD = @STLIB_LD@ |
| 83 |
TCL_DEFS = @TCL_DEFS@ |
| 84 |
TCL_BIN_DIR = @TCL_BIN_DIR@ |
| 85 |
diff --git a/libtiff/tifftclDecls.h b/libtiff/tifftclDecls.h |
| 86 |
index b30485d..7dd700b 100644 |
| 87 |
--- a/libtiff/tifftclDecls.h |
| 88 |
+++ b/libtiff/tifftclDecls.h |
| 89 |
@@ -24,8 +24,9 @@ |
| 90 |
#undef INLINE |
| 91 |
|
| 92 |
#include "tifftclDeclsMask.h" |
| 93 |
-#include "../compat/libtiff/libtiff/tiffio.h" |
| 94 |
#include "../compat/libtiff/libtiff/tiffiop.h" |
| 95 |
+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiff.h" |
| 96 |
+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h" |
| 97 |
#include "../compat/libtiff/libtiff/tif_predict.h" |
| 98 |
#include "tifftclDeclsUnmask.h" |
| 99 |
|
| 100 |
diff --git a/tiff/tiff.c b/tiff/tiff.c |
| 101 |
index a5d5949..826da9a 100644 |
| 102 |
--- a/tiff/tiff.c |
| 103 |
+++ b/tiff/tiff.c |
| 104 |
@@ -17,6 +17,7 @@ |
| 105 |
#include "tcl.h" |
| 106 |
#include "tifftcl.h" |
| 107 |
#include "zlibtcl.h" |
| 108 |
+#include "init.c" |
| 109 |
|
| 110 |
#ifdef HAVE_STDLIB_H |
| 111 |
#undef HAVE_STDLIB_H |
| 112 |
@@ -29,7 +30,6 @@ static int SetupTiffLibrary(Tcl_Interp *interp); |
| 113 |
#define MORE_INITIALIZATION \ |
| 114 |
if (SetupTiffLibrary (interp) != TCL_OK) { return TCL_ERROR; } |
| 115 |
|
| 116 |
-#include "init.c" |
| 117 |
|
| 118 |
#include "tiffInt.h" |
| 119 |
|
| 120 |
diff --git a/zlib/Makefile.in b/zlib/Makefile.in |
| 121 |
index cb71481..eb51145 100644 |
| 122 |
--- a/zlib/Makefile.in |
| 123 |
+++ b/zlib/Makefile.in |
| 124 |
@@ -33,8 +33,8 @@ |
| 125 |
# $(srcdir) or in the generic, win or unix subdirectory. |
| 126 |
#======================================================================== |
| 127 |
|
| 128 |
-PKG_SOURCES = @PKG_SOURCES@ |
| 129 |
-PKG_OBJECTS = @PKG_OBJECTS@ |
| 130 |
+PKG_SOURCES = zlibtcl.c zlibtclStubInit.c |
| 131 |
+PKG_OBJECTS = zlibtcl.o zlibtclStubInit.o |
| 132 |
|
| 133 |
PKG_STUB_SOURCES = @PKG_STUB_SOURCES@ |
| 134 |
PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@ |
| 135 |
@@ -107,7 +107,7 @@ RANLIB = @RANLIB@ |
| 136 |
RANLIB_STUB = @RANLIB_STUB@ |
| 137 |
SHLIB_CFLAGS = @SHLIB_CFLAGS@ |
| 138 |
SHLIB_LD = @SHLIB_LD@ |
| 139 |
-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ |
| 140 |
+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lz |
| 141 |
STLIB_LD = @STLIB_LD@ |
| 142 |
TCL_DEFS = @TCL_DEFS@ |
| 143 |
TCL_BIN_DIR = @TCL_BIN_DIR@ |
| 144 |
diff --git a/zlib/configure.in b/zlib/configure.in |
| 145 |
index 292d3aa..bc045d6 100644 |
| 146 |
--- a/zlib/configure.in |
| 147 |
+++ b/zlib/configure.in |
| 148 |
@@ -51,17 +51,12 @@ TEA_SETUP_COMPILER |
| 149 |
#----------------------------------------------------------------------- |
| 150 |
|
| 151 |
TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c]) |
| 152 |
-TEA_ADD_SOURCES([../compat/zlib/adler32.c ../compat/zlib/compress.c ../compat/zlib/crc32.c]) |
| 153 |
-TEA_ADD_SOURCES([../compat/zlib/deflate.c ../compat/zlib/gzclose.c ../compat/zlib/gzlib.c]) |
| 154 |
-TEA_ADD_SOURCES([../compat/zlib/gzread.c ../compat/zlib/gzwrite.c ../compat/zlib/infback.c]) |
| 155 |
-TEA_ADD_SOURCES([../compat/zlib/inffast.c ../compat/zlib/inflate.c ../compat/zlib/inftrees.c]) |
| 156 |
-TEA_ADD_SOURCES([../compat/zlib/trees.c ../compat/zlib/uncompr.c ../compat/zlib/zutil.c]) |
| 157 |
|
| 158 |
TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h]) |
| 159 |
TEA_ADD_HEADERS([zlibtclDeclsMask.h zlibtclDeclsUnmask.h]) |
| 160 |
|
| 161 |
TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"]) |
| 162 |
-TEA_ADD_LIBS([]) |
| 163 |
+TEA_ADD_LIBS([-lz]) |
| 164 |
TEA_ADD_CFLAGS([]) |
| 165 |
TEA_ADD_STUB_SOURCES([zlibtclStubLib.c]) |
| 166 |
TEA_ADD_SOURCES([zlibtclStubLib.c]) |
| 167 |
diff --git a/zlib/zlibtclDecls.h b/zlib/zlibtclDecls.h |
| 168 |
index c91496f..630abc7 100644 |
| 169 |
--- a/zlib/zlibtclDecls.h |
| 170 |
+++ b/zlib/zlibtclDecls.h |
| 171 |
@@ -16,7 +16,7 @@ |
| 172 |
|
| 173 |
#include "tcl.h" |
| 174 |
#include "zlibtclDeclsMask.h" |
| 175 |
-#include "../compat/zlib/zlib.h" |
| 176 |
+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h" |
| 177 |
#include "zlibtclDeclsUnmask.h" |
| 178 |
|
| 179 |
/* !BEGIN!: Do not edit below this line. */ |
Archives