Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18177
Modified Files:
fop.info fop.patch
Log Message:
I give up, fop back to 0.20.5, I had to patch a few things to make it build on
newer JDKs
Index: fop.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/fop.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- fop.info 30 Jan 2010 21:38:04 -0000 1.12
+++ fop.info 4 Feb 2010 03:07:09 -0000 1.13
@@ -1,76 +1,58 @@
Package: fop
-Version: 0.95
-Revision: 1
-Source: mirror:apache:/xmlgraphics/%n/binaries/%n-%v-bin.tar.gz
-Source-MD5: 7af50bf58924dd22d71d22d8ad90b268
+Version: 0.20.5
+Epoch: 1
+Revision: 12
+Source: mirror:apache:/xml/%n/%n-%v-src.tar.gz
+Source-MD5: 1a31eb1357e5d4b8d32d4cb3edae2da2
SourceDirectory: %n-%v
Type: java (1.5)
Depends: system-java (>= 1.5-1)
BuildDepends: fink (>= 0.24.12-1), system-java-dev (>= 1.5-1)
PatchFile: %n.patch
-Patchfile-MD5: 7bc8df4ea1bcf48c02f58977f4e11565
-PatchScript: sed 's|@FINKPREFIX@|%p|g' < %{PatchFile} | patch -p1
-CompileScript: echo "none needed"
+Patchfile-MD5: 201713e3bafc1fc9829cf1450c74909a
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+ perl -pi -e 's,<javac,<javac target="1.5" source="1.4",g' build.xml
+<<
+CompileScript: <<
+ ./build.sh
+ rm -f lib/ant*.jar
+<<
+JarFiles: build/fop.jar lib/*.jar
InstallScript: <<
-#!/bin/sh -ev
-
- # $FOP_HOME
- install -d -m 755 %i/share/%N
- mv build conf fop lib %i/share/%N/
- install -d -m 755 %i/etc
- cat <<END >%i/etc/fop.conf
-FOP_HOME="%p/share/fop"
-export FOP_HOME
-END
-
- # documentation
- install -d -m 755 %i/share/doc/%N
- mv docs examples javadocs %i/share/doc/%N/
-
- # binaries
- install -d -m 755 %i/bin
- cat <<END >%i/bin/fop
-#!/bin/sh
-. %p/share/%N/fop
-END
-
- cat <<END >%i/bin/fop_pfmreader
-#!/bin/sh
-MAIN_CLASS=org.apache.fop.fonts.apps.PFMReader
-. %p/share/%N/fop
-END
-
- cat <<END >%i/bin/fop_ttfreader
-#!/bin/sh
-MAIN_CLASS=org.apache.fop.fonts.apps.TTFReader
-. %p/share/%N/fop
-END
-
- cat <<END >%i/bin/xalan
-#!/bin/sh
-MAIN_CLASS=org.apache.xalan.xslt.Process
-. %p/share/%N/fop
-END
-
- chmod 755 %i/bin/*
-
+ mkdir -p %i/bin
+ install -m 0755 fop.sh %i/bin/fop
+ install -m 0755 fop_pfmreader.sh %i/bin/fop_pfmreader
+ install -m 0755 fop_ttfreader.sh %i/bin/fop_ttfreader
+ install -m 0755 xalan.sh %i/bin/xalan
+ mkdir -p %i/share/doc/%n/xslfoRef
+ cp -r docs/* %i/share/doc/%n/xslfoRef/
+ cp -r build/site/* %i/share/doc/%n/
<<
-ConfFiles: %p/etc/fop.conf
-DocFiles: KEYS LICENSE NOTICE README status.xml
+DocFiles: CHANGES LICENSE README ReleaseNotes.html STATUS
Description: Formatting Objects (FO) Processor
DescDetail: <<
FOP (Formatting Objects Processor) is the world's first print formatter driven
by XSL formatting objects and the world's first output independent formatter.
-
+.
It is a Java application that reads a formatting object tree and then renders
the resulting pages to a specified output. Output formats currently supported
are PDF, PCL, PS, SVG, XML (area tree representation), Print, AWT, MIF and
TXT.
<<
+DescUsage: <<
+See the documentation in %p/share/doc/fop.
+You may want to install beforehand batik, xml-commons-resolver if
+you plan to use them.
+Also fop-offo may be useful.
+<<
DescPort: <<
Previous maintainers Thomas Kotzian and Michele Garoche
Changed all references to java-home in patch to specific java 1.4.2 version
Added xalan script to allow debugging xsl-fo step results.
+Modified by Benjamin Reed <rangerr...@users.sourceforge.net>
+Changed <javac> ant call to force source="1.4" to be sure the bytecode
+is generated properly.
<<
-Maintainer: Benjamin Reed <f...@fink.raccoonfink.com>
+Maintainer: None <fink-de...@lists.sourceforge.net>
License: BSD
Homepage: http://xmlgraphics.apache.org/fop/
Index: fop.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/fop.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fop.patch 30 Jan 2010 21:38:04 -0000 1.6
+++ fop.patch 4 Feb 2010 03:07:09 -0000 1.7
@@ -1,28 +1,468 @@
-diff -Nurd fop-0.95/fop fop-0.95-new/fop
---- fop-0.95/fop 2008-07-31 10:06:25.000000000 -0400
-+++ fop-0.95-new/fop 2010-01-30 16:35:41.000000000 -0500
-@@ -47,6 +47,11 @@
- . /etc/fop.conf
- fi
+diff -Nurd fop-0.20.5/fop.sh fop-0.20.5-new/fop.sh
+--- fop-0.20.5/fop.sh 2003-07-14 22:03:23.000000000 -0400
++++ fop-0.20.5-new/fop.sh 2010-02-03 21:49:04.000000000 -0500
+@@ -11,7 +11,11 @@
+ darwin=false;
+ case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+- Darwin*) darwin=true ;;
++ Darwin*) darwin=true
++ if [ -z "$JAVA_HOME" ] ; then
++
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home
++ fi
++ ;;
+ esac
-+ # then fink-specific fop configuration
-+ if [ -f "@FINKPREFIX@//etc/fop.conf" ] ; then
-+ . @FINKPREFIX@/etc/fop.conf
-+ fi
+ if [ -z "$FOP_HOME" ] ; then
+@@ -42,6 +46,8 @@
+
+ fi
+
++fop_ho...@prefix@/share/java/fop
+
- # load user fop configuration
- if [ -f "$HOME/.fop/fop.conf" ] ; then
- . $HOME/.fop/fop.conf
-@@ -247,7 +252,11 @@
+ # For Cygwin, ensure paths are in UNIX format before anything is touched
+ if $cygwin ; then
+ [ -n "$FOP_HOME" ] &&
+@@ -76,10 +82,10 @@
+ fi
- # Execute FOP using eval/exec to preserve spaces in paths,
- # java options, and FOP args
--fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath
\"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
-+if [ -z "$MAIN_CLASS" ]; then
-+ MAIN_CLASS="org.apache.fop.cli.Main"
+ # add fop.jar, which resides in $FOP_HOME/build
+-LOCALCLASSPATH=${FOP_HOME}/build/fop.jar:$LOCALCLASSPATH
++LOCALCLASSPATH=${FOP_HOME}/fop.jar:$LOCALCLASSPATH
+
+ # add in the dependency .jar files, which reside in $FOP_HOME/lib
+-DIRLIBS=${FOP_HOME}/lib/*.jar
++DIRLIBS=${FOP_HOME}/*.jar
+ for i in ${DIRLIBS}
+ do
+ # if the directory is empty, then it will return the input string
+@@ -100,5 +106,5 @@
+ LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+ fi
+
+-$JAVACMD -classpath "$LOCALCLASSPATH" $FOP_OPTS org.apache.fop.apps.Fop "$@"
++$JAVACMD -Xms64M -Xmx320M -Djava.awt.headless=true -classpath
"$LOCALCLASSPATH" $FOP_OPTS org.apache.fop.apps.Fop "$@"
+
+diff -Nurd fop-0.20.5/fop_pfmreader.sh fop-0.20.5-new/fop_pfmreader.sh
+--- fop-0.20.5/fop_pfmreader.sh 1969-12-31 19:00:00.000000000 -0500
++++ fop-0.20.5-new/fop_pfmreader.sh 2010-02-03 21:49:04.000000000 -0500
+@@ -0,0 +1,110 @@
++#! /bin/sh
++#
++# Shell script to run FOP, adapted from the Jakarta-Ant project.
++
++if [ -f $HOME/.foprc ] ; then
++ . $HOME/.foprc
+fi
+
-+fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath
\"$LOCALCLASSPATH\" $FOP_OPTS $MAIN_CLASS $fop_exec_args"
- if $fop_exec_debug ; then
- echo $fop_exec_command
++# OS specific support. $var _must_ be set to either true or false.
++cygwin=false;
++darwin=false;
++case "`uname`" in
++ CYGWIN*) cygwin=true ;;
++ Darwin*) darwin=true
++ if [ -z "$JAVA_HOME" ] ; then
++
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home
++ fi
++ ;;
++esac
++
++if [ -z "$FOP_HOME" ] ; then
++ # try to find FOP
++ if [ -d /opt/fop ] ; then
++ FOP_HOME=/opt/fop
++ fi
++
++ if [ -d ${HOME}/opt/fop ] ; then
++ FOP_HOME=${HOME}/opt/fop
++ fi
++
++ ## resolve links - $0 may be a link to fop's home
++ PRG=$0
++ progname=`basename $0`
++
++ while [ -h "$PRG" ] ; do
++ ls=`ls -ld "$PRG"`
++ link=`expr "$ls" : '.*-> \(.*\)$'`
++ if expr "$link" : '.*/.*' > /dev/null; then
++ PRG="$link"
++ else
++ PRG="`dirname $PRG`/$link"
++ fi
++ done
++
++ FOP_HOME=`dirname "$PRG"`
++
++fi
++
++fop_ho...@prefix@/share/java/fop
++
++# For Cygwin, ensure paths are in UNIX format before anything is touched
++if $cygwin ; then
++ [ -n "$FOP_HOME" ] &&
++ FOP_HOME=`cygpath --unix "$FOP_HOME"`
++ [ -n "$JAVA_HOME" ] &&
++ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
++ [ -n "$CLASSPATH" ] &&
++ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
++fi
++
++if [ -z "$JAVACMD" ] ; then
++ if [ -n "$JAVA_HOME" ] ; then
++ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
++ # IBM's JDK on AIX uses strange locations for the executables
++ JAVACMD=$JAVA_HOME/jre/sh/java
++ else
++ JAVACMD=$JAVA_HOME/bin/java
++ fi
++ else
++ JAVACMD=java
++ fi
++fi
++
++if [ ! -x "$JAVACMD" ] ; then
++ echo "Error: JAVA_HOME is not defined correctly."
++ echo " We cannot execute $JAVACMD"
++ exit
++fi
++
++if [ -n "$CLASSPATH" ] ; then
++ LOCALCLASSPATH=$CLASSPATH
++fi
++
++# add fop.jar, which resides in $FOP_HOME/build
++LOCALCLASSPATH=${FOP_HOME}/fop.jar:$LOCALCLASSPATH
++
++# add in the dependency .jar files, which reside in $FOP_HOME/lib
++DIRLIBS=${FOP_HOME}/*.jar
++for i in ${DIRLIBS}
++do
++ # if the directory is empty, then it will return the input string
++ # this is stupid, so case for it
++ if [ "$i" != "${DIRLIBS}" ] ; then
++ if [ -z "$LOCALCLASSPATH" ] ; then
++ LOCALCLASSPATH=$i
++ else
++ LOCALCLASSPATH="$i":$LOCALCLASSPATH
++ fi
++ fi
++done
++
++# For Cygwin, switch paths to Windows format before running java
++if $cygwin; then
++ FOP_HOME=`cygpath --path --windows "$FOP_HOME"`
++ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
++ LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
++fi
++
++$JAVACMD -Xms64M -Xmx320M -Djava.awt.headless=true -classpath
"$LOCALCLASSPATH" $FOP_OPTS org.apache.fop.fonts.apps.PFMReader "$@"
++
+diff -Nurd fop-0.20.5/fop_ttfreader.sh fop-0.20.5-new/fop_ttfreader.sh
+--- fop-0.20.5/fop_ttfreader.sh 1969-12-31 19:00:00.000000000 -0500
++++ fop-0.20.5-new/fop_ttfreader.sh 2010-02-03 21:49:04.000000000 -0500
+@@ -0,0 +1,110 @@
++#! /bin/sh
++#
++# Shell script to run FOP, adapted from the Jakarta-Ant project.
++
++if [ -f $HOME/.foprc ] ; then
++ . $HOME/.foprc
++fi
++
++# OS specific support. $var _must_ be set to either true or false.
++cygwin=false;
++darwin=false;
++case "`uname`" in
++ CYGWIN*) cygwin=true ;;
++ Darwin*) darwin=true
++ if [ -z "$JAVA_HOME" ] ; then
++
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home
++ fi
++ ;;
++esac
++
++if [ -z "$FOP_HOME" ] ; then
++ # try to find FOP
++ if [ -d /opt/fop ] ; then
++ FOP_HOME=/opt/fop
++ fi
++
++ if [ -d ${HOME}/opt/fop ] ; then
++ FOP_HOME=${HOME}/opt/fop
++ fi
++
++ ## resolve links - $0 may be a link to fop's home
++ PRG=$0
++ progname=`basename $0`
++
++ while [ -h "$PRG" ] ; do
++ ls=`ls -ld "$PRG"`
++ link=`expr "$ls" : '.*-> \(.*\)$'`
++ if expr "$link" : '.*/.*' > /dev/null; then
++ PRG="$link"
++ else
++ PRG="`dirname $PRG`/$link"
++ fi
++ done
++
++ FOP_HOME=`dirname "$PRG"`
++
++fi
++
++fop_ho...@prefix@/share/java/fop
++
++# For Cygwin, ensure paths are in UNIX format before anything is touched
++if $cygwin ; then
++ [ -n "$FOP_HOME" ] &&
++ FOP_HOME=`cygpath --unix "$FOP_HOME"`
++ [ -n "$JAVA_HOME" ] &&
++ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
++ [ -n "$CLASSPATH" ] &&
++ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
++fi
++
++if [ -z "$JAVACMD" ] ; then
++ if [ -n "$JAVA_HOME" ] ; then
++ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
++ # IBM's JDK on AIX uses strange locations for the executables
++ JAVACMD=$JAVA_HOME/jre/sh/java
++ else
++ JAVACMD=$JAVA_HOME/bin/java
++ fi
++ else
++ JAVACMD=java
++ fi
++fi
++
++if [ ! -x "$JAVACMD" ] ; then
++ echo "Error: JAVA_HOME is not defined correctly."
++ echo " We cannot execute $JAVACMD"
++ exit
++fi
++
++if [ -n "$CLASSPATH" ] ; then
++ LOCALCLASSPATH=$CLASSPATH
++fi
++
++# add fop.jar, which resides in $FOP_HOME/build
++LOCALCLASSPATH=${FOP_HOME}/fop.jar:$LOCALCLASSPATH
++
++# add in the dependency .jar files, which reside in $FOP_HOME/lib
++DIRLIBS=${FOP_HOME}/*.jar
++for i in ${DIRLIBS}
++do
++ # if the directory is empty, then it will return the input string
++ # this is stupid, so case for it
++ if [ "$i" != "${DIRLIBS}" ] ; then
++ if [ -z "$LOCALCLASSPATH" ] ; then
++ LOCALCLASSPATH=$i
++ else
++ LOCALCLASSPATH="$i":$LOCALCLASSPATH
++ fi
++ fi
++done
++
++# For Cygwin, switch paths to Windows format before running java
++if $cygwin; then
++ FOP_HOME=`cygpath --path --windows "$FOP_HOME"`
++ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
++ LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
++fi
++
++$JAVACMD -Xms64M -Xmx320M -Djava.awt.headless=true -classpath
"$LOCALCLASSPATH" $FOP_OPTS org.apache.fop.fonts.apps.TTFReader "$@"
++
+diff -Nurd fop-0.20.5/src/org/apache/fop/fonts/apps/PFMReader.java
fop-0.20.5-new/src/org/apache/fop/fonts/apps/PFMReader.java
+--- fop-0.20.5/src/org/apache/fop/fonts/apps/PFMReader.java 2003-07-14
22:03:25.000000000 -0400
++++ fop-0.20.5-new/src/org/apache/fop/fonts/apps/PFMReader.java
2010-02-03 21:49:04.000000000 -0500
+@@ -370,16 +370,16 @@
+
+
+ // Get kerning
+- for (Iterator enum = pfm.getKerning().keySet().iterator();
enum.hasNext(); ) {
+- Integer kpx1 = (Integer)enum.next();
++ for (Iterator it = pfm.getKerning().keySet().iterator();
it.hasNext(); ) {
++ Integer kpx1 = (Integer)it.next();
+ el = doc.createElement("kerning");
+ el.setAttribute("kpx1", kpx1.toString());
+ root.appendChild(el);
+ Element el2 = null;
+
+ Map h2 = (Map)pfm.getKerning().get(kpx1);
+- for (Iterator enum2 = h2.keySet().iterator(); enum2.hasNext(); ) {
+- Integer kpx2 = (Integer)enum2.next();
++ for (Iterator it2 = h2.keySet().iterator(); it2.hasNext(); ) {
++ Integer kpx2 = (Integer)it2.next();
+ el2 = doc.createElement("pair");
+ el2.setAttribute("kpx2", kpx2.toString());
+ Integer val = (Integer)h2.get(kpx2);
+diff -Nurd fop-0.20.5/src/org/apache/fop/fonts/apps/TTFReader.java
fop-0.20.5-new/src/org/apache/fop/fonts/apps/TTFReader.java
+--- fop-0.20.5/src/org/apache/fop/fonts/apps/TTFReader.java 2003-07-14
22:03:13.000000000 -0400
++++ fop-0.20.5-new/src/org/apache/fop/fonts/apps/TTFReader.java
2010-02-03 21:49:04.000000000 -0500
+@@ -423,14 +423,14 @@
+ }
+
+ // Get kerning
+- Iterator enum;
++ Iterator it;
+ if (isCid)
+- enum = ttf.getKerning().keySet().iterator();
++ it = ttf.getKerning().keySet().iterator();
+ else
+- enum = ttf.getAnsiKerning().keySet().iterator();
++ it = ttf.getAnsiKerning().keySet().iterator();
+
+- while (enum.hasNext()) {
+- Integer kpx1 = (Integer)enum.next();
++ while (it.hasNext()) {
++ Integer kpx1 = (Integer)it.next();
+
+ el = doc.createElement("kerning");
+ el.setAttribute("kpx1", kpx1.toString());
+@@ -443,8 +443,8 @@
+ else
+ h2 = (HashMap)ttf.getAnsiKerning().get(kpx1);
+
+- for (Iterator enum2 = h2.keySet().iterator(); enum2.hasNext(); ) {
+- Integer kpx2 = (Integer)enum2.next();
++ for (Iterator it2 = h2.keySet().iterator(); it2.hasNext(); ) {
++ Integer kpx2 = (Integer)it2.next();
+ if (isCid || kpx2.intValue() < 256) {
+ el2 = doc.createElement("pair");
+ el2.setAttribute("kpx2", kpx2.toString());
+diff -Nurd fop-0.20.5/src/org/apache/fop/messaging/MessageHandler.java
fop-0.20.5-new/src/org/apache/fop/messaging/MessageHandler.java
+--- fop-0.20.5/src/org/apache/fop/messaging/MessageHandler.java
2003-07-14 22:03:14.000000000 -0400
++++ fop-0.20.5-new/src/org/apache/fop/messaging/MessageHandler.java
2010-02-03 21:49:04.000000000 -0500
+@@ -156,9 +156,9 @@
+ break;
+ case EVENT:
+ setMessage(message);
+- Enumeration enum = listeners.elements();
+- while (enum.hasMoreElements()) {
+- ((MessageListener)enum.nextElement()).processMessage(new
MessageEvent(getMessage()));
++ Enumeration e = listeners.elements();
++ while (e.hasMoreElements()) {
++ ((MessageListener)e.nextElement()).processMessage(new
MessageEvent(getMessage()));
+ }
+ break;
+ case NONE:
+@@ -205,11 +205,11 @@
+ break;
+ case EVENT:
+ setMessage(message);
+- Enumeration enum = listeners.elements();
+- while (enum.hasMoreElements()) {
++ Enumeration e = listeners.elements();
++ while (e.hasMoreElements()) {
+ MessageEvent messEv = new MessageEvent(getMessage());
+ messEv.setMessageType(MessageEvent.ERROR);
+- ((MessageListener)enum.nextElement()).processMessage(messEv);
++ ((MessageListener)e.nextElement()).processMessage(messEv);
+ }
+ break;
+ case NONE:
+diff -Nurd fop-0.20.5/src/org/apache/fop/render/ps/PSRenderer.java
fop-0.20.5-new/src/org/apache/fop/render/ps/PSRenderer.java
+--- fop-0.20.5/src/org/apache/fop/render/ps/PSRenderer.java 2003-07-14
22:03:16.000000000 -0400
++++ fop-0.20.5-new/src/org/apache/fop/render/ps/PSRenderer.java
2010-02-03 21:49:04.000000000 -0500
+@@ -303,9 +303,9 @@
+ // write("/gfF1{/Helvetica findfont} bd");
+ // write("/gfF3{/Helvetica-Bold findfont} bd");
+ Map fonts = fontInfo.getFonts();
+- Iterator enum = fonts.keySet().iterator();
+- while (enum.hasNext()) {
+- String key = (String)enum.next();
++ Iterator it = fonts.keySet().iterator();
++ while (it.hasNext()) {
++ String key = (String)it.next();
+ Font fm = (Font)fonts.get(key);
+ write("/" + key + " /" + fm.fontName() + " def");
+ }
+@@ -314,9 +314,9 @@
+ defineWinAnsiEncoding();
+
+ //Rewrite font encodings
+- enum = fonts.keySet().iterator();
+- while (enum.hasNext()) {
+- String key = (String)enum.next();
++ it = fonts.keySet().iterator();
++ while (it.hasNext()) {
++ String key = (String)it.next();
+ Font fm = (Font)fonts.get(key);
+ if (null == fm.encoding()) {
+ //ignore (ZapfDingbats and Symbol run through here
+diff -Nurd fop-0.20.5/src/org/apache/fop/svg/PDFGraphics2D.java
fop-0.20.5-new/src/org/apache/fop/svg/PDFGraphics2D.java
+--- fop-0.20.5/src/org/apache/fop/svg/PDFGraphics2D.java 2003-07-14
22:03:16.000000000 -0400
++++ fop-0.20.5-new/src/org/apache/fop/svg/PDFGraphics2D.java 2010-02-03
21:59:27.000000000 -0500
+@@ -1322,11 +1322,26 @@
+ return new PDFGraphicsDevice(this);
+ }
+
+- // needed for compiling under jdk1.4
+ @jdk14codestart@
++
+ public java.awt.image.VolatileImage createCompatibleVolatileImage(int
width, int height) {
+- return null;
++ try {
++ return super.createCompatibleVolatileImage(width, height, new
ImageCapabilities(false));
++ } catch (java.awt.AWTException e) {
++ e.printStackTrace();
++ return null;
++ }
+ }
++
++ public java.awt.image.VolatileImage createCompatibleVolatileImage(int
width, int height, int transparency) {
++ try {
++ return super.createCompatibleVolatileImage(width, height, new
ImageCapabilities(false), transparency);
++ } catch (java.awt.AWTException e) {
++ e.printStackTrace();
++ return null;
++ }
++ }
++
+ @jdk14codeend@
+ }
+
+diff -Nurd fop-0.20.5/xalan.sh fop-0.20.5-new/xalan.sh
+--- fop-0.20.5/xalan.sh 2003-07-14 22:03:25.000000000 -0400
++++ fop-0.20.5-new/xalan.sh 2010-02-03 21:49:04.000000000 -0500
+@@ -11,7 +11,11 @@
+ darwin=false;
+ case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+- Darwin*) darwin=true ;;
++ Darwin*) darwin=true
++ if [ -z "$JAVA_HOME" ] ; then
++
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home
++ fi
++ ;;
+ esac
+
+ if [ -z "$FOP_HOME" ] ; then
+@@ -42,6 +46,8 @@
+
+ fi
+
++fop_ho...@prefix@/share/java/fop
++
+ # For Cygwin, ensure paths are in UNIX format before anything is touched
+ if $cygwin ; then
+ [ -n "$FOP_HOME" ] &&
+@@ -76,10 +82,10 @@
+ fi
+
+ # add fop.jar, which resides in $FOP_HOME/build
+-LOCALCLASSPATH=${FOP_HOME}/build/fop.jar:$LOCALCLASSPATH
++LOCALCLASSPATH=${FOP_HOME}/fop.jar:$LOCALCLASSPATH
+
+ # add in the dependency .jar files, which reside in $FOP_HOME/lib
+-DIRLIBS=${FOP_HOME}/lib/*.jar
++DIRLIBS=${FOP_HOME}/*.jar
+ for i in ${DIRLIBS}
+ do
+ # if the directory is empty, then it will return the input string
+@@ -100,5 +106,5 @@
+ LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
fi
+
+-$JAVACMD -classpath "$LOCALCLASSPATH" $FOP_OPTS org.apache.xalan.xslt.Process
"$@"
++$JAVACMD -Xms64M -Xmx320M -Djava.awt.headless=true -classpath
"$LOCALCLASSPATH" $FOP_OPTS org.apache.xalan.xslt.Process "$@"
+
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
