| 1 |
caster 08/12/26 21:44:37 |
| 2 |
|
| 3 |
Added: pdftk-1.41-honor-ldflags.patch |
| 4 |
pdftk-1.41-gcc-4.3.patch |
| 5 |
Log: |
| 6 |
Revbump fixing build with gcc 4.3 (bug #225709 and #235645 and #251796) thanks to patch adapted from Debian submitted by <andrex@××××.ee>. Fixes LDFLAGS and man page (bug #209802 and #234832) thanks to Stephan Springer <Gentoo-bugs@××××.de>. Uses EAPI2 use deps for gcc[gcj] dep. |
| 7 |
(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r1-perfctr x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: pdftk-1.41-honor-ldflags.patch |
| 16 |
=================================================================== |
| 17 |
--- pdftk-1.41/pdftk/Makefile.Base.orig 2006-10-25 01:44:06.000000000 +0200 |
| 18 |
+++ pdftk-1.41/pdftk/Makefile.Base 2008-08-15 17:21:18.073275624 +0200 |
| 19 |
@@ -63,7 +63,7 @@ |
| 20 |
$(CXX) pdftk.cc -I$(java_libs_root) $(CPPFLAGS) -c |
| 21 |
|
| 22 |
pdftk : pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) |
| 23 |
- $(CXX) pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) -o pdftk |
| 24 |
+ $(CXX) pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o pdftk |
| 25 |
|
| 26 |
install: |
| 27 |
/usr/bin/install pdftk /usr/local/bin |
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
1.1 app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch |
| 32 |
|
| 33 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch?rev=1.1&view=markup |
| 34 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch?rev=1.1&content-type=text/plain |
| 35 |
|
| 36 |
Index: pdftk-1.41-gcc-4.3.patch |
| 37 |
=================================================================== |
| 38 |
# posted to bug #251796 by <andrex@××××.ee> from Debian patches |
| 39 |
diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/bc/asn1/Makefile pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile |
| 40 |
--- pdftk-1.41.orig/java_libs/com/lowagie/bc/asn1/Makefile 2008-12-22 23:43:29.000000000 +0200 |
| 41 |
+++ pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile 2008-12-23 00:04:52.000000000 +0200 |
| 42 |
@@ -25,8 +25,7 @@ |
| 43 |
# the "$*" automatic variable, here |
| 44 |
# |
| 45 |
%.h : %.class |
| 46 |
- $(GCJH) --classpath="." $*; |
| 47 |
- $(RM) $< |
| 48 |
+ $(GCJH) --classpath="$(java_libs_root):." $*; |
| 49 |
|
| 50 |
## |
| 51 |
# targets |
| 52 |
diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/Makefile pdftk-1.41/java_libs/com/lowagie/text/Makefile |
| 53 |
--- pdftk-1.41.orig/java_libs/com/lowagie/text/Makefile 2008-12-22 23:43:29.000000000 +0200 |
| 54 |
+++ pdftk-1.41/java_libs/com/lowagie/text/Makefile 2008-12-22 23:58:52.000000000 +0200 |
| 55 |
@@ -25,13 +25,12 @@ |
| 56 |
# the "$*" automatic variable, here |
| 57 |
# |
| 58 |
%.h : %.class |
| 59 |
- $(GCJH) --classpath="." $*; |
| 60 |
- $(RM) $< |
| 61 |
+ $(GCJH) --classpath="$(java_libs_root):." $*; |
| 62 |
|
| 63 |
## |
| 64 |
# targets |
| 65 |
|
| 66 |
-all : $(library) $(headers) |
| 67 |
+all : $(library) $(headers) $(classes) |
| 68 |
|
| 69 |
$(library) : $(objects) |
| 70 |
$(AR) $(ARFLAGS) $(library) $(objects); |
| 71 |
diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/markup/Makefile pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile |
| 72 |
--- pdftk-1.41.orig/java_libs/com/lowagie/text/markup/Makefile 2008-12-22 23:43:29.000000000 +0200 |
| 73 |
+++ pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile 2008-12-23 00:04:28.000000000 +0200 |
| 74 |
@@ -25,8 +25,7 @@ |
| 75 |
# the "$*" automatic variable, here |
| 76 |
# |
| 77 |
%.h : %.class |
| 78 |
- $(GCJH) --classpath="." $*; |
| 79 |
- $(RM) $< |
| 80 |
+ $(GCJH) --classpath="$(java_libs_root):." $*; |
| 81 |
|
| 82 |
## |
| 83 |
# targets |
| 84 |
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 |
| 85 |
--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/Makefile 2008-12-22 23:43:29.000000000 +0200 |
| 86 |
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile 2008-12-23 00:04:11.000000000 +0200 |
| 87 |
@@ -25,8 +25,7 @@ |
| 88 |
# the "$*" automatic variable, here |
| 89 |
# |
| 90 |
%.h : %.class |
| 91 |
- $(GCJH) --classpath="." $*; |
| 92 |
- $(RM) $< |
| 93 |
+ $(GCJH) --classpath="$(java_libs_root):." $*; |
| 94 |
|
| 95 |
## |
| 96 |
# targets |
| 97 |
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 |
| 98 |
--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile 2008-12-22 23:43:29.000000000 +0200 |
| 99 |
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile 2008-12-23 00:03:05.000000000 +0200 |
| 100 |
@@ -25,8 +25,7 @@ |
| 101 |
# the "$*" automatic variable, here |
| 102 |
# |
| 103 |
%.h : %.class |
| 104 |
- $(GCJH) --classpath="." $*; |
| 105 |
- $(RM) $< |
| 106 |
+ $(GCJH) --classpath="$(java_libs_root):." $*; |
| 107 |
|
| 108 |
## |
| 109 |
# targets |
| 110 |
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 |
| 111 |
--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile 2008-12-22 23:43:29.000000000 +0200 |
| 112 |
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile 2008-12-23 00:03:29.000000000 +0200 |
| 113 |
@@ -25,8 +25,7 @@ |
| 114 |
# the "$*" automatic variable, here |
| 115 |
# |
| 116 |
%.h : %.class |
| 117 |
- $(GCJH) --classpath="." $*; |
| 118 |
- $(RM) $< |
| 119 |
+ $(GCJH) --classpath="$(java_libs_root):." $*; |
| 120 |
|
| 121 |
## |
| 122 |
# targets |
| 123 |
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 |
| 124 |
--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/fonts/Makefile 2008-12-22 23:43:29.000000000 +0200 |
| 125 |
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile 2008-12-23 00:01:33.000000000 +0200 |
| 126 |
@@ -34,8 +34,7 @@ |
| 127 |
# the "$*" automatic variable, here |
| 128 |
# |
| 129 |
%.h : %.class |
| 130 |
- $(GCJH) --classpath="." $*; |
| 131 |
- $(RM) $< |
| 132 |
+ $(GCJH) --classpath="$(java_libs_root):." $*; |
| 133 |
|
| 134 |
## |
| 135 |
# targets |
| 136 |
diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile |
| 137 |
--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/Makefile 2008-12-22 23:43:29.000000000 +0200 |
| 138 |
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile 2008-12-23 00:00:25.000000000 +0200 |
| 139 |
@@ -25,8 +25,7 @@ |
| 140 |
# the "$*" automatic variable, here |
| 141 |
# |
| 142 |
%.h : %.class |
| 143 |
- $(GCJH) --classpath="." $*; |
| 144 |
- $(RM) $< |
| 145 |
+ $(GCJH) --classpath="$(java_libs_root):." $*; |
| 146 |
|
| 147 |
## |
| 148 |
# targets |
| 149 |
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 |
| 150 |
--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfEncryption.java 2008-12-22 23:43:29.000000000 +0200 |
| 151 |
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java 2008-12-22 23:46:21.000000000 +0200 |
| 152 |
@@ -50,7 +50,7 @@ |
| 153 |
|
| 154 |
package com.lowagie.text.pdf; |
| 155 |
|
| 156 |
-import java_local.security.MessageDigest; // ssteward |
| 157 |
+import java.security.MessageDigest; |
| 158 |
import com.lowagie.text.ExceptionConverter; |
| 159 |
|
| 160 |
/** |
| 161 |
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 |
| 162 |
--- pdftk-1.41.orig/java_libs/com/lowagie/text/xml/xmp/Makefile 2008-12-22 23:43:29.000000000 +0200 |
| 163 |
+++ pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile 2008-12-22 23:59:42.000000000 +0200 |
| 164 |
@@ -25,8 +25,7 @@ |
| 165 |
# the "$*" automatic variable, here |
| 166 |
# |
| 167 |
%.h : %.class |
| 168 |
- $(GCJH) --classpath="." $*; |
| 169 |
- $(RM) $< |
| 170 |
+ $(GCJH) --classpath="$(java_libs_root):." $*; |
| 171 |
|
| 172 |
## |
| 173 |
# targets |
| 174 |
diff -u -r pdftk-1.41.orig/java_libs/Makefile pdftk-1.41/java_libs/Makefile |
| 175 |
--- pdftk-1.41.orig/java_libs/Makefile 2008-12-22 23:43:29.000000000 +0200 |
| 176 |
+++ pdftk-1.41/java_libs/Makefile 2008-12-22 23:47:10.000000000 +0200 |
| 177 |
@@ -13,13 +13,7 @@ |
| 178 |
# append gcj flags |
| 179 |
export GCJFLAGS+= --encoding=UTF-8 --classpath="$(java_libs_root)" |
| 180 |
|
| 181 |
-all : libgcj_local itext |
| 182 |
- |
| 183 |
-libgcj_local : |
| 184 |
- $(MAKE) -C "$(java_libs_root)/gnu_local/java/security"; |
| 185 |
- $(MAKE) -C "$(java_libs_root)/gnu_local/java/security/provider"; |
| 186 |
- $(MAKE) -C "$(java_libs_root)/gnu/gcj/convert"; |
| 187 |
- $(MAKE) -C "$(java_libs_root)/java_local/security"; |
| 188 |
+all : itext |
| 189 |
|
| 190 |
itext : |
| 191 |
$(MAKE) -C "$(java_libs_root)/com/lowagie/text"; |
| 192 |
@@ -35,13 +29,7 @@ |
| 193 |
$(MAKE) -C "$(java_libs_root)/com/lowagie/bc/asn1"; |
| 194 |
$(MAKE) -C "$(java_libs_root)/com/lowagie/text/pdf/codec/postscript"; |
| 195 |
|
| 196 |
-clean : libgcj_local_clean itext_clean |
| 197 |
- |
| 198 |
-libgcj_local_clean : |
| 199 |
- $(MAKE) -iC "$(java_libs_root)/gnu_local/java/security" clean; |
| 200 |
- $(MAKE) -iC "$(java_libs_root)/gnu_local/java/security/provider" clean; |
| 201 |
- $(MAKE) -iC "$(java_libs_root)/gnu/gcj/convert" clean; |
| 202 |
- $(MAKE) -iC "$(java_libs_root)/java_local/security" clean; |
| 203 |
+clean : itext_clean |
| 204 |
|
| 205 |
itext_clean : |
| 206 |
$(MAKE) -iC "$(java_libs_root)/com/lowagie/text" clean; |
| 207 |
diff -u -r pdftk-1.41.orig/pdftk/Makefile.Base pdftk-1.41/pdftk/Makefile.Base |
| 208 |
--- pdftk-1.41.orig/pdftk/Makefile.Base 2008-12-22 23:43:29.000000000 +0200 |
| 209 |
+++ pdftk-1.41/pdftk/Makefile.Base 2008-12-22 23:44:33.000000000 +0200 |
| 210 |
@@ -31,18 +31,6 @@ |
| 211 |
afms= $(wildcard $(java_libs_root)/com/lowagie/text/pdf/fonts/*.afm) |
| 212 |
afm_objects= $(patsubst %.afm, %.o, $(afms)) |
| 213 |
|
| 214 |
-# older versions of libgcj might not have the MD5 algorithm, |
| 215 |
-# so I added it here; these *_local java files were grabbed from |
| 216 |
-# libgcj CVS on March 7, 2004; diffed September 5, 2006 w/ gcc 4.1.1 |
| 217 |
-# |
| 218 |
-# gnu/gcj/convert/Input_UnicodeBig.java was grabbed March 26, 2004; diffed September 5, 2006 w/ gcc 4.1.1 |
| 219 |
-# |
| 220 |
-libgcj_local_libs = \ |
| 221 |
-$(java_libs_root)/java_local/security/security.a \ |
| 222 |
-$(java_libs_root)/gnu_local/java/security/provider/provider.a \ |
| 223 |
-$(java_libs_root)/gnu_local/java/security/security.a \ |
| 224 |
-$(java_libs_root)/gnu/gcj/convert/convert.a |
| 225 |
- |
| 226 |
# this must already be set according to your platform Makefile; |
| 227 |
# we're just appending to it, here |
| 228 |
# |
| 229 |
diff -u -r pdftk-1.41.orig/pdftk/Makefile.Generic pdftk-1.41/pdftk/Makefile.Generic |
| 230 |
--- pdftk-1.41.orig/pdftk/Makefile.Generic 2008-12-22 23:43:29.000000000 +0200 |
| 231 |
+++ pdftk-1.41/pdftk/Makefile.Generic 2008-12-23 00:06:24.000000000 +0200 |
| 232 |
@@ -28,7 +28,7 @@ |
| 233 |
|
| 234 |
# itext compiler flags |
| 235 |
# -O3 might cause pdftk to segfault on cat operation (gcc 3.4.4) |
| 236 |
-export GCJFLAGS= -O2 |
| 237 |
+export GCJFLAGS= -O2 -w |
| 238 |
|
| 239 |
# |
| 240 |
export ARFLAGS= rs |
Archives