aboutsummaryrefslogtreecommitdiff
path: root/office/pdftk/pdftk-1.41-slackware64-13.patch
blob: d3edd2bff5734e90fb8a5c7c334ff861c494f055 (plain)
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
222
223
224
225
226
227
228
229
diff -u -r pdftk-1.41-orig/java_libs/com/lowagie/bc/asn1/Makefile pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile
--- pdftk-1.41-orig/java_libs/com/lowagie/bc/asn1/Makefile	2006-07-28 01:18:06.000000000 +0200
+++ pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile	2009-11-16 15:33:23.000000000 +0100
@@ -25,8 +25,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
diff -u -r pdftk-1.41-orig/java_libs/com/lowagie/text/Makefile pdftk-1.41/java_libs/com/lowagie/text/Makefile
--- pdftk-1.41-orig/java_libs/com/lowagie/text/Makefile	2006-07-26 23:14:34.000000000 +0200
+++ pdftk-1.41/java_libs/com/lowagie/text/Makefile	2009-11-16 15:33:23.000000000 +0100
@@ -25,13 +25,12 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
 
-all : $(library) $(headers)
+all : $(library) $(headers) $(classes)
 
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
diff -u -r pdftk-1.41-orig/java_libs/com/lowagie/text/markup/Makefile pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile
--- pdftk-1.41-orig/java_libs/com/lowagie/text/markup/Makefile	2006-07-26 23:14:54.000000000 +0200
+++ pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile	2009-11-16 15:33:23.000000000 +0100
@@ -25,8 +25,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
diff -u -r pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/codec/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile
--- pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/codec/Makefile	2006-07-26 23:15:20.000000000 +0200
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile	2009-11-16 15:37:55.000000000 +0100
@@ -25,8 +25,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
diff -u -r pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile
--- pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile	2006-07-28 01:21:06.000000000 +0200
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile	2009-11-16 15:38:15.000000000 +0100
@@ -25,8 +25,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
diff -u -r pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile
--- pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile	2006-07-26 23:15:32.000000000 +0200
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile	2009-11-16 15:38:34.000000000 +0100
@@ -25,8 +25,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
diff -u -r pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/fonts/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile
--- pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/fonts/Makefile	2006-07-26 23:15:48.000000000 +0200
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile	2009-11-16 15:33:23.000000000 +0100
@@ -34,8 +34,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
diff -u -r pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile
--- pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/Makefile	2006-07-26 23:15:10.000000000 +0200
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile	2009-11-16 15:33:23.000000000 +0100
@@ -25,8 +25,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
diff -u -r pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/PdfDate.java pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java
--- pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/PdfDate.java	2006-07-27 01:56:42.000000000 +0200
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java	2009-11-16 15:33:37.000000000 +0100
@@ -76,7 +76,7 @@
     // ssteward; static builds of pdftk (Windows, gcc 3.3.1) would
     // omit this class because of its reference by reflection;
     // this treatment ensures that ld will include it
-    private static Class c1= gnu.java.locale.Calendar.class;
+    private static Class c1= java.util.Calendar.class;
 
     private static final int dateSpace[] = {Calendar.YEAR, 4, 0, Calendar.MONTH, 2, -1, Calendar.DAY_OF_MONTH, 2, 0,
         Calendar.HOUR_OF_DAY, 2, 0, Calendar.MINUTE, 2, 0, Calendar.SECOND, 2, 0};
diff -u -r pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/PdfEncryption.java pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java
--- pdftk-1.41-orig/java_libs/com/lowagie/text/pdf/PdfEncryption.java	2006-07-27 02:02:28.000000000 +0200
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java	2009-11-16 15:46:10.000000000 +0100
@@ -50,7 +50,7 @@
 
 package com.lowagie.text.pdf;
 
-import java_local.security.MessageDigest; // ssteward
+import java.security.MessageDigest;
 import com.lowagie.text.ExceptionConverter;
 
 /**
diff -u -r pdftk-1.41-orig/java_libs/com/lowagie/text/xml/xmp/Makefile pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile
--- pdftk-1.41-orig/java_libs/com/lowagie/text/xml/xmp/Makefile	2006-07-27 02:53:34.000000000 +0200
+++ pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile	2009-11-16 15:33:23.000000000 +0100
@@ -25,8 +25,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
diff -u -r pdftk-1.41-orig/java_libs/Makefile pdftk-1.41/java_libs/Makefile
--- pdftk-1.41-orig/java_libs/Makefile	2006-08-29 08:44:26.000000000 +0200
+++ pdftk-1.41/java_libs/Makefile	2009-11-16 15:33:23.000000000 +0100
@@ -13,13 +13,7 @@
 # append gcj flags
 export GCJFLAGS+= --encoding=UTF-8 --classpath="$(java_libs_root)"
 
-all : libgcj_local itext
-
-libgcj_local :
-	$(MAKE) -C "$(java_libs_root)/gnu_local/java/security";
-	$(MAKE) -C "$(java_libs_root)/gnu_local/java/security/provider";
-	$(MAKE) -C "$(java_libs_root)/gnu/gcj/convert";
-	$(MAKE) -C "$(java_libs_root)/java_local/security";
+all : itext
 
 itext :
 	$(MAKE) -C "$(java_libs_root)/com/lowagie/text";
@@ -35,13 +29,7 @@
 	$(MAKE) -C "$(java_libs_root)/com/lowagie/bc/asn1";
 	$(MAKE) -C "$(java_libs_root)/com/lowagie/text/pdf/codec/postscript";
 
-clean : libgcj_local_clean itext_clean
-
-libgcj_local_clean :
-	$(MAKE) -iC "$(java_libs_root)/gnu_local/java/security" clean;
-	$(MAKE) -iC "$(java_libs_root)/gnu_local/java/security/provider" clean;
-	$(MAKE) -iC "$(java_libs_root)/gnu/gcj/convert" clean;
-	$(MAKE) -iC "$(java_libs_root)/java_local/security" clean;
+clean : itext_clean
 
 itext_clean :
 	$(MAKE) -iC "$(java_libs_root)/com/lowagie/text" clean;
diff -u -r pdftk-1.41-orig/pdftk/Makefile.Base pdftk-1.41/pdftk/Makefile.Base
--- pdftk-1.41-orig/pdftk/Makefile.Base	2006-10-25 01:44:06.000000000 +0200
+++ pdftk-1.41/pdftk/Makefile.Base	2009-11-16 15:36:00.000000000 +0100
@@ -31,18 +31,6 @@
 afms= $(wildcard $(java_libs_root)/com/lowagie/text/pdf/fonts/*.afm)
 afm_objects= $(patsubst %.afm, %.o, $(afms))
 
-# older versions of libgcj might not have the MD5 algorithm,
-# so I added it here; these *_local java files were grabbed from
-# libgcj CVS on March 7, 2004; diffed September 5, 2006 w/ gcc 4.1.1
-#
-# gnu/gcj/convert/Input_UnicodeBig.java was grabbed March 26, 2004; diffed September 5, 2006 w/ gcc 4.1.1
-#
-libgcj_local_libs = \
-$(java_libs_root)/java_local/security/security.a \
-$(java_libs_root)/gnu_local/java/security/provider/provider.a \
-$(java_libs_root)/gnu_local/java/security/security.a \
-$(java_libs_root)/gnu/gcj/convert/convert.a
-
 # this must already be set according to your platform Makefile;
 # we're just appending to it, here
 #
@@ -63,10 +51,10 @@
 	$(CXX) pdftk.cc -I$(java_libs_root) $(CPPFLAGS) -c
 
 pdftk : pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects)
-	$(CXX) pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) -o pdftk
+	$(CXX) pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o pdftk
 
 install:
-	/usr/bin/install pdftk /usr/local/bin 
+	/usr/bin/install pdftk $(DESTDIR)$(PREFIX)/bin 
 
 uninstall:
 	rm -vf /usr/local/bin/pdftk
diff -u -r pdftk-1.41-orig/pdftk/Makefile.Generic pdftk-1.41/pdftk/Makefile.Generic
--- pdftk-1.41-orig/pdftk/Makefile.Generic	2006-09-21 19:37:12.000000000 +0200
+++ pdftk-1.41/pdftk/Makefile.Generic	2009-11-16 15:35:27.000000000 +0100
@@ -10,6 +10,10 @@
 #   Clean:               make -f Makefile.Generic clean
 # 	 								
 
+# prefixes and destination dir for packaging
+PREFIX= /usr/local
+DESTDIR=
+
 # tools
 TOOLPATH=
 VERSUFF=