[Erp5-report] r44725 luke - /erp5/trunk/patches/
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 29 14:30:22 CEST 2011
Author: luke
Date: Tue Mar 29 14:30:22 2011
New Revision: 44725
URL: http://svn.erp5.org?rev=44725&view=rev
Log:
- remove outdated patches
Removed:
erp5/trunk/patches/pdftk-1.41-gcc-4.4.patch
erp5/trunk/patches/pdftk-Makefile.Base.DEST.patch
erp5/trunk/patches/pdftk-Makefile.RedHat.additional.includes.patch
erp5/trunk/patches/pdftk-Makefiles.patch
erp5/trunk/patches/pdftk-bug-427046_pdftk.cc.patch
erp5/trunk/patches/pdftk-no_gnu_local.patch
erp5/trunk/patches/pdftk-remove-postscript.patch
Removed: erp5/trunk/patches/pdftk-1.41-gcc-4.4.patch
URL: http://svn.erp5.org/erp5/trunk/patches/pdftk-1.41-gcc-4.4.patch?rev=44724&view=auto
==============================================================================
--- erp5/trunk/patches/pdftk-1.41-gcc-4.4.patch [utf8] (original)
+++ erp5/trunk/patches/pdftk-1.41-gcc-4.4.patch (removed)
@@ -1,19 +0,0 @@
-Took from http://bugs.gentoo.org/show_bug.cgi?id=269312
-Reformatted for easier patching.
-
-diff -NrU5 java_libs/com/lowagie/text/pdf/PdfDate.java pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java
---- java_libs/com/lowagie/text/pdf/PdfDate.java 2009-05-18 20:49:13.000000000 -0600
-+++ java_libs/com/lowagie/text/pdf/PdfDate.java 2009-05-18 20:51:36.000000000 -0600
-@@ -74,11 +74,11 @@
- 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 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};
-
- // constructors
Removed: erp5/trunk/patches/pdftk-Makefile.Base.DEST.patch
URL: http://svn.erp5.org/erp5/trunk/patches/pdftk-Makefile.Base.DEST.patch?rev=44724&view=auto
==============================================================================
--- erp5/trunk/patches/pdftk-Makefile.Base.DEST.patch [utf8] (original)
+++ erp5/trunk/patches/pdftk-Makefile.Base.DEST.patch (removed)
@@ -1,12 +0,0 @@
---- pdftk/Makefile.Base.orig 2010-09-30 00:46:54.051606541 +0200
-+++ pdftk/Makefile.Base 2010-09-30 00:51:06.887356676 +0200
-@@ -55,7 +55,8 @@
- $(CXX) pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) -o pdftk
-
- install:
-- /usr/bin/install pdftk /usr/local/bin
-+ mkdir -p ${DEST}/bin
-+ /usr/bin/install pdftk ${DEST}/bin
-
- uninstall:
- rm -vf /usr/local/bin/pdftk
Removed: erp5/trunk/patches/pdftk-Makefile.RedHat.additional.includes.patch
URL: http://svn.erp5.org/erp5/trunk/patches/pdftk-Makefile.RedHat.additional.includes.patch?rev=44724&view=auto
==============================================================================
--- erp5/trunk/patches/pdftk-Makefile.RedHat.additional.includes.patch [utf8] (original)
+++ erp5/trunk/patches/pdftk-Makefile.RedHat.additional.includes.patch (removed)
@@ -1,11 +0,0 @@
---- /home/luke/work/P-SAFI/pdftk/pdftk-1.41/pdftk/Makefile.RedHat 2006-09-21 19:37:38.000000000 +0200
-+++ pdftk/Makefile.RedHat 2010-10-01 14:50:10.000000000 +0200
-@@ -26,7 +26,7 @@
- # if you want pdftk to ask before overwriting a file, set
- # ASK_ABOUT_WARNINGS to true; otherwise: false; override this default
- # with the dont_ask or do_ask command-line options
--CPPFLAGS= -O2 -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -fdollars-in-identifiers
-+CPPFLAGS= -O2 -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -fdollars-in-identifiers -I/usr/include/libgcj-4.4.3/
- CXXFLAGS= -lgcj
-
- # itext compiler flags
Removed: erp5/trunk/patches/pdftk-Makefiles.patch
URL: http://svn.erp5.org/erp5/trunk/patches/pdftk-Makefiles.patch?rev=44724&view=auto
==============================================================================
--- erp5/trunk/patches/pdftk-Makefiles.patch [utf8] (original)
+++ erp5/trunk/patches/pdftk-Makefiles.patch (removed)
@@ -1,29 +0,0 @@
---- java_libs/Makefile.orig 2007-08-17 10:31:29.000000000 +0200
-+++ java_libs/Makefile 2007-08-17 10:17:09.000000000 +0200
-@@ -33,7 +33,7 @@
- $(MAKE) -C "$(java_libs_root)/com/lowagie/text/pdf/fonts";
- $(MAKE) -C "$(java_libs_root)/com/lowagie/text/xml/xmp";
- $(MAKE) -C "$(java_libs_root)/com/lowagie/bc/asn1";
-- $(MAKE) -C "$(java_libs_root)/com/lowagie/text/pdf/codec/postscript";
-+# $(MAKE) -C "$(java_libs_root)/com/lowagie/text/pdf/codec/postscript";
-
- clean : libgcj_local_clean itext_clean
-
-@@ -55,4 +55,4 @@
- $(MAKE) -iC "$(java_libs_root)/com/lowagie/text/pdf/fonts" clean;
- $(MAKE) -iC "$(java_libs_root)/com/lowagie/text/xml/xmp" clean;
- $(MAKE) -iC "$(java_libs_root)/com/lowagie/bc/asn1" clean;
-- $(MAKE) -iC "$(java_libs_root)/com/lowagie/text/pdf/codec/postscript" clean;
-+# $(MAKE) -iC "$(java_libs_root)/com/lowagie/text/pdf/codec/postscript" clean;
---- pdftk/Makefile.Base.orig 2007-08-17 10:33:21.000000000 +0200
-+++ pdftk/Makefile.Base 2007-08-17 10:15:57.000000000 +0200
-@@ -25,7 +25,8 @@
- $(java_libs_root)/com/lowagie/text/markup/markup.a \
- $(java_libs_root)/com/lowagie/text/xml/xmp/xmp.a \
- $(java_libs_root)/com/lowagie/bc/asn1/asn1.a \
--$(java_libs_root)/com/lowagie/text/pdf/codec/postscript/postscript.a \
-+
-+# $(java_libs_root)/com/lowagie/text/pdf/codec/postscript/postscript.a \
-
- # font metric files, included as resources
- afms= $(wildcard $(java_libs_root)/com/lowagie/text/pdf/fonts/*.afm)
Removed: erp5/trunk/patches/pdftk-bug-427046_pdftk.cc.patch
URL: http://svn.erp5.org/erp5/trunk/patches/pdftk-bug-427046_pdftk.cc.patch?rev=44724&view=auto
==============================================================================
--- erp5/trunk/patches/pdftk-bug-427046_pdftk.cc.patch [utf8] (original)
+++ erp5/trunk/patches/pdftk-bug-427046_pdftk.cc.patch (removed)
@@ -1,24 +0,0 @@
----
- pdftk/pdftk.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/pdftk/pdftk.cc
-+++ b/pdftk/pdftk.cc
-@@ -71,6 +71,8 @@
- #include "com/lowagie/text/pdf/PdfIndirectObject.h"
- #include "com/lowagie/text/pdf/PdfFileSpecification.h"
- #include "com/lowagie/text/pdf/PdfBoolean.h"
-+#include "com/lowagie/text/pdf/PdfEncodings.h"
-+#include "com/lowagie/text/pdf/BaseFont.h"
-
- #include "com/lowagie/text/pdf/RandomAccessFileOrArray.h" // for InputStreamToArray()
-
-@@ -2672,6 +2674,8 @@ int main(int argc, char** argv)
- JvInitClass(&itext::PdfDictionary::class$);
- JvInitClass(&itext::PdfOutline::class$);
- JvInitClass(&itext::PdfBoolean::class$);
-+ JvInitClass(&itext::PdfEncodings::class$);
-+ JvInitClass(&itext::BaseFont::class$);
-
- TK_Session tk_session( argc, argv );
-
Removed: erp5/trunk/patches/pdftk-no_gnu_local.patch
URL: http://svn.erp5.org/erp5/trunk/patches/pdftk-no_gnu_local.patch?rev=44724&view=auto
==============================================================================
--- erp5/trunk/patches/pdftk-no_gnu_local.patch [utf8] (original)
+++ erp5/trunk/patches/pdftk-no_gnu_local.patch (removed)
@@ -1,177 +0,0 @@
---- java_libs/Makefile
-+++ java_libs/Makefile
-@@ -11,15 +11,9 @@
- java_libs_root= $(CURDIR)
-
- # append gcj flags
--export GCJFLAGS+= --encoding=UTF-8 --classpath="$(java_libs_root)"
-+export GCJFLAGS+= --encoding=UTF-8 --classpath="/usr/share/java/libgcj-4.3.jar:$(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;
---- java_libs/com/lowagie/bc/asn1/Makefile
-+++ java_libs/com/lowagie/bc/asn1/Makefile
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
-- $(GCJH) --classpath="." $*;
-- $(RM) $<
-+ $(GCJH) --classpath="/usr/share/java/libgcj-4.3.jar:$(PWD):." $*;
-
- ##
- # targets
---- java_libs/com/lowagie/text/Makefile
-+++ java_libs/com/lowagie/text/Makefile
-@@ -25,14 +25,15 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
-- $(GCJH) --classpath="." $*;
-- $(RM) $<
-+ $(GCJH) --classpath="/usr/share/java/libgcj-4.3.jar:$(PWD):." $*;
-
- ##
- # targets
-
- all : $(library) $(headers)
-
-+$(classes): $(sources)
-+
- $(library) : $(objects)
- $(AR) $(ARFLAGS) $(library) $(objects);
-
---- java_libs/com/lowagie/text/markup/Makefile
-+++ java_libs/com/lowagie/text/markup/Makefile
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
-- $(GCJH) --classpath="." $*;
-- $(RM) $<
-+ $(GCJH) --classpath="/usr/share/java/libgcj-4.3.jar:$(PWD):." $*;
-
- ##
- # targets
---- java_libs/com/lowagie/text/pdf/Makefile
-+++ java_libs/com/lowagie/text/pdf/Makefile
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
-- $(GCJH) --classpath="." $*;
-- $(RM) $<
-+ $(GCJH) --classpath="/usr/share/java/libgcj-4.3.jar:$(PWD):." $*;
-
- ##
- # targets
-@@ -37,4 +36,4 @@
- $(AR) $(ARFLAGS) $(library) $(objects);
-
- clean :
-- $(RM) $(RMFLAGS) *.o *.h *.class *.a
-+ $(RM) $(RMFLAGS) *.o *.h *.class *.a hyphenation/*.class
---- java_libs/com/lowagie/text/pdf/PdfEncryption.java
-+++ java_libs/com/lowagie/text/pdf/PdfEncryption.java
-@@ -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;
-
- /**
---- java_libs/com/lowagie/text/pdf/codec/Makefile
-+++ java_libs/com/lowagie/text/pdf/codec/Makefile
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
-- $(GCJH) --classpath="." $*;
-- $(RM) $<
-+ $(GCJH) --classpath="/usr/share/java/libgcj-4.3.jar:$(PWD):." $*;
-
- ##
- # targets
---- java_libs/com/lowagie/text/pdf/codec/wmf/Makefile
-+++ java_libs/com/lowagie/text/pdf/codec/wmf/Makefile
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
-- $(GCJH) --classpath="." $*;
-- $(RM) $<
-+ $(GCJH) --classpath="/usr/share/java/libgcj-4.3.jar:$(PWD):." $*;
-
- ##
- # targets
---- java_libs/com/lowagie/text/pdf/fonts/Makefile
-+++ java_libs/com/lowagie/text/pdf/fonts/Makefile
-@@ -34,8 +34,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
-- $(GCJH) --classpath="." $*;
-- $(RM) $<
-+ $(GCJH) --classpath="/usr/share/java/libgcj-4.3.jar:$(PWD):." $*;
-
- ##
- # targets
---- java_libs/com/lowagie/text/xml/xmp/Makefile
-+++ java_libs/com/lowagie/text/xml/xmp/Makefile
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
-- $(GCJH) --classpath="." $*;
-- $(RM) $<
-+ $(GCJH) --classpath="/usr/share/java/libgcj-4.3.jar:$(PWD):." $*;
-
- ##
- # targets
---- pdftk/Makefile.Base
-+++ pdftk/Makefile.Base
-@@ -32,18 +32,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
- #
Removed: erp5/trunk/patches/pdftk-remove-postscript.patch
URL: http://svn.erp5.org/erp5/trunk/patches/pdftk-remove-postscript.patch?rev=44724&view=auto
==============================================================================
--- erp5/trunk/patches/pdftk-remove-postscript.patch [utf8] (original)
+++ erp5/trunk/patches/pdftk-remove-postscript.patch (removed)
@@ -1,46 +0,0 @@
---- java_libs/com/lowagie/text/ImgPostscript.java
-+++ java_libs/com/lowagie/text/ImgPostscript.java
-@@ -53,7 +53,6 @@
- import java.io.*;
- import java.net.*;
- import com.lowagie.text.pdf.*;
--import com.lowagie.text.pdf.codec.postscript.*;
- import java.util.StringTokenizer;
-
- /**
-@@ -194,7 +193,7 @@
- * @throws IOException on error
- * @throws DocumentException on error
- */
-- public void readPostscript(PdfTemplate template) throws IOException,
-+/* public void readPostscript(PdfTemplate template) throws IOException,
- DocumentException {
- setTemplateData(template);
- template.setWidth(width());
-@@ -215,5 +214,5 @@
- is.close();
- }
- }
-- }
-+ } */
- }
---- java_libs/com/lowagie/text/pdf/PdfWriter.java
-+++ java_libs/com/lowagie/text/pdf/PdfWriter.java
-@@ -947,7 +947,7 @@
- catch (Exception e) {
- throw new DocumentException(e);
- }
-- }else{
-+ } /* else{
- try {
- ((ImgPostscript)image).readPostscript(getDirectContent().createTemplate(0, 0));
- }
-@@ -955,7 +955,7 @@
- throw new DocumentException(e);
- }
-
-- }
-+ } */
- }
- }
- else {
More information about the Erp5-report
mailing list