Author: malat-guest Date: 2011-08-26 12:35:53 +0000 (Fri, 26 Aug 2011) New Revision: 14501
Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch Log: Refresh patch Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch =================================================================== --- trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch 2011-08-26 11:55:23 UTC (rev 14500) +++ trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch 2011-08-26 12:35:53 UTC (rev 14501) @@ -9,9 +9,11 @@ Bug-Debian: http://bugs.debian.org/638532 Forwarded: http://www.mail-archive.com/fop-users%40xmlgraphics.apache.org/msg17438.html ---- fop-1.0.dfsg.orig/build.xml -+++ fop-1.0.dfsg/build.xml -@@ -149,8 +149,8 @@ list of possible build targets. +Index: fop-1.0/build.xml +=================================================================== +--- fop-1.0.orig/build.xml 2010-07-12 21:34:37.000000000 +0200 ++++ fop-1.0/build.xml 2011-08-26 14:35:27.000000000 +0200 +@@ -149,8 +149,8 @@ <property name="javac.debug" value="on"/> <property name="javac.optimize" value="off"/> <property name="javac.deprecation" value="on"/> @@ -22,7 +24,7 @@ <property name="javac.fork" value="no"/> <property name="junit.fork" value="on"/> <property name="junit.haltonfailure" value="off"/> -@@ -517,7 +517,7 @@ list of possible build targets. +@@ -517,7 +517,7 @@ <pathconvert property="manifest.classpath" dirsep="/" pathsep=" " refid="libs-build-classpath"> <map from="${basedir}${file.separator}lib${file.separator}" to=""/> </pathconvert> @@ -31,13 +33,17 @@ <manifest> <attribute name="Main-Class" value="org.apache.fop.cli.Main"/> <attribute name="Class-Path" value="${manifest.classpath}"/> ---- /dev/null -+++ fop-1.0.dfsg/fop.mf +Index: fop-1.0/fop.mf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ fop-1.0/fop.mf 2011-08-26 14:35:27.000000000 +0200 @@ -0,0 +1,2 @@ +Class-Path: xercesImpl.jar xalan2.jar bsf.jar avalon-framework.jar batik.jar commons-io.jar commons-logging.jar xmlgraphics-commons.jar xml-commons-external.jar + ---- fop-1.0.dfsg.orig/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java -+++ fop-1.0.dfsg/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java +Index: fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java +=================================================================== +--- fop-1.0.orig/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java 2010-07-12 21:34:46.000000000 +0200 ++++ fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java 2011-08-26 14:35:39.000000000 +0200 @@ -15,13 +15,12 @@ * limitations under the License. */ @@ -53,7 +59,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -@@ -47,10 +46,10 @@ import com.thoughtworks.qdox.model.Type; +@@ -47,10 +46,10 @@ class EventProducerCollector { private static final String CLASSNAME_EVENT_PRODUCER = EventProducer.class.getName(); @@ -66,7 +72,7 @@ m.put("boolean", Boolean.class); m.put("byte", Byte.class); m.put("char", Character.class); -@@ -63,7 +62,7 @@ class EventProducerCollector { +@@ -63,7 +62,7 @@ } private DocletTagFactory tagFactory; @@ -75,17 +81,7 @@ /** * Creates a new EventProducerCollector. -@@ -123,6 +122,9 @@ class EventProducerCollector { - */ - protected void processEventProducerInterface(JavaClass clazz) - throws EventConventionException, ClassNotFoundException { -+ if (clazz.getParentClass() == null || clazz.getParentClass().getName().equals("java.lang.Object")) { -+ return; -+ } - EventProducerModel prodMeta = new EventProducerModel(clazz.getFullyQualifiedName()); - JavaMethod[] methods = clazz.getMethods(true); - for (int i = 0, c = methods.length; i < c; i++) { -@@ -139,7 +141,7 @@ class EventProducerCollector { +@@ -139,7 +138,7 @@ throws EventConventionException, ClassNotFoundException { JavaClass clazz = method.getParentClass(); //Check EventProducer conventions @@ -94,7 +90,7 @@ throw new EventConventionException("All methods of interface " + clazz.getFullyQualifiedName() + " must have return type 'void'!"); } -@@ -168,10 +170,10 @@ class EventProducerCollector { +@@ -168,10 +167,10 @@ if (params.length > 1) { for (int j = 1, cj = params.length; j < cj; j++) { JavaParameter p = params[j]; @@ -107,7 +103,7 @@ if (type == null) { throw new UnsupportedOperationException( "Primitive datatype not supported: " + pClass.getName()); -@@ -197,7 +199,7 @@ class EventProducerCollector { +@@ -197,7 +196,7 @@ * Returns the event model that has been accumulated. * @return the event model. */ _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
