[scilab] 13/29: Drop patch to use the fop 2.0 api

[Julien Puydt]

This is an automated email from the git hooks/post-receive script.

jpuydt-guest pushed a commit to branch master
in repository scilab.

commit a08079706991614776fa459c75e5208512fc6e65
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Nov 15 20:20:22 2017 +0100

    Drop patch to use the fop 2.0 api
---
 debian/changelog            |  3 ++-
 debian/patches/fop-2.0.diff | 57 ---------------------------------------------
 debian/patches/series       |  1 -
 3 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ce54e2..2171aa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,8 @@ scilab (6.0.0-1) UNRELEASED; urgency=medium
     - Refresh patch to simplify the helper command-line.
     - Refresh patch to add deps for scicos' modelica compiler.
     - Refresh patch to add a missing lib to the linker list.
-    - Drop patch to adap the xmlgraphics api : useless now.
+    - Drop patch to adapt the xmlgraphics api : useless now.
+    - Drop patch to adapt the fop api to 2.0 : we have 2.2.
 
  -- Julien Puydt <julien.puydt at laposte.net>  Tue, 14 Nov 2017 16:46:25 +0100
 
diff --git a/debian/patches/fop-2.0.diff b/debian/patches/fop-2.0.diff
deleted file mode 100644
index b846535..0000000
--- a/debian/patches/fop-2.0.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: adapt to fop 2.0 API
- New way to configure and create Fop. See rationals there:
- <http://wiki.apache.org/xmlgraphics-fop/FopFactoryConfiguration>
-Author: Gilles Filippini <pini at debian.org>
-Index: scilab-5.5.2/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
-===================================================================
---- scilab-5.5.2.orig/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
-+++ scilab-5.5.2/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
-@@ -36,6 +36,8 @@ import org.scilab.modules.helptools.scil
- import org.scilab.modules.gui.messagebox.ScilabModalDialog;
- 
- import org.apache.fop.apps.FopFactory;
-+import org.apache.fop.apps.FopFactoryBuilder;
-+import org.apache.fop.apps.FopConfParser;
- import org.apache.fop.apps.Fop;
- import org.apache.fop.apps.FOUserAgent;
- import org.apache.fop.apps.MimeConstants;
-@@ -114,11 +116,11 @@ public class CodeExporter extends FOCode
-      * @param format the page format
-      */
-     public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) {
--        FopFactory fopFactory = FopFactory.newInstance();
-         OutputStream out = null;
- 
-         try {
--            fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
-+            FopFactoryBuilder fopFactoryBuilder = new FopConfParser(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")).getFopFactoryBuilder();
-+            FopFactory fopFactory = fopFactoryBuilder.build();
-             FOUserAgent userAgent = fopFactory.newFOUserAgent();
-             userAgent.setProducer(CREATOR);
-             userAgent.setTitle(title);
-Index: scilab-5.5.2/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
-===================================================================
---- scilab-5.5.2.orig/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
-+++ scilab-5.5.2/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
-@@ -19,6 +19,8 @@ import javax.xml.transform.stream.Stream
- import org.apache.fop.apps.FOPException;
- import org.apache.fop.apps.Fop;
- import org.apache.fop.apps.FopFactory;
-+import org.apache.fop.apps.FopFactoryBuilder;
-+import org.apache.fop.apps.FopConfParser;
- import org.apache.fop.apps.FormattingResults;
- import org.apache.fop.apps.MimeConstants;
- import org.scilab.forge.jlatexmath.fop.JLaTeXMathElementMapping;
-@@ -43,10 +45,10 @@ public class FopConverter extends Contai
-         String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase();
- 
-         try {
--            FopFactory fopFactory = FopFactory.newInstance();
-+            FopFactoryBuilder fopFactoryBuilder = new FopConfParser(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml")).getFopFactoryBuilder();
-+            FopFactory fopFactory = fopFactoryBuilder.build();
-             fopFactory.addElementMapping(new JLaTeXMathElementMapping());
-             fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler());
--            fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
- 
-             // Step 3: Construct fop with desired output format
-             OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName));
diff --git a/debian/patches/series b/debian/patches/series
index e8fe025..7244947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ disable-xcos-dep-check.diff
 jh.diff
 depend-scicos.diff
 missing-lib.diff
-fop-2.0.diff
 batik-1.8.diff
 jvm-archdir-ppc64le.diff
 libjogl2-java-2.3.2.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scilab.git