aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch')
-rw-r--r--sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
deleted file mode 100644
index 18bdaac1d..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Bryan Gardiner <bog@khumba.net>
-Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=14009
-Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
-
-Updates Scilab to build against FOP >=2.0. This is not tested, as I'm not sure
-of a test case, and it's awaiting upstream review.
-
---- a/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
-+++ b/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
-@@ -43,10 +43,10 @@ public class FopConverter extends ContainerConverter {
- 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));
---- a/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
-+++ b/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
-@@ -114,11 +114,11 @@ public class CodeExporter extends FOCodeConverter {
- * @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"));
-+ FopFactory fopFactory =
-+ FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
- FOUserAgent userAgent = fopFactory.newFOUserAgent();
- userAgent.setProducer(CREATOR);
- userAgent.setTitle(title);