Date: Fri, 17 Jul 2015 15:32:06 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392380 - head/math/scilab/files Message-ID: <201507171532.t6HFW64K048682@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Fri Jul 17 15:32:05 2015 New Revision: 392380 URL: https://svnweb.freebsd.org/changeset/ports/392380 Log: math/scilab: - Fix build after textproc/fop update PR: 201339 Submitted by: truckman Added: head/math/scilab/files/patch-fop2 (contents, props changed) Added: head/math/scilab/files/patch-fop2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/scilab/files/patch-fop2 Fri Jul 17 15:32:05 2015 (r392380) @@ -0,0 +1,32 @@ +Fix build with fop 2.0 + +--- modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java.orig 2014-04-11 09:51:59 UTC ++++ modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java +@@ -43,10 +43,9 @@ public class FopConverter extends Contai + String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase(); + + try { +- FopFactory fopFactory = FopFactory.newInstance(); ++ FopFactory fopFactory = FopFactory.newInstance(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml")); + 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)); +--- modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java.orig 2014-04-11 09:52:10 UTC ++++ modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java +@@ -114,11 +114,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(); ++ FopFactory fopFactory; + OutputStream out = null; + + try { +- fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); ++ fopFactory = FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); + FOUserAgent userAgent = fopFactory.newFOUserAgent(); + userAgent.setProducer(CREATOR); + userAgent.setTitle(title);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507171532.t6HFW64K048682>