1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
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. */
|
GitWeb