Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-tcltk/tkimg/files: tkimg-1.3.20100510-gentoo.patch
Date: Tue, 11 May 2010 16:42:53
Message-Id: 20100511164246.F28A82C4F8@corvid.gentoo.org
1 jlec 10/05/11 16:42:46
2
3 Added: tkimg-1.3.20100510-gentoo.patch
4 Log:
5 Version Bump #312695
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-tcltk/tkimg/files/tkimg-1.3.20100510-gentoo.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/files/tkimg-1.3.20100510-gentoo.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/files/tkimg-1.3.20100510-gentoo.patch?rev=1.1&content-type=text/plain
13
14 Index: tkimg-1.3.20100510-gentoo.patch
15 ===================================================================
16 diff --git a/jpeg/jpeg.c b/jpeg/jpeg.c
17 index d687325..d6b876b 100644
18 --- a/jpeg/jpeg.c
19 +++ b/jpeg/jpeg.c
20 @@ -55,6 +55,7 @@
21 #include <stdio.h>
22
23 #include "tcl.h"
24 +#include "init.c"
25 #include "jpegtcl.h"
26
27 static int SetupJPegLibrary(Tcl_Interp *interp);
28 @@ -62,7 +63,6 @@ static int SetupJPegLibrary(Tcl_Interp *interp);
29 #define MORE_INITIALIZATION \
30 if (SetupJPegLibrary (interp) != TCL_OK) { return TCL_ERROR; }
31
32 -#include "init.c"
33
34 /* system includes */
35 #include <stdlib.h>
36 diff --git a/libjpeg/Makefile.in b/libjpeg/Makefile.in
37 index 411b309..a575177 100644
38 --- a/libjpeg/Makefile.in
39 +++ b/libjpeg/Makefile.in
40 @@ -33,8 +33,8 @@
41 # $(srcdir) or in the generic, win or unix subdirectory.
42 #========================================================================
43
44 -PKG_SOURCES = @PKG_SOURCES@
45 -PKG_OBJECTS = @PKG_OBJECTS@
46 +PKG_SOURCES = jpegtcl.c jpegtclStubInit.c
47 +PKG_OBJECTS = jpegtcl.o jpegtclStubInit.o
48
49 PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
50 PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
51 @@ -107,7 +107,7 @@ RANLIB = @RANLIB@
52 RANLIB_STUB = @RANLIB_STUB@
53 SHLIB_CFLAGS = @SHLIB_CFLAGS@
54 SHLIB_LD = @SHLIB_LD@
55 -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
56 +SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ljpeg
57 STLIB_LD = @STLIB_LD@
58 TCL_DEFS = @TCL_DEFS@
59 TCL_BIN_DIR = @TCL_BIN_DIR@
60 diff --git a/libjpeg/jpegtclDecls.h b/libjpeg/jpegtclDecls.h
61 index 9d2ae2e..0afc148 100644
62 --- a/libjpeg/jpegtclDecls.h
63 +++ b/libjpeg/jpegtclDecls.h
64 @@ -20,8 +20,8 @@
65 #undef EXTERN
66
67 #include "jpegtclDeclsMask.h"
68 -#include "../compat/libjpeg/jpeglib.h"
69 -#include "../compat/libjpeg/jerror.h"
70 +#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/jpeglib.h>
71 +#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/jerror.h>
72 #include "jpegtclDeclsUnmask.h"
73
74 /*
75 diff --git a/libpng/Makefile.in b/libpng/Makefile.in
76 index b84c3c5..9078062 100644
77 --- a/libpng/Makefile.in
78 +++ b/libpng/Makefile.in
79 @@ -37,8 +37,8 @@ zlibtcl_VERSION = @zlibtcl_VERSION@
80 # $(srcdir) or in the generic, win or unix subdirectory.
81 #========================================================================
82
83 -PKG_SOURCES = @PKG_SOURCES@
84 -PKG_OBJECTS = @PKG_OBJECTS@
85 +PKG_SOURCES = pngtcl.c pngtclStubInit.c
86 +PKG_OBJECTS = pngtcl.o pngtclStubInit.o
87
88 PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
89 PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
90 @@ -111,7 +111,7 @@ RANLIB = @RANLIB@
91 RANLIB_STUB = @RANLIB_STUB@
92 SHLIB_CFLAGS = @SHLIB_CFLAGS@
93 SHLIB_LD = @SHLIB_LD@
94 -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
95 +SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lpng
96 STLIB_LD = @STLIB_LD@
97 TCL_DEFS = @TCL_DEFS@
98 TCL_BIN_DIR = @TCL_BIN_DIR@
99 diff --git a/libpng/pngtclDecls.h b/libpng/pngtclDecls.h
100 index 834bd23..259e069 100644
101 --- a/libpng/pngtclDecls.h
102 +++ b/libpng/pngtclDecls.h
103 @@ -16,7 +16,7 @@
104
105 #include "tcl.h"
106 #include "pngtclDeclsMask.h"
107 -#include "../compat/libpng/png.h"
108 +#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/png.h"
109 #include "pngtclDeclsUnmask.h"
110
111 /* !BEGIN!: Do not edit below this line. */
112 @@ -309,7 +309,7 @@ PNGTCLAPI void png_data_freer(png_structp png_ptr,
113 png_uint_32 mask);
114 /* 98 */
115 PNGTCLAPI png_voidp png_malloc_default(png_structp png_ptr,
116 - png_uint_32 size);
117 + png_alloc_size_t size);
118 /* 99 */
119 PNGTCLAPI void png_free_default(png_structp png_ptr, png_voidp ptr);
120 /* Slot 100 is reserved */
121 @@ -1067,10 +1067,10 @@ typedef struct PngtclStubs {
122 void (*png_read_endPtr) (png_structp png_ptr, png_infop info_ptr); /* 59 */
123 void (*png_destroy_info_structPtr) (png_structp png_ptr, png_infopp info_ptr_ptr); /* 60 */
124 void (*png_destroy_read_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); /* 61 */
125 - void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); /* 62 */
126 +/* void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); */ /* 62 */
127 void (*png_destroy_write_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr); /* 63 */
128 void *reserved64;
129 - void (*png_write_destroyPtr) (png_structp png_ptr); /* 65 */
130 +/* void (*png_write_destroyPtr) (png_structp png_ptr); */ /* 65 */
131 void (*png_set_crc_actionPtr) (png_structp png_ptr, int crit_action, int ancil_action); /* 66 */
132 void (*png_set_filterPtr) (png_structp png_ptr, int method, int filters); /* 67 */
133 void (*png_set_filter_heuristicsPtr) (png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs); /* 68 */
134 diff --git a/libpng/pngtclStubInit.c b/libpng/pngtclStubInit.c
135 index f8d2d9b..3309ee9 100644
136 --- a/libpng/pngtclStubInit.c
137 +++ b/libpng/pngtclStubInit.c
138 @@ -197,10 +197,10 @@ const PngtclStubs pngtclStubs = {
139 png_read_end, /* 59 */
140 png_destroy_info_struct, /* 60 */
141 png_destroy_read_struct, /* 61 */
142 - png_read_destroy, /* 62 */
143 +/* png_read_destroy, */ /* 62 */
144 png_destroy_write_struct, /* 63 */
145 NULL, /* 64 */
146 - png_write_destroy, /* 65 */
147 +/* png_write_destroy, */ /* 65 */
148 png_set_crc_action, /* 66 */
149 png_set_filter, /* 67 */
150 #if !defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) || !defined(PNG_FLOATING_POINT_SUPPORTED)
151 diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
152 index 4592093..e32f5d2 100644
153 --- a/libtiff/Makefile.in
154 +++ b/libtiff/Makefile.in
155 @@ -35,8 +35,8 @@
156
157 # tif_fax3sm is special. It is generated.
158
159 -PKG_SOURCES = @PKG_SOURCES@ tif_fax3sm.c
160 -PKG_OBJECTS = @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT)
161 +PKG_SOURCES = tifftcl.c tifftclStubInit.c
162 +PKG_OBJECTS = tifftcl.o tifftclStubInit.o
163
164 PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
165 PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
166 @@ -109,7 +109,7 @@ RANLIB = @RANLIB@
167 RANLIB_STUB = @RANLIB_STUB@
168 SHLIB_CFLAGS = @SHLIB_CFLAGS@
169 SHLIB_LD = @SHLIB_LD@
170 -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
171 +SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ltiff
172 STLIB_LD = @STLIB_LD@
173 TCL_DEFS = @TCL_DEFS@
174 TCL_BIN_DIR = @TCL_BIN_DIR@
175 diff --git a/libtiff/tifftclDecls.h b/libtiff/tifftclDecls.h
176 index b30485d..7dd700b 100644
177 --- a/libtiff/tifftclDecls.h
178 +++ b/libtiff/tifftclDecls.h
179 @@ -24,8 +24,9 @@
180 #undef INLINE
181
182 #include "tifftclDeclsMask.h"
183 -#include "../compat/libtiff/libtiff/tiffio.h"
184 #include "../compat/libtiff/libtiff/tiffiop.h"
185 +#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiff.h"
186 +#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h"
187 #include "../compat/libtiff/libtiff/tif_predict.h"
188 #include "tifftclDeclsUnmask.h"
189
190 diff --git a/tiff/tiff.c b/tiff/tiff.c
191 index a5d5949..826da9a 100644
192 --- a/tiff/tiff.c
193 +++ b/tiff/tiff.c
194 @@ -17,6 +17,7 @@
195 #include "tcl.h"
196 #include "tifftcl.h"
197 #include "zlibtcl.h"
198 +#include "init.c"
199
200 #ifdef HAVE_STDLIB_H
201 #undef HAVE_STDLIB_H
202 @@ -29,7 +30,6 @@ static int SetupTiffLibrary(Tcl_Interp *interp);
203 #define MORE_INITIALIZATION \
204 if (SetupTiffLibrary (interp) != TCL_OK) { return TCL_ERROR; }
205
206 -#include "init.c"
207
208 #include "tiffInt.h"
209
210 diff --git a/zlib/Makefile.in b/zlib/Makefile.in
211 index cb71481..eb51145 100644
212 --- a/zlib/Makefile.in
213 +++ b/zlib/Makefile.in
214 @@ -33,8 +33,8 @@
215 # $(srcdir) or in the generic, win or unix subdirectory.
216 #========================================================================
217
218 -PKG_SOURCES = @PKG_SOURCES@
219 -PKG_OBJECTS = @PKG_OBJECTS@
220 +PKG_SOURCES = zlibtcl.c zlibtclStubInit.c
221 +PKG_OBJECTS = zlibtcl.o zlibtclStubInit.o
222
223 PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
224 PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
225 @@ -107,7 +107,7 @@ RANLIB = @RANLIB@
226 RANLIB_STUB = @RANLIB_STUB@
227 SHLIB_CFLAGS = @SHLIB_CFLAGS@
228 SHLIB_LD = @SHLIB_LD@
229 -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
230 +SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lz
231 STLIB_LD = @STLIB_LD@
232 TCL_DEFS = @TCL_DEFS@
233 TCL_BIN_DIR = @TCL_BIN_DIR@
234 diff --git a/zlib/configure.in b/zlib/configure.in
235 index 292d3aa..bc045d6 100644
236 --- a/zlib/configure.in
237 +++ b/zlib/configure.in
238 @@ -51,17 +51,12 @@ TEA_SETUP_COMPILER
239 #-----------------------------------------------------------------------
240
241 TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c])
242 -TEA_ADD_SOURCES([../compat/zlib/adler32.c ../compat/zlib/compress.c ../compat/zlib/crc32.c])
243 -TEA_ADD_SOURCES([../compat/zlib/deflate.c ../compat/zlib/gzclose.c ../compat/zlib/gzlib.c])
244 -TEA_ADD_SOURCES([../compat/zlib/gzread.c ../compat/zlib/gzwrite.c ../compat/zlib/infback.c])
245 -TEA_ADD_SOURCES([../compat/zlib/inffast.c ../compat/zlib/inflate.c ../compat/zlib/inftrees.c])
246 -TEA_ADD_SOURCES([../compat/zlib/trees.c ../compat/zlib/uncompr.c ../compat/zlib/zutil.c])
247
248 TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h])
249 TEA_ADD_HEADERS([zlibtclDeclsMask.h zlibtclDeclsUnmask.h])
250
251 TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
252 -TEA_ADD_LIBS([])
253 +TEA_ADD_LIBS([-lz])
254 TEA_ADD_CFLAGS([])
255 TEA_ADD_STUB_SOURCES([zlibtclStubLib.c])
256 TEA_ADD_SOURCES([zlibtclStubLib.c])
257 diff --git a/zlib/zlibtclDecls.h b/zlib/zlibtclDecls.h
258 index c91496f..630abc7 100644
259 --- a/zlib/zlibtclDecls.h
260 +++ b/zlib/zlibtclDecls.h
261 @@ -16,7 +16,7 @@
262
263 #include "tcl.h"
264 #include "zlibtclDeclsMask.h"
265 -#include "../compat/zlib/zlib.h"
266 +#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h"
267 #include "zlibtclDeclsUnmask.h"
268
269 /* !BEGIN!: Do not edit below this line. */
Report Message
Find on MARC Find on Google Groups