Attachment #6940 for bug #31794

View | Details | Raw Unified | Return to bug 31794
Collapse All | Expand All

Lines 23-28 Patch1: scilab-5.4.0-find-jhall.patch Link Here

(-)a/scilab.spec (-2 / +12 lines)
23	Patch2: scilab-5.4.0-find-jgoodies-looks.patch	23	Patch2: scilab-5.4.0-find-jgoodies-looks.patch
24	Patch3: scilab-5.4.0-find-xml-apis-ext.patch	24	Patch3: scilab-5.4.0-find-xml-apis-ext.patch
25	Patch4: scilab-fix-make-doc-ja_JP.patch	25	Patch4: scilab-fix-make-doc-ja_JP.patch
		26	Patch5: scilab-5.5.2-jogl-2.3.patch
		27	Patch6: scilab-5.5.2-batik-1.8.patch
		28	Patch7: scilab-5.5.2-fop-2.0.patch
		29	Patch8: scilab-5.5.2-xmlgraphics-commons-2.0.patch
		30	Patch9: scilab-5.5.2-disable-doclint.patch
26		31
27	URL: http://www.scilab.org	32	URL: http://www.scilab.org
28	AutoReq: yes, noshell	33	AutoReq: yes, noshell
Lines 48-54 BuildRequires: ant Link Here
48		53
49	BuildRequires: flexdock >= 1.0	54	BuildRequires: flexdock >= 1.0
50	BuildRequires: gluegen2	55	BuildRequires: gluegen2
51	BuildRequires: jogl2 >= 2.2	56	BuildRequires: jogl2 >= 2.3
52	BuildRequires: libGL-devel	57	BuildRequires: libGL-devel
53	BuildRequires: jrosetta >= 1.0.4	58	BuildRequires: jrosetta >= 1.0.4
54		59
Lines 101-106 BuildRequires: libcurl-devel Link Here
101	BuildRequires: fonts-ttf-liberation	106	BuildRequires: fonts-ttf-liberation
102		107
103	Requires: flexdock jrosetta	108	Requires: flexdock jrosetta
		109	Requires: scirenderer saxon
104	Requires: apache-commons-logging	110	Requires: apache-commons-logging
105	Requires: javahelp2	111	Requires: javahelp2
106	Requires: jlatexmath >= 1.0.2	112	Requires: jlatexmath >= 1.0.2
Lines 134-139 tar xf %SOURCE1 Link Here
134	%patch2 -p2	140	%patch2 -p2
135	%patch3 -p2	141	%patch3 -p2
136	%patch4 -p1	142	%patch4 -p1
		143	%patch5 -p2
		144	%patch6 -p2
		145	%patch7 -p2
		146	%patch8 -p2
		147	%patch9 -p2
137		148
138	# Update saxon dependency	149	# Update saxon dependency
139	# http://bugzilla.scilab.org/show_bug.cgi?id=8479	150	# http://bugzilla.scilab.org/show_bug.cgi?id=8479
Lines 194-200 rm -f %buildroot%_xdgmimedir/packages/scilab.xml Link Here
194	- New version (ALT #31794)	205	- New version (ALT #31794)
195	- Build from upstream git repository	206	- Build from upstream git repository
196	- Require version-independed JDK	207	- Require version-independed JDK
197	- Disable scirenderer
198		208
199	* Sun Nov 16 2014 Andrey Cherepanov <cas@altlinux.org> 5.5.1-alt1	209	* Sun Nov 16 2014 Andrey Cherepanov <cas@altlinux.org> 5.5.1-alt1
200	- New version	210	- New version




diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
index ddf6d1b..3613193 100644
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader;
 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;




diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index 5f80c2a..0b7fdd5 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -2100,6 +2100,7 @@ check-libstdcpp-dep:
 # module
 javadoc:
 	$(JAVADOC) -noindex -nohelp -nonavbar -notree \
+	-Xdoclint:none \
 	-d $(top_builddir)/modules/javasci/javadoc \
 	-sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java::$(top_srcdir)/modules/localization/src/java \
 	org.scilab.modules.javasci org.scilab.modules.types
@@ -2113,6 +2114,7 @@ javadoc-all:
 		LISTPKG="$$LISTPKG org.scilab.modules.$$MODULE"; \
 	done; \
 	$(JAVADOC) \
+	-Xdoclint:none \
 	-d $(top_builddir)/javadocall \
 	-sourcepath $$LISTMODULES \
 	$$LISTPKG




diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
index c34f4aa..ed2df07 100644
--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
+++ b/scilab/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();
+            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));
diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
index bf8afd3..5ff6004 100644
--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
@@ -114,11 +114,10 @@ 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);




diff --git a/scilab/configure b/scilab/configure
index 13eafb1..a9a3eff 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -14264,7 +14264,7 @@ $as_echo_n "checking jogl2... " >&6; }
 // #line 14264 "configure"
 import java.util.regex.Pattern;
 
-import javax.media.opengl.glu.GLUnurbs;
+import jogamp.opengl.x11.glx.GLX;
 
 public class conftest {
     public static void main(String[] argv) {
@@ -14350,10 +14350,10 @@ $as_echo "$jar_resolved" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
       if test "" = "yes"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&5
-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&2;}
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.3 (looking for package jogamp.opengl.x11.glx.GLX)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.3 (looking for package jogamp.opengl.x11.glx.GLX)" >&2;}
       else
-          as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" "$LINENO" 5
+          as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.3 (looking for package jogamp.opengl.x11.glx.GLX)" "$LINENO" 5
       fi
     fi
 
@@ -14649,7 +14649,7 @@ $as_echo_n "checking gluegen2-rt... " >&6; }
 // #line 14649 "configure"
 import java.util.regex.Pattern;
 
-import jogamp.common.os.MachineDescriptionRuntime;
+import com.jogamp.common.os.Platform;
 
 public class conftest {
     public static void main(String[] argv) {
@@ -14735,10 +14735,10 @@ $as_echo "$jar_resolved" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
       if test "" = "yes"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" >&5
-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" >&2;}
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package com.jogamp.common.os.Platform)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package com.jogamp.common.os.Platform)" >&2;}
       else
-          as_fn_error $? "Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" "$LINENO" 5
+          as_fn_error $? "Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package com.jogamp.common.os.Platform)" "$LINENO" 5
       fi
     fi
 
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 433059f..c6eb9c5 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -912,7 +912,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
                 AC_SUBST(SKINLF)
 
                 # JOGL 2
-                AC_JAVA_CHECK_PACKAGE([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0])
+                AC_JAVA_CHECK_PACKAGE([jogl2],[jogamp.opengl.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.3])
                 JOGL2=$PACKAGE_JAR_FILE
                 AC_SUBST(JOGL2)
 
@@ -943,7 +943,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
                 fi
 
                 # JoGL Native <=> Java connector
-                AC_JAVA_CHECK_PACKAGE([gluegen2-rt],[jogamp.common.os.MachineDescriptionRuntime],[Scilab 3D rendering])
+                AC_JAVA_CHECK_PACKAGE([gluegen2-rt],[com.jogamp.common.os.Platform],[Scilab 3D rendering])
                 GLUEGEN2_RT=$PACKAGE_JAR_FILE
                 AC_SUBST(GLUEGEN2_RT)
 
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
index c1434c0..d91cf1b 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
@@ -84,10 +84,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.awt.GLCanvas;
 import javax.swing.JComponent;
 import javax.swing.JSeparator;
 import javax.swing.SwingUtilities;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
index dc872e5..2bc7d4d 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
@@ -20,7 +20,7 @@ import java.awt.Cursor;
 import java.awt.Font;
 import java.awt.image.BufferedImage;
 
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 
 import org.scilab.modules.gui.canvas.Canvas;
 import org.scilab.modules.gui.canvas.ScilabCanvas;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
index 6554a33..0cb580f 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
@@ -32,8 +32,8 @@ import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
 import java.awt.image.BufferedImage;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLAutoDrawable;
 import javax.swing.JPanel;
 
 import org.scilab.forge.scirenderer.Canvas;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
index 3c5fc99..dc4ad24 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
@@ -19,12 +19,12 @@ import java.awt.HeadlessException;
 import java.util.Calendar;
 import java.util.StringTokenizer;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.awt.GLCanvas;
+import com.jogamp.opengl.awt.GLJPanel;
 
 import org.scilab.modules.action_binding.InterpreterManagement;
 import org.scilab.modules.commons.OS;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
index e7255f8..06d3dc7 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas;
 
 import java.awt.image.BufferedImage;
 
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 
 import org.scilab.modules.gui.dockable.Dockable;
 
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
index 46af840..fe34230 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
@@ -16,7 +16,7 @@ package org.scilab.modules.gui.canvas;
 
 import java.awt.image.BufferedImage;
 
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 
 import org.scilab.modules.gui.bridge.ScilabBridge;
 import org.scilab.modules.gui.dockable.ScilabDockable;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
index 174d93d..a26eea9 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas;
 
 import java.awt.image.BufferedImage;
 
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 
 import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas;
 import org.scilab.modules.gui.utils.Position;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
index 207debd..9790c8b 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
@@ -15,7 +15,7 @@ package org.scilab.modules.gui.canvas;
 import org.scilab.modules.gui.utils.Position;
 import org.scilab.modules.gui.utils.Size;
 
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 import java.awt.image.BufferedImage;
 
 /**
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
index f048402..e3cc37c 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
@@ -16,16 +16,16 @@ import java.awt.image.BufferedImage;
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Semaphore;
 
-import javax.media.opengl.DebugGL2;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLContext;
-import javax.media.opengl.GLDrawableFactory;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLOffscreenAutoDrawable;
-import javax.media.opengl.GLProfile;
+import com.jogamp.opengl.DebugGL2;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLContext;
+import com.jogamp.opengl.GLDrawableFactory;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.GLOffscreenAutoDrawable;
+import com.jogamp.opengl.GLProfile;
 import javax.swing.SwingUtilities;
 
 import org.scilab.forge.scirenderer.Canvas;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
index f82ae92..843d587 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.implementation.jogl;
 
 import org.scilab.forge.scirenderer.Canvas;
 
-import javax.media.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLAutoDrawable;
 
 /**
  * @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
index e27be41..42fca2f 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
@@ -11,7 +11,7 @@
 
 package org.scilab.forge.scirenderer.implementation.jogl;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 /**
  * This class store current OpenGl context capacity.
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
index d7b34d3..d05605c 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
@@ -30,7 +30,7 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManagerImpl;
 import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener;
 import org.scilab.forge.scirenderer.tranformations.Vector3d;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 /**
  *
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
index 86ab16b..ed342db 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
@@ -11,8 +11,8 @@
 
 package org.scilab.forge.scirenderer.implementation.jogl;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.glu.GLU;
 
 /**
  * @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
index 25a1c1b..fbc1ad8 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buffers.DataBuffer;
 import org.scilab.forge.scirenderer.buffers.ElementsBuffer;
 import org.scilab.forge.scirenderer.buffers.IndicesBuffer;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
index 0912785..b609a27 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.buffers;
 
 import org.scilab.forge.scirenderer.buffers.DataBuffer;
 
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 import java.nio.Buffer;
 
 /**
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
index 0824b71..0488d99 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.buffers;
 
 import org.scilab.forge.scirenderer.buffers.ElementsBuffer;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
 
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
index a6678c2..2baebf4 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.buffers;
 
 import org.scilab.forge.scirenderer.buffers.IndicesBuffer;
 
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 import java.nio.Buffer;
 import java.nio.IntBuffer;
 import java.util.Collection;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
index 48722c6..341bed6 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.clipping.ClippingManager;
 import org.scilab.forge.scirenderer.clipping.ClippingPlane;
 import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 /**
  * @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
index dc4361b..9198ddd 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.tranformations.Transformation;
 import org.scilab.forge.scirenderer.tranformations.TransformationFactory;
 import org.scilab.forge.scirenderer.tranformations.Vector4d;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 /**
  * @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
index 87f3099..fa3da7e 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
@@ -23,7 +23,7 @@ import org.scilab.forge.scirenderer.texture.Texture;
 import org.scilab.forge.scirenderer.lightning.LightManager;
 import org.scilab.forge.scirenderer.shapes.appearance.Material;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
index 2a99c41..9f8ac14 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
@@ -11,7 +11,7 @@
 
 package org.scilab.forge.scirenderer.implementation.jogl.lightning;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import org.scilab.forge.scirenderer.implementation.jogl.utils.GLShortCuts;
 import org.scilab.forge.scirenderer.lightning.Light;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
index 4621f50..c35096a 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.lightning.Light;
 import org.scilab.forge.scirenderer.lightning.LightManager;
 import org.scilab.forge.scirenderer.shapes.appearance.Material;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 /**
  * JoGL implementation of {@link LightManager}
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
index 799c93e..d90ccee 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
@@ -11,7 +11,7 @@
 
 package org.scilab.forge.scirenderer.implementation.jogl.picking;
 
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 
 /**
  * @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
index dbb3dd7..7470c81 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools;
 import org.scilab.forge.scirenderer.picking.PickingTools;
 import org.scilab.forge.scirenderer.tranformations.Vector3d;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 import java.awt.Point;
 import java.nio.FloatBuffer;
 
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
index cc43ada..c0df74f 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.Drawer;
 import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools;
 import org.scilab.forge.scirenderer.renderer.Renderer;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 /**
  * @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
index ed10de4..f24d544 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools;
 import org.scilab.forge.scirenderer.renderer.Renderer;
 import org.scilab.forge.scirenderer.renderer.RendererManager;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Stack;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
index 71876e1..5d6d95e 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
@@ -28,11 +28,11 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManager;
 import org.scilab.forge.scirenderer.tranformations.Vector3d;
 
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2ES1;
-import javax.media.opengl.GL2GL3;
-import javax.media.opengl.GLProfile;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GL2ES1;
+import com.jogamp.opengl.GL2GL3;
+import com.jogamp.opengl.GLProfile;
 import java.awt.Dimension;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
index 7928a7e..5273573 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.utils;
 import org.scilab.forge.scirenderer.shapes.appearance.Appearance;
 import org.scilab.forge.scirenderer.shapes.appearance.Color;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 /**
  *




diff --git a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
index 68a1cf9..8317dff 100644
--- a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
+++ b/scilab/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 b) 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, b);
                                 }
                             } else {
-                                return super.processShape(s);
+                                return super.processShape(s, b);
                             }
 
                             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, b);
                                 }
                             }
                             buffer.append("] DP");
@@ -899,7 +899,7 @@ public class Export {
                             return PathIterator.WIND_NON_ZERO;
                         }
 
-                        return super.processShape(s);
+                        return super.processShape(s, b);
                     }
                 };
                 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 b) 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, b);
                                 }
                             } else {
-                                return super.processShape(s);
+                                return super.processShape(s, b);
                             }
 
                             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, b);
                                 }
                             }
                             buffer.append("] DP");
@@ -1071,7 +1071,7 @@ public class Export {
                             return PathIterator.WIND_NON_ZERO;
                         }
 
-                        return super.processShape(s);
+                        return super.processShape(s, b);
                     }
 
                 };

Return to bug 31794

Line 0 Link Here

(-)a/scilab-5.5.2-batik-1.8.patch (+13 lines)
	1	diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
	2	index ddf6d1b..3613193 100644
	3	--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
	4	+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
	5	@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader;
	6	import org.apache.batik.bridge.GVTBuilder;
	7	import org.apache.batik.bridge.UserAgent;
	8	import org.apache.batik.bridge.UserAgentAdapter;
	9	-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
	10	+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
	11	import org.apache.batik.gvt.GraphicsNode;
	12	import org.apache.batik.util.XMLResourceDescriptor;
	13	import org.scilab.forge.jlatexmath.ParseException;

Line 0 Link Here

(-)a/scilab-5.5.2-disable-doclint.patch (+20 lines)
	1	diff --git a/scilab/Makefile.in b/scilab/Makefile.in
	2	index 5f80c2a..0b7fdd5 100644
	3	--- a/scilab/Makefile.in
	4	+++ b/scilab/Makefile.in
	5	@@ -2100,6 +2100,7 @@ check-libstdcpp-dep:
	6	# module
	7	javadoc:
	8	$(JAVADOC) -noindex -nohelp -nonavbar -notree \
	9	+ -Xdoclint:none \
	10	-d $(top_builddir)/modules/javasci/javadoc \
	11	-sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java::$(top_srcdir)/modules/localization/src/java \
	12	org.scilab.modules.javasci org.scilab.modules.types
	13	@@ -2113,6 +2114,7 @@ javadoc-all:
	14	LISTPKG="$$LISTPKG org.scilab.modules.$$MODULE"; \
	15	done; \
	16	$(JAVADOC) \
	17	+ -Xdoclint:none \
	18	-d $(top_builddir)/javadocall \
	19	-sourcepath $$LISTMODULES \
	20	$$LISTPKG

Line 0 Link Here

(-)a/scilab-5.5.2-fop-2.0.patch (+34 lines)
	1	diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
	2	index c34f4aa..ed2df07 100644
	3	--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
	4	+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
	5	@@ -43,10 +43,10 @@ public class FopConverter extends ContainerConverter {
	6	String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase();
	7
	8	try {
	9	- FopFactory fopFactory = FopFactory.newInstance();
	10	+ final File configuration = new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml");
	11	+ FopFactory fopFactory = FopFactory.newInstance(configuration);
	12	fopFactory.addElementMapping(new JLaTeXMathElementMapping());
	13	fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler());
	14	- fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
	15
	16	// Step 3: Construct fop with desired output format
	17	OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName));
	18	diff --git a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
	19	index bf8afd3..5ff6004 100644
	20	--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
	21	+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
	22	@@ -114,11 +114,10 @@ public class CodeExporter extends FOCodeConverter {
	23	* @param format the page format
	24	*/
	25	public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) {
	26	- FopFactory fopFactory = FopFactory.newInstance();
	27	OutputStream out = null;
	28
	29	try {
	30	- fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
	31	+ FopFactory fopFactory = FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
	32	FOUserAgent userAgent = fopFactory.newFOUserAgent();
	33	userAgent.setProducer(CREATOR);
	34	userAgent.setTitle(title);

Line 0 Link Here

(-)a/scilab-5.5.2-xmlgraphics-commons-2.0.patch (+84 lines)
		1	diff --git a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
		2	index 68a1cf9..8317dff 100644
		3	--- a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
		4	+++ b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
		5	@@ -857,7 +857,7 @@ public class Export {
		6	}
		7
		8	@Override
		9	- public int processShape(Shape s) throws IOException {
		10	+ public int processShape(Shape s, boolean b) throws IOException {
		11	if (s instanceof Ellipse2D.Double) {
		12	Ellipse2D.Double ell = (Ellipse2D.Double) s;
		13	if (ell.height == ell.width) {
		14	@@ -880,10 +880,10 @@ public class Export {
		15	buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
		16	it.next();
		17	} else {
		18	- return super.processShape(s);
		19	+ return super.processShape(s, b);
		20	}
		21	} else {
		22	- return super.processShape(s);
		23	+ return super.processShape(s, b);
		24	}
		25
		26	for (; !it.isDone(); it.next()) {
		27	@@ -891,7 +891,7 @@ public class Export {
		28	if (type == PathIterator.SEG_LINETO) {
		29	buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
		30	} else {
		31	- return super.processShape(s);
		32	+ return super.processShape(s, b);
		33	}
		34	}
		35	buffer.append("] DP");
		36	@@ -899,7 +899,7 @@ public class Export {
		37	return PathIterator.WIND_NON_ZERO;
		38	}
		39
		40	- return super.processShape(s);
		41	+ return super.processShape(s, b);
		42	}
		43	};
		44	g2d.setGraphicContext(new GraphicContext());
		45	@@ -1029,7 +1029,7 @@ public class Export {
		46	}
		47
		48	@Override
		49	- public int processShape(Shape s) throws IOException {
		50	+ public int processShape(Shape s, boolean b) throws IOException {
		51	if (s instanceof Ellipse2D.Double) {
		52	Ellipse2D.Double ell = (Ellipse2D.Double) s;
		53	if (ell.height == ell.width) {
		54	@@ -1052,10 +1052,10 @@ public class Export {
		55	buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
		56	it.next();
		57	} else {
		58	- return super.processShape(s);
		59	+ return super.processShape(s, b);
		60	}
		61	} else {
		62	- return super.processShape(s);
		63	+ return super.processShape(s, b);
		64	}
65
66	for (; !it.isDone(); it.next()) {
67	@@ -1063,7 +1063,7 @@ public class Export {
68	if (type == PathIterator.SEG_LINETO) {
69	buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
70	} else {
71	- return super.processShape(s);
72	+ return super.processShape(s, b);
73	}
74	}
75	buffer.append("] DP");
76	@@ -1071,7 +1071,7 @@ public class Export {
77	return PathIterator.WIND_NON_ZERO;
78	}
79
80	- return super.processShape(s);
81	+ return super.processShape(s, b);
82	}
83
84	};