Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2016-04-28 16:54:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab" Changes: -------- --- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2016-03-26 15:25:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2016-04-28 16:56:57.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 13 21:33:52 UTC 2016 - [email protected] + +- Add scilab-build-with-fop-2_1.patch to fix build failures when + using xmlgraphics-fop >= 2.1 which has now landed in + openSUSE:Factory; patch taken from upstream. + +------------------------------------------------------------------- New: ---- scilab-build-with-fop-2_1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scilab.spec ++++++ --- /var/tmp/diff_new_pack.6CYk6S/_old 2016-04-28 16:56:59.000000000 +0200 +++ /var/tmp/diff_new_pack.6CYk6S/_new 2016-04-28 16:56:59.000000000 +0200 @@ -54,6 +54,9 @@ Patch10: scilab-batik-1.8.patch # to sync with java-1_8_0-openjdk sr #365892 Patch11: scilab_ppc64le_java_archinstall_changed.patch +# PATCH-FIX-UPSTREAM scilab-build-with-fop-2_1.patch [email protected] -- Fix build failures when using xmlgraphics-fop >= 2.1 which has now landed in openSUSE:Factory; patch taken from upstream +Patch12: scilab-build-with-fop-2_1.patch + # exclude ppc64 build as long as upstream open http://bugzilla.scilab.org/show_bug.cgi?id=13826 ExcludeArch: ppc64 # Dependencies are extracted from : @@ -290,6 +293,7 @@ %if 0%{?suse_version} > 1320 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %endif # Fix Class-Path in manifest ++++++ scilab-build-with-fop-2_1.patch ++++++ --- 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 Contai String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase(); try { - FopFactory fopFactory = FopFactory.newInstance(); + final File configuration = new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"); + FopFactory fopFactory = FopFactory.newInstance(configuration); 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,10 @@ 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")); + FopFactory fopFactory = FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); FOUserAgent userAgent = fopFactory.newFOUserAgent(); userAgent.setProducer(CREATOR); userAgent.setTitle(title);
