Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2015-01-25 21:16:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-05 20:32:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2015-01-25 21:16:20.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Jan 24 09:58:24 UTC 2015 - [email protected] + +- Add scilab-build-with-xmlgraphics-commons-2_0.patch to fix + compilation with xmlgraphics-commons >= 2.0 + (http://bugzilla.scilab.org/show_bug.cgi?id=13724). + +------------------------------------------------------------------- New: ---- scilab-build-with-xmlgraphics-commons-2_0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scilab.spec ++++++ --- /var/tmp/diff_new_pack.Rj49Pa/_old 2015-01-25 21:16:21.000000000 +0100 +++ /var/tmp/diff_new_pack.Rj49Pa/_new 2015-01-25 21:16:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package scilab # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,6 +42,8 @@ Patch3: scilab-fix-64bit-portability-issue.patch # PATCH-FIX-OPENSUSE scilab-special-jarnames.patch [email protected] -- Adapt configure script for a few java library names peculiar to openSUSE Patch5: scilab-special-jarnames.patch +# PATCH-FIX-UPSTREAM scilab-build-with-xmlgraphics-commons-2_0.patch [email protected] -- Fix compilation with xmlgraphics-commons >= 2.0 +Patch6: scilab-build-with-xmlgraphics-commons-2_0.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -268,6 +270,11 @@ %patch2 -p1 %patch3 -p1 +# Only Factory has xmlgraphics-commons > 2.0 +%if 0%{?suse_version} > 1320 +%patch6 -p1 +%endif + # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml sed -i '/name="Class-Path"/d' modules/javasci/build.xml ++++++ scilab-build-with-xmlgraphics-commons-2_0.patch ++++++ http://bugzilla.scilab.org/show_bug.cgi?id=13724 Index: scilab-5.5.1/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java =================================================================== --- scilab-5.5.1.orig/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java +++ scilab-5.5.1/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java @@ -832,7 +832,7 @@ public class Export { } @Override - public int processShape(Shape s) throws IOException { + public int processShape(Shape s, boolean b) throws IOException { if (s instanceof Ellipse2D.Double) { Ellipse2D.Double ell = (Ellipse2D.Double) s; if (ell.height == ell.width) { @@ -855,10 +855,10 @@ public class Export { buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); it.next(); } else { - return super.processShape(s); + return super.processShape(s,true); } } else { - return super.processShape(s); + return super.processShape(s,true); } for (; !it.isDone(); it.next()) { @@ -866,7 +866,7 @@ public class Export { if (type == PathIterator.SEG_LINETO) { buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); } else { - return super.processShape(s); + return super.processShape(s,true); } } buffer.append("] DP"); @@ -874,7 +874,7 @@ public class Export { return PathIterator.WIND_NON_ZERO; } - return super.processShape(s); + return super.processShape(s,true); } }; g2d.setGraphicContext(new GraphicContext()); @@ -1003,7 +1003,7 @@ public class Export { } @Override - public int processShape(Shape s) throws IOException { + public int processShape(Shape s, boolean b) throws IOException { if (s instanceof Ellipse2D.Double) { Ellipse2D.Double ell = (Ellipse2D.Double) s; if (ell.height == ell.width) { @@ -1026,10 +1026,10 @@ public class Export { buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); it.next(); } else { - return super.processShape(s); + return super.processShape(s,true); } } else { - return super.processShape(s); + return super.processShape(s,true); } for (; !it.isDone(); it.next()) { @@ -1037,7 +1037,7 @@ public class Export { if (type == PathIterator.SEG_LINETO) { buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); } else { - return super.processShape(s); + return super.processShape(s,true); } } buffer.append("] DP"); @@ -1045,7 +1045,7 @@ public class Export { return PathIterator.WIND_NON_ZERO; } - return super.processShape(s); + return super.processShape(s,true); } }; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
