r47142 - in /packages/scilab/branches/5.5/debian: changelog patches/aarch64-detection.patch patches/batik-1.8.diff patches/fop-2.0.diff patches/jvm-archdir-ppc64le.diff patches/series patches/xmlgraphics-commons-2.0.diff
pini at users.alioth.debian.org
pini at users.alioth.debian.org
Sun Oct 18 20:51:23 UTC 2015
Author: pini
Date: Sun Oct 18 20:51:22 2015
New Revision: 47142
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47142
Log:
Acknowledge NMUs 5.5.2-1.1 and 5.5.2-1.2.
Added:
packages/scilab/branches/5.5/debian/patches/aarch64-detection.patch
packages/scilab/branches/5.5/debian/patches/batik-1.8.diff
packages/scilab/branches/5.5/debian/patches/fop-2.0.diff
packages/scilab/branches/5.5/debian/patches/jvm-archdir-ppc64le.diff
packages/scilab/branches/5.5/debian/patches/xmlgraphics-commons-2.0.diff
Modified:
packages/scilab/branches/5.5/debian/changelog
packages/scilab/branches/5.5/debian/patches/series
Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=47142&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog (original)
+++ packages/scilab/branches/5.5/debian/changelog Sun Oct 18 20:51:22 2015
@@ -1,3 +1,23 @@
+scilab (5.5.2-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix build with changed jvm architecure directory on ppc64el.
+ Closes: #801060.
+ * Fix Aarch64 detection (Martin Michlmayr). Closes: #791539.
+
+ -- Matthias Klose <doko at debian.org> Wed, 07 Oct 2015 10:02:09 +0200
+
+scilab (5.5.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Three new patches to cope with java libs API changes:
+ - xmlgraphics-commons-2.0.diff
+ - fop-2.0.diff
+ - batik-1.8.diff
+ (closes: #800632).
+
+ -- Gilles Filippini <pini at debian.org> Sat, 03 Oct 2015 10:06:53 +0200
+
scilab (5.5.2-1) unstable; urgency=medium
* New upstream release
Added: packages/scilab/branches/5.5/debian/patches/aarch64-detection.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/aarch64-detection.patch?rev=47142&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/aarch64-detection.patch (added)
+++ packages/scilab/branches/5.5/debian/patches/aarch64-detection.patch Sun Oct 18 20:51:22 2015
@@ -0,0 +1,15 @@
+Description: Fix Aarch64 detection
+Author: Martin Michlmayr <tbm at cyrius.com>
+
+--- scilab-5.5.2.orig/bin/scilab
++++ scilab-5.5.2/bin/scilab
+@@ -540,6 +540,9 @@ detect_java_vm() {
+ armv*)
+ proc="arm"
+ ;;
++ aarch64)
++ proc="aarch64"
++ ;;
+ *)
+ echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us on http://bugzilla.scilab.org"
+ ;;
Added: packages/scilab/branches/5.5/debian/patches/batik-1.8.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/batik-1.8.diff?rev=47142&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/batik-1.8.diff (added)
+++ packages/scilab/branches/5.5/debian/patches/batik-1.8.diff Sun Oct 18 20:51:22 2015
@@ -0,0 +1,16 @@
+Description: adapt to batik 1.8 API
+ New path for class SAXSVGDocumentFactory.
+Author: Gilles Filippini <pini at debian.org>
+Index: scilab-5.5.2/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
+===================================================================
+--- scilab-5.5.2.orig/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
++++ scilab-5.5.2/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
+@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentL
+ import org.apache.batik.bridge.GVTBuilder;
+ import org.apache.batik.bridge.UserAgent;
+ import org.apache.batik.bridge.UserAgentAdapter;
+-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
++import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+ import org.apache.batik.gvt.GraphicsNode;
+ import org.apache.batik.util.XMLResourceDescriptor;
+ import org.scilab.forge.jlatexmath.ParseException;
Added: packages/scilab/branches/5.5/debian/patches/fop-2.0.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/fop-2.0.diff?rev=47142&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/fop-2.0.diff (added)
+++ packages/scilab/branches/5.5/debian/patches/fop-2.0.diff Sun Oct 18 20:51:22 2015
@@ -0,0 +1,57 @@
+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));
Added: packages/scilab/branches/5.5/debian/patches/jvm-archdir-ppc64le.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/jvm-archdir-ppc64le.diff?rev=47142&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/jvm-archdir-ppc64le.diff (added)
+++ packages/scilab/branches/5.5/debian/patches/jvm-archdir-ppc64le.diff Sun Oct 18 20:51:22 2015
@@ -0,0 +1,20 @@
+Index: b/m4/java.m4
+===================================================================
+--- a/m4/java.m4
++++ b/m4/java.m4
+@@ -481,7 +481,14 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+ powerpc)
+ machine=ppc
+ ;;
+- ppc64|ppc64le)
++ ppc64le)
++ if test -d $ac_java_jvm_dir/jre/lib/ppc64le/server; then
++ machine=ppc64le
++ else
++ machine=ppc64le
++ fi
++ ;;
++ ppc64)
+ machine=ppc64
+ ;;
+ armv*)
Modified: packages/scilab/branches/5.5/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/series?rev=47142&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series (original)
+++ packages/scilab/branches/5.5/debian/patches/series Sun Oct 18 20:51:22 2015
@@ -5,3 +5,8 @@
jh.diff
depend-scicos.diff
missing-lib.diff
+xmlgraphics-commons-2.0.diff
+fop-2.0.diff
+batik-1.8.diff
+jvm-archdir-ppc64le.diff
+aarch64-detection.patch
Added: packages/scilab/branches/5.5/debian/patches/xmlgraphics-commons-2.0.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/xmlgraphics-commons-2.0.diff?rev=47142&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/xmlgraphics-commons-2.0.diff (added)
+++ packages/scilab/branches/5.5/debian/patches/xmlgraphics-commons-2.0.diff Sun Oct 18 20:51:22 2015
@@ -0,0 +1,88 @@
+Description: adapt to xmlgraphics-commons 2.0 API
+ New signature fo PSGraphics2D.processShape:
+ int PSGraphics2D.processShape(Shape s, boolean cached)
+Author: Gilles Filippini <pini at debian.org>
+Index: scilab-5.5.2/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
+===================================================================
+--- scilab-5.5.2.orig/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
++++ scilab-5.5.2/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
+@@ -857,7 +857,7 @@ public class Export {
+ }
+
+ @Override
+- public int processShape(Shape s) throws IOException {
++ public int processShape(Shape s, boolean cached) throws IOException {
+ if (s instanceof Ellipse2D.Double) {
+ Ellipse2D.Double ell = (Ellipse2D.Double) s;
+ if (ell.height == ell.width) {
+@@ -880,10 +880,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, cached);
+ }
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+
+ for (; !it.isDone(); it.next()) {
+@@ -891,7 +891,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, cached);
+ }
+ }
+ buffer.append("] DP");
+@@ -899,7 +899,7 @@ public class Export {
+ return PathIterator.WIND_NON_ZERO;
+ }
+
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+ };
+ g2d.setGraphicContext(new GraphicContext());
+@@ -1029,7 +1029,7 @@ public class Export {
+ }
+
+ @Override
+- public int processShape(Shape s) throws IOException {
++ public int processShape(Shape s, boolean cached) throws IOException {
+ if (s instanceof Ellipse2D.Double) {
+ Ellipse2D.Double ell = (Ellipse2D.Double) s;
+ if (ell.height == ell.width) {
+@@ -1052,10 +1052,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, cached);
+ }
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+
+ for (; !it.isDone(); it.next()) {
+@@ -1063,7 +1063,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, cached);
+ }
+ }
+ buffer.append("] DP");
+@@ -1071,7 +1071,7 @@ public class Export {
+ return PathIterator.WIND_NON_ZERO;
+ }
+
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+
+ };
More information about the debian-science-commits
mailing list