Merge lp:~james-page/ubuntu/oneiric/fop/mir into lp:ubuntu/oneiric/fop

[James Page]

Updates to fop to support migration to main.

These can be superceeded once fop 1.0 is release in Debian so not proposing to submit a patch back to Debian for this delta.

[lp:~james-page/ubuntu/oneiric/fop/mir]

19. By James Page on 2011-06-02

Re-enabled verbose build

[Micah Gersten (micahg)]

fop 1.0 is in experimental, does that not work for you?

[Clint Byrum (clint-fewbar)]

Micah, I believe the 1.0 from experimental needs the same changes as well.

[Micah Gersten (micahg)]

The description says otherwise, that's why I mentioned it :)

[James Page (james-page)]

Hi Micah

I don't want to sync fop 1.0 from Debian experimental for the following reasons:

 1) The orig.tar.gz includes a number of upstream bundled jar files
 2) It still depends on libservlet2.4-java

The first will be sorted out once its released to unstable (bug already raised in Debian) and I propose to work with the debian-java team to resolve the second one prior to sync.

This is really an interim patch so that the MIR can be approved; this will unblock the build of erlang in Oneiric which is currently failing due to component mismatches.

Cheers

James

[James Page (james-page)]

Hi

fop-1.0 is still not ready in Debian; see the latest update on the bug report:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625869

There appear to be compatibility issues with libqdox-java which is a new dependency for fop-1.0.

I would still recommend that we use this patch in Ubuntu for the time being; once these issues have been resolved in Debian we can re-sync to 1.0

Cheers

James

[Dave Walker (davewalker)]

Looks good to me, uploading.

Thanks

review: Approve

=== added directory '.pc/04_xmlgraphics-1.4_compat.patch'
=== added directory '.pc/04_xmlgraphics-1.4_compat.patch/src'
=== added directory '.pc/04_xmlgraphics-1.4_compat.patch/src/java'
=== added directory '.pc/04_xmlgraphics-1.4_compat.patch/src/java/org'
=== added directory '.pc/04_xmlgraphics-1.4_compat.patch/src/java/org/apache'
=== added directory '.pc/04_xmlgraphics-1.4_compat.patch/src/java/org/apache/fop'
=== added directory '.pc/04_xmlgraphics-1.4_compat.patch/src/java/org/apache/fop/render'
=== added directory '.pc/04_xmlgraphics-1.4_compat.patch/src/java/org/apache/fop/render/ps'
=== added file '.pc/04_xmlgraphics-1.4_compat.patch/src/java/org/apache/fop/render/ps/NativeTextHandler.java'
--- .pc/04_xmlgraphics-1.4_compat.patch/src/java/org/apache/fop/render/ps/NativeTextHandler.java	1970-01-01 00:00:00 +0000
+++ .pc/04_xmlgraphics-1.4_compat.patch/src/java/org/apache/fop/render/ps/NativeTextHandler.java	2011-06-02 13:11:16 +0000
@@ -0,0 +1,188 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id: NativeTextHandler.java 627367 2008-02-13 12:03:30Z maxberger $ */
+
+package org.apache.fop.render.ps;
+
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.io.IOException;
+
+import org.apache.fop.fonts.Font;
+import org.apache.fop.fonts.FontInfo;
+import org.apache.fop.fonts.FontSetup;
+import org.apache.fop.fonts.FontTriplet;
+import org.apache.xmlgraphics.java2d.ps.PSGraphics2D;
+import org.apache.xmlgraphics.java2d.ps.PSTextHandler;
+import org.apache.xmlgraphics.ps.PSGenerator;
+
+/**
+ * Specialized TextHandler implementation that the PSGraphics2D class delegates to to paint text
+ * using PostScript text operations.
+ */
+public class NativeTextHandler implements PSTextHandler {
+
+    private PSGraphics2D g2d;
+    
+    /** FontInfo containing all available fonts */
+    protected FontInfo fontInfo;
+
+    /** Currently valid Font */
+    protected Font font;
+    
+    /** Overriding FontState */
+    protected Font overrideFont = null;
+    
+    /** the current (internal) font name */
+    protected String currentFontName;
+
+    /** the current font size in millipoints */
+    protected int currentFontSize;
+
+    /**
+     * Main constructor.
+     * @param g2d the PSGraphics2D instance this instances is used by
+     * @param fontInfo the FontInfo object with all available fonts
+     */
+    public NativeTextHandler(PSGraphics2D g2d, FontInfo fontInfo) {
+        this.g2d = g2d;
+        if (fontInfo != null) {
+            this.fontInfo = fontInfo;
+        } else {
+            setupFontInfo();
+        }
+    }
+    
+    private void setupFontInfo() {
+        //Sets up a FontInfo with default fonts
+        fontInfo = new FontInfo();
+        FontSetup.setup(fontInfo, null, null);
+    }
+    
+    /**
+     * Return the font information associated with this object
+     * @return the FontInfo object
+     */
+    public FontInfo getFontInfo() {
+        return fontInfo;
+    }
+
+    private PSGenerator getPSGenerator() {
+        return this.g2d.getPSGenerator();
+    }
+    
+    /** {@inheritDoc} */
+    public void writeSetup() throws IOException {
+        if (fontInfo != null) {
+            PSFontUtils.writeFontDict(getPSGenerator(), fontInfo);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void writePageSetup() throws IOException {
+        //nop
+    }
+
+    /**
+     * Draw a string to the PostScript document. The text is painted using 
+     * text operations.
+     * {@inheritDoc} 
+     */
+    public void drawString(String s, float x, float y) throws IOException {
+        g2d.preparePainting();
+        if (this.overrideFont == null) {
+            java.awt.Font awtFont = g2d.getFont();
+            this.font = createFont(awtFont);
+        } else {
+            this.font = this.overrideFont;
+            this.overrideFont = null;
+        }
+        
+        //Color and Font state
+        g2d.establishColor(g2d.getColor());
+        establishCurrentFont();
+
+        PSGenerator gen = getPSGenerator();
+        gen.saveGraphicsState();
+
+        //Clip
+        Shape imclip = g2d.getClip();
+        g2d.writeClip(imclip);
+
+        //Prepare correct transformation
+        AffineTransform trans = g2d.getTransform();
+        gen.concatMatrix(trans);
+        gen.writeln(gen.formatDouble(x) + " "
+                  + gen.formatDouble(y) + " moveto ");
+        gen.writeln("1 -1 scale");
+  
+        StringBuffer sb = new StringBuffer("(");
+        escapeText(s, sb);
+        sb.append(") t ");
+
+        gen.writeln(sb.toString());
+        
+        gen.restoreGraphicsState();        
+    }
+
+    private void escapeText(final String text, StringBuffer target) {
+        final int l = text.length();
+        for (int i = 0; i < l; i++) {
+            final char ch = text.charAt(i);
+            final char mch = this.font.mapChar(ch);
+            PSGenerator.escapeChar(mch, target);
+        }
+    }
+
+    private Font createFont(java.awt.Font f) {
+        String fontFamily = f.getFamily();
+        if (fontFamily.equals("sanserif")) {
+            fontFamily = "sans-serif";
+        }
+        int fontSize = 1000 * f.getSize();
+        String style = f.isItalic() ? "italic" : "normal";
+        int weight = f.isBold() ? Font.WEIGHT_BOLD : Font.WEIGHT_NORMAL;
+                
+        FontTriplet triplet = fontInfo.findAdjustWeight(fontFamily, style, weight);
+        if (triplet == null) {
+            triplet = fontInfo.findAdjustWeight("sans-serif", style, weight);
+        }
+        return fontInfo.getFontInstance(triplet, fontSize);
+    }
+
+    private void establishCurrentFont() throws IOException {
+        if ((currentFontName != this.font.getFontName()) 
+                || (currentFontSize != this.font.getFontSize())) {
+            PSGenerator gen = getPSGenerator();
+            gen.writeln(this.font.getFontName() + " " 
+                    + gen.formatDouble(font.getFontSize() / 1000f) + " F");
+            currentFontName = this.font.getFontName();
+            currentFontSize = this.font.getFontSize();
+        }
+    }
+
+    /**
+     * Sets the overriding font.
+     * @param override Overriding Font to set
+     */
+    public void setOverrideFont(Font override) {
+        this.overrideFont = override;
+    }
+    
+
+}

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-04-12 09:53:37 +0000
+++ .pc/applied-patches	2011-06-02 13:11:16 +0000
@@ -1,3 +1,4 @@
 01_from_svn_16_bit_alpha_png.patch
 02_fix_segfault_with_anchors.patch
 03_fix_tablecol.patch
+04_xmlgraphics-1.4_compat.patch

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-03 13:14:49 +0000
+++ debian/changelog	2011-06-02 13:11:16 +0000
@@ -1,3 +1,15 @@
+fop (1:0.95.dfsg-11ubuntu2) oneiric; urgency=low
+
+  * MIR updates for Ubuntu (LP: #778216):
+    - debian/control: Build-Depends on ant-optional and libservlet2.5-java 
+    - debian/control: fop - Suggests libservlet2.5-java
+    - debian/rules: removed ant-trax.jar (not needed for ant >= 1.8.2) and 
+      upgraded to servlet-api-2.5
+    - debian/patches/04_xmlgraphics-1.4_compat.patch: compat patch to 
+      support compilation/use against libxmlgraphics-commons-java >= 1.4.
+
+ -- James Page <[e-mail]>  Thu, 02 Jun 2011 10:55:35 +0100
+
 fop (1:0.95.dfsg-11ubuntu1) natty; urgency=low
 
   * Build-depend on ant1.7-optional to fix FTBFS.

=== modified file 'debian/control'
--- debian/control	2011-04-03 13:14:49 +0000
+++ debian/control	2011-06-02 13:11:16 +0000
@@ -1,17 +1,18 @@
 Source: fop
 Section: text
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 DM-Upload-Allowed: yes
 Uploaders: Michael Koch <[e-mail]>, Sylvestre Ledru <[e-mail]>,
  Vincent Fourmond <[e-mail]>, Torsten Werner <[e-mail]>,
  Mathieu Malaterre <[e-mail]>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.27)
-Build-Depends-Indep: ant1.7-optional, libbatik-java (>= 1.7),
+Build-Depends-Indep: ant-optional, libbatik-java (>= 1.7),
  libavalon-framework-java (>=4.1.2-2), libxalan2-java,
  libxerces2-java, default-jdk, libcommons-io-java,
  libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.3),
- libservlet2.4-java, libxml-commons-external-java, maven-repo-helper
+ libservlet2.5-java, libxml-commons-external-java, maven-repo-helper
 Standards-Version: 3.8.4
 Homepage: http://xmlgraphics.apache.org/fop/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/fop
@@ -27,7 +28,7 @@
  java-wrappers (>= 0.1.15), libxml-commons-external-java,
  ${misc:Depends}
 Recommends: libsaxon-java
-Suggests: fop-doc, libservlet2.4-java
+Suggests: fop-doc, libservlet2.5-java
 Replaces: libfop-java
 Description: XML to PDF Translator
  FOP is a print formatter driven by XSL formatting objects.

=== added file 'debian/patches/04_xmlgraphics-1.4_compat.patch'
--- debian/patches/04_xmlgraphics-1.4_compat.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_xmlgraphics-1.4_compat.patch	2011-06-02 13:11:16 +0000
@@ -0,0 +1,37 @@
+Description: Compatibility patch to support use with xmlgraphics-commons
+ >= 1.4.  This can be dropped on upgrade to fop 1.0.
+Author: James Page <[e-mail]>
+Forwarded: not-needed
+
+Index: fop/src/java/org/apache/fop/render/ps/NativeTextHandler.java
+===================================================================
+--- fop.orig/src/java/org/apache/fop/render/ps/NativeTextHandler.java	2011-06-02 11:32:47.259233851 +0100
++++ fop/src/java/org/apache/fop/render/ps/NativeTextHandler.java	2011-06-02 11:34:50.779233886 +0100
+@@ -19,6 +19,7 @@
+ 
+ package org.apache.fop.render.ps;
+ 
++import java.awt.Graphics2D;
+ import java.awt.Shape;
+ import java.awt.geom.AffineTransform;
+ import java.io.IOException;
+@@ -140,6 +141,12 @@
+         gen.restoreGraphicsState();        
+     }
+ 
++    /** {@inheritDoc} */
++    public void drawString(Graphics2D g, String s, float x, float y) throws IOException {
++		//  Just wrap call to existing method for the time being
++		drawString(s,x,y);
++    }
++
+     private void escapeText(final String text, StringBuffer target) {
+         final int l = text.length();
+         for (int i = 0; i < l; i++) {
+@@ -183,6 +190,5 @@
+     public void setOverrideFont(Font override) {
+         this.overrideFont = override;
+     }
+-    
+ 
+ }

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-04-12 09:53:37 +0000
+++ debian/patches/series	2011-06-02 13:11:16 +0000
@@ -1,3 +1,4 @@
 01_from_svn_16_bit_alpha_png.patch
 02_fix_segfault_with_anchors.patch
 03_fix_tablecol.patch
+04_xmlgraphics-1.4_compat.patch

=== modified file 'debian/rules'
--- debian/rules	2010-03-06 21:02:37 +0000
+++ debian/rules	2011-06-02 13:11:16 +0000
@@ -6,7 +6,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
-DEB_JARS             := $(ANT_HOME)/lib/ant-trax.jar batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.4
+DEB_JARS             := batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.5
 DEB_ANT_BUILD_TARGET := package javadocs #docs
 DEB_ANT_CLEAN_TARGET := distclean
 DEB_ANT_ARGS := -verbose

=== modified file 'src/java/org/apache/fop/render/ps/NativeTextHandler.java'
--- src/java/org/apache/fop/render/ps/NativeTextHandler.java	2008-12-11 21:09:32 +0000
+++ src/java/org/apache/fop/render/ps/NativeTextHandler.java	2011-06-02 13:11:16 +0000
@@ -19,6 +19,7 @@
 
 package org.apache.fop.render.ps;
 
+import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.geom.AffineTransform;
 import java.io.IOException;
@@ -140,6 +141,12 @@
         gen.restoreGraphicsState();        
     }
 
+    /** {@inheritDoc} */
+    public void drawString(Graphics2D g, String s, float x, float y) throws IOException {
+		//  Just wrap call to existing method for the time being
+		drawString(s,x,y);
+    }
+
     private void escapeText(final String text, StringBuffer target) {
         final int l = text.length();
         for (int i = 0; i < l; i++) {
@@ -183,6 +190,5 @@
     public void setOverrideFont(Font override) {
         this.overrideFont = override;
     }
-    
 
 }