Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > a53c89653a22e437c5f694ea42d962df > files > 3

pdftk-1.41-9mdv2010.0.src.rpm

diff -ur ../pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfDate.java ./java_libs/com/lowagie/text/pdf/PdfDate.java
--- ../pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfDate.java	2007-04-11 14:38:47.000000000 -0400
+++ ./java_libs/com/lowagie/text/pdf/PdfDate.java	2007-04-11 14:42:21.000000000 -0400
@@ -73,11 +73,6 @@
 
 public class PdfDate extends PdfString {
     
-    // 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 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 -ur ../pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfEncodings.java ./java_libs/com/lowagie/text/pdf/PdfEncodings.java
--- ../pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfEncodings.java	2007-04-11 14:38:46.000000000 -0400
+++ ./java_libs/com/lowagie/text/pdf/PdfEncodings.java	2007-04-11 14:42:26.000000000 -0400
@@ -62,9 +62,6 @@
  */
 public class PdfEncodings {
 
-    // ssteward
-    protected static Class c1= gnu.gcj.convert.Input_UnicodeBig.class;
-
     protected static final int CIDNONE = 0;
     protected static final int CIDRANGE = 1;
     protected static final int CIDCHAR = 2;
diff -ur ../pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfEncryption.java ./java_libs/com/lowagie/text/pdf/PdfEncryption.java
--- ../pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfEncryption.java	2007-04-11 14:38:47.000000000 -0400
+++ ./java_libs/com/lowagie/text/pdf/PdfEncryption.java	2007-04-11 14:43:02.000000000 -0400
@@ -50,7 +50,7 @@
 
 package com.lowagie.text.pdf;
 
-import java_local.security.MessageDigest; // ssteward
+import java.security.MessageDigest; // ssteward
 import com.lowagie.text.ExceptionConverter;
 
 /**
diff -ur ../pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/SimpleXMLParser.java ./java_libs/com/lowagie/text/pdf/SimpleXMLParser.java
--- ../pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/SimpleXMLParser.java	2007-04-11 14:38:47.000000000 -0400
+++ ./java_libs/com/lowagie/text/pdf/SimpleXMLParser.java	2007-04-11 14:42:34.000000000 -0400
@@ -71,12 +71,6 @@
  */
 public class SimpleXMLParser {
 
-    // ssteward
-    // Input_UTF8 was being omitted from Windows static builds
-    private static Class c1= gnu.gcj.convert.Input_UTF8.class;
-    private static Class c2= gnu.gcj.convert.Input_8859_1.class;
-    private static Class c3= gnu.gcj.convert.Input_ASCII.class;
-
     private static final HashMap fIANA2JavaMap = new HashMap();
     private static final HashMap entityMap = new HashMap();
     
diff -ur ../pdftk-1.41.orig/java_libs/Makefile ./java_libs/Makefile
--- ../pdftk-1.41.orig/java_libs/Makefile	2007-04-11 14:38:47.000000000 -0400
+++ ./java_libs/Makefile	2007-04-11 14:41:08.000000000 -0400
@@ -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 -ur ../pdftk-1.41.orig/pdftk/Makefile.Base ./pdftk/Makefile.Base
--- ../pdftk-1.41.orig/pdftk/Makefile.Base	2007-04-11 14:38:46.000000000 -0400
+++ ./pdftk/Makefile.Base	2007-04-11 14:40:16.000000000 -0400
@@ -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
 #
@@ -53,17 +41,17 @@
 java_libs :
 	$(MAKE) -C $(java_libs_root)
 
-attachments.o : attachments.cc attachments.h pdftk.h $(itext_libs) $(libgcj_local_libs)
+attachments.o : attachments.cc attachments.h pdftk.h $(itext_libs)
 	$(CXX) attachments.cc -I$(java_libs_root) $(CPPFLAGS) -c
 
-report.o : report.cc report.h pdftk.h $(itext_libs) $(libgcj_local_libs)
+report.o : report.cc report.h pdftk.h $(itext_libs)
 	$(CXX) report.cc -I$(java_libs_root) $(CPPFLAGS) -c
 
-pdftk.o : pdftk.cc pdftk.h attachments.h report.h $(itext_libs) $(libgcj_local_libs)
+pdftk.o : pdftk.cc pdftk.h attachments.h report.h $(itext_libs)
 	$(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
+pdftk : pdftk.o attachments.o report.o $(itext_libs) $(afm_objects)
+	$(CXX) pdftk.o attachments.o report.o $(itext_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) -o pdftk
 
 install:
 	/usr/bin/install pdftk /usr/local/bin