Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2020-02-28 15:22:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab" Fri Feb 28 15:22:08 2020 rev:33 rq:780196 version:6.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2019-11-21 12:58:48.082525400 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new.26092/scilab.changes 2020-02-28 15:22:14.702003517 +0100 @@ -1,0 +2,13 @@ +Tue Feb 25 14:11:32 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Update to version 6.1.0: + See https://help.scilab.org/docs/6.1.0/en_US/CHANGES.html. +- Drop scilab-fix-build-with-modern-lucene.patch: incorporated + upstream. +- Add scilab-unicode-in-copyright-header.patch: Replace a unicode + character in a copyright header as compilation fails due to it. +- GCC >= 8 is now required. +- Minor rebase of existing patches to apply cleanly against + updated sources. + +------------------------------------------------------------------- Old: ---- scilab-6.0.2-src.tar.gz scilab-fix-build-with-modern-lucene.patch New: ---- scilab-6.1.0-src.tar.gz scilab-unicode-in-copyright-header.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scilab.spec ++++++ --- /var/tmp/diff_new_pack.DY7264/_old 2020-02-28 15:22:16.158006481 +0100 +++ /var/tmp/diff_new_pack.DY7264/_new 2020-02-28 15:22:16.162006490 +0100 @@ -1,7 +1,7 @@ # # spec file for package scilab # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Summary: High Level Programming Language/Numerical Analysis Software License: GPL-2.0-only AND BSD-3-Clause Group: Productivity/Scientific/Math -Version: 6.0.2 +Version: 6.1.0 Release: 0 URL: http://www.scilab.org # FOR STABLE RELEASE @@ -58,8 +58,8 @@ Patch26: scilab-java_source_target.patch # PATCH-FIX-UPSTREAM scilab-drop-javax-annotation.patch [email protected] -- Remove references to javax.annotation as it is unavailable with java >= 11 and the code referencing this doesn't do anything anyway Patch27: scilab-drop-javax-annotation.patch -# PATCH-FIX-OPENSUSE scilab-fix-build-with-modern-lucene.patch - Build against lucene 7 -Patch28: scilab-fix-build-with-modern-lucene.patch +# PATCH-FIX-UPSTREAM scilab-unicode-in-copyright-header.patch [email protected] -- Compilation fails due to unicode in copyight header +Patch28: scilab-unicode-in-copyright-header.patch ExcludeArch: i586 ppc64 # SECTION Dependency to rebuild configure after patching autotools files @@ -76,15 +76,15 @@ %endif BuildRequires: eigen3-devel >= 3.3.2 BuildRequires: f2c -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: gcc-fortran +BuildRequires: gcc >= 8 +BuildRequires: gcc-c++ >= 8 +BuildRequires: gcc-fortran >= 8 BuildRequires: time ## for dynamic link features -Requires: gcc -Requires: gcc-c++ -Requires: gcc-fortran +Requires: gcc >= 8 +Requires: gcc-c++ >= 8 +Requires: gcc-fortran >= 8 # Core BuildRequires: libcurl-devel BuildRequires: libxml2-devel ++++++ scilab-6.0.2-src.tar.gz -> scilab-6.1.0-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/scilab/scilab-6.0.2-src.tar.gz /work/SRC/openSUSE:Factory/.scilab.new.26092/scilab-6.1.0-src.tar.gz differ: char 5, line 1 ++++++ scilab-bin-correct-java9-path.patch ++++++ --- /var/tmp/diff_new_pack.DY7264/_old 2020-02-28 15:22:16.194006554 +0100 +++ /var/tmp/diff_new_pack.DY7264/_new 2020-02-28 15:22:16.194006554 +0100 @@ -1,8 +1,8 @@ -Index: scilab-6.0.2/bin/scilab +Index: scilab-6.1.0/bin/scilab =================================================================== ---- scilab-6.0.2.orig/bin/scilab -+++ scilab-6.0.2/bin/scilab -@@ -493,12 +493,7 @@ detect_java_vm() { +--- scilab-6.1.0.orig/bin/scilab ++++ scilab-6.1.0/bin/scilab +@@ -523,12 +523,7 @@ detect_java_vm() { if test $SCIVERBOSE -ne 0; then echo "JAVA_HOME : $JAVA_HOME" fi @@ -16,7 +16,7 @@ # Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and libxxxx.so case $OS in -@@ -604,7 +599,7 @@ detect_java_vm() { +@@ -634,7 +629,7 @@ detect_java_vm() { fi # IS_SCILAB_BINARY # Check if the lib exists @@ -25,7 +25,7 @@ if test ! -f "$LIBJAVA"; then if test $SCIVERBOSE -ne 0; then echo "Cannot find $LIBJAVA" -@@ -613,7 +608,7 @@ detect_java_vm() { +@@ -643,7 +638,7 @@ detect_java_vm() { CLASSPATH="${CLASSPATH:+:$CLASSPATH}$SCI/modules/core/jar/org.scilab.modules.core.jar" # @TODO This is the default path of the official sun JVM. # It is different for other implementation of the JVM.... @@ -34,7 +34,7 @@ fi # Bug http://bugzilla.scilab.org/show_bug.cgi?id=14290 - -@@ -650,7 +645,7 @@ if test $IS_SCILAB_BINARY -eq 1; then +@@ -680,7 +675,7 @@ if test $IS_SCILAB_BINARY -eq 1; then TCL_LIBRARY="$SCIBINARYBASE/thirdparty/tcl8.5" TK_LIBRARY="$SCIBINARYBASE/thirdparty/tk8.5" fi @@ -43,7 +43,7 @@ DOCBOOK_ROOT="$SCI/../../thirdparty/docbook" PATH="$PATH:$SCI/modules/scicos/" -@@ -832,7 +827,7 @@ SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/li +@@ -862,7 +857,7 @@ SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/li if test -d "$SCI/lib/thirdparty"; then SCILIB=$SCI/lib/thirdparty:$SCILIB; fi @@ -52,7 +52,7 @@ if test -d "$SCI/lib/thirdparty/redist"; then LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SCI/lib/thirdparty/redist; fi -@@ -879,6 +874,7 @@ case $OS in +@@ -909,6 +904,7 @@ case $OS in *) esac @@ -60,7 +60,7 @@ if test $SCIVERBOSE -ne 0; then echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH" -@@ -1182,6 +1178,7 @@ if test "$rest" = "yes"; then +@@ -1217,6 +1213,7 @@ if test "$rest" = "yes"; then esac done ++++++ scilab-build-with-jogl-2.3.patch ++++++ --- /var/tmp/diff_new_pack.DY7264/_old 2020-02-28 15:22:16.202006571 +0100 +++ /var/tmp/diff_new_pack.DY7264/_new 2020-02-28 15:22:16.202006571 +0100 @@ -1,8 +1,8 @@ http://bugzilla.scilab.org/show_bug.cgi?id=13809 -Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/SwingView.java +Index: scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/SwingView.java =================================================================== ---- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/SwingView.java -+++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/SwingView.java +--- scilab-6.1.0.orig/modules/gui/src/java/org/scilab/modules/gui/SwingView.java ++++ scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/SwingView.java @@ -88,10 +88,10 @@ import java.util.Map; import java.util.Set; import java.util.UUID; @@ -18,10 +18,10 @@ import javax.swing.JComponent; import javax.swing.JSeparator; import javax.swing.SwingUtilities; -Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java +Index: scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java =================================================================== ---- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java -+++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java +--- scilab-6.1.0.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java ++++ scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java @@ -23,7 +23,7 @@ import java.awt.Cursor; import java.awt.Font; import java.awt.image.BufferedImage; @@ -31,10 +31,10 @@ import org.scilab.modules.gui.canvas.Canvas; import org.scilab.modules.gui.canvas.ScilabCanvas; -Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java +Index: scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java =================================================================== ---- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java -+++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java +--- scilab-6.1.0.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java ++++ scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java @@ -35,8 +35,8 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; import java.awt.image.BufferedImage; @@ -46,10 +46,10 @@ import javax.swing.JPanel; import org.scilab.forge.scirenderer.Canvas; -Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java +Index: scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java =================================================================== ---- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java -+++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java +--- scilab-6.1.0.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java ++++ scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java @@ -22,12 +22,12 @@ import java.awt.HeadlessException; import java.util.Calendar; import java.util.StringTokenizer; @@ -69,10 +69,10 @@ import org.scilab.modules.action_binding.InterpreterManagement; import org.scilab.modules.commons.OS; -Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java +Index: scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java =================================================================== ---- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java -+++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java +--- scilab-6.1.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java ++++ scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java @@ -17,7 +17,7 @@ package org.scilab.modules.gui.canvas; import java.awt.image.BufferedImage; @@ -82,10 +82,10 @@ import org.scilab.modules.gui.dockable.Dockable; -Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java +Index: scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java =================================================================== ---- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java -+++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java +--- scilab-6.1.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java ++++ scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java @@ -19,7 +19,7 @@ package org.scilab.modules.gui.canvas; import java.awt.image.BufferedImage; @@ -95,10 +95,10 @@ import org.scilab.modules.gui.bridge.ScilabBridge; import org.scilab.modules.gui.dockable.ScilabDockable; -Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java +Index: scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java =================================================================== ---- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java -+++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java +--- scilab-6.1.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java ++++ scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java @@ -17,7 +17,7 @@ package org.scilab.modules.gui.canvas; import java.awt.image.BufferedImage; @@ -108,10 +108,10 @@ import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas; import org.scilab.modules.gui.utils.Position; -Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java +Index: scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java =================================================================== ---- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java -+++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java +--- scilab-6.1.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java ++++ scilab-6.1.0/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java @@ -18,7 +18,7 @@ package org.scilab.modules.gui.canvas; import org.scilab.modules.gui.utils.Position; import org.scilab.modules.gui.utils.Size; @@ -121,10 +121,10 @@ import java.awt.image.BufferedImage; /** -Index: scilab-6.0.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java +Index: scilab-6.1.0/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java -+++ scilab-6.0.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java +--- scilab-6.1.0.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java ++++ scilab-6.1.0/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java @@ -13,8 +13,8 @@ import org.scilab.forge.scirenderer.tran import org.scilab.forge.scirenderer.tranformations.TransformationFactory; import org.scilab.forge.scirenderer.utils.shapes.geometry.CubeFactory; @@ -136,10 +136,10 @@ import javax.swing.*; import java.awt.*; -Index: scilab-6.0.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java +Index: scilab-6.1.0/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java -+++ scilab-6.0.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java +--- scilab-6.1.0.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java ++++ scilab-6.1.0/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java @@ -18,7 +18,7 @@ import com.jogamp.opengl.util.Animator; import org.scilab.forge.scirenderer.Canvas; import org.scilab.forge.scirenderer.implementation.jogl.JoGLCanvasFactory; @@ -149,41 +149,10 @@ import javax.swing.JFrame; import javax.swing.JPanel; import java.awt.BorderLayout; -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java -@@ -19,16 +19,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; -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java -=================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java @@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp import org.scilab.forge.scirenderer.Canvas; @@ -193,10 +162,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java @@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl; @@ -206,10 +175,10 @@ /** * This class store current OpenGl context capacity. -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java @@ -34,7 +34,7 @@ import org.scilab.forge.scirenderer.tran import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener; import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -219,10 +188,10 @@ /** * -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java @@ -14,8 +14,8 @@ package org.scilab.forge.scirenderer.implementation.jogl; @@ -234,10 +203,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java @@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.buff import org.scilab.forge.scirenderer.buffers.ElementsBuffer; import org.scilab.forge.scirenderer.buffers.IndicesBuffer; @@ -247,10 +216,10 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java @@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp import org.scilab.forge.scirenderer.buffers.DataBuffer; @@ -260,10 +229,10 @@ import java.nio.Buffer; /** -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java @@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp import org.scilab.forge.scirenderer.buffers.ElementsBuffer; @@ -273,10 +242,10 @@ import java.nio.Buffer; import java.nio.FloatBuffer; -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java @@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp import org.scilab.forge.scirenderer.buffers.IndicesBuffer; @@ -286,10 +255,10 @@ import java.nio.Buffer; import java.nio.IntBuffer; import java.util.Collection; -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java @@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.clip import org.scilab.forge.scirenderer.clipping.ClippingPlane; import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; @@ -299,10 +268,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java @@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.tran import org.scilab.forge.scirenderer.tranformations.TransformationFactory; import org.scilab.forge.scirenderer.tranformations.Vector4d; @@ -312,10 +281,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java @@ -26,7 +26,7 @@ import org.scilab.forge.scirenderer.text import org.scilab.forge.scirenderer.lightning.LightManager; import org.scilab.forge.scirenderer.shapes.appearance.Material; @@ -325,10 +294,10 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java @@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.lightning; @@ -338,10 +307,10 @@ import org.scilab.forge.scirenderer.implementation.jogl.utils.GLShortCuts; import org.scilab.forge.scirenderer.lightning.Light; -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java @@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.ligh import org.scilab.forge.scirenderer.lightning.LightManager; import org.scilab.forge.scirenderer.shapes.appearance.Material; @@ -351,10 +320,10 @@ /** * JoGL implementation of {@link LightManager} -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java @@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.picking; @@ -364,10 +333,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java @@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.impl import org.scilab.forge.scirenderer.picking.PickingTools; import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -377,10 +346,10 @@ import java.awt.Point; import java.nio.FloatBuffer; -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java @@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.Draw import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; import org.scilab.forge.scirenderer.renderer.Renderer; @@ -390,10 +359,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java @@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.impl import org.scilab.forge.scirenderer.renderer.Renderer; import org.scilab.forge.scirenderer.renderer.RendererManager; @@ -403,10 +372,10 @@ import java.util.HashSet; import java.util.Set; import java.util.Stack; -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java @@ -32,11 +32,11 @@ import org.scilab.forge.scirenderer.tran import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -424,10 +393,10 @@ import java.awt.Dimension; import java.nio.ByteBuffer; import java.nio.FloatBuffer; -Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java =================================================================== ---- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java -+++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java @@ -17,7 +17,7 @@ package org.scilab.forge.scirenderer.imp import org.scilab.forge.scirenderer.shapes.appearance.Appearance; import org.scilab.forge.scirenderer.shapes.appearance.Color; @@ -437,20 +406,20 @@ /** * -Index: scilab-6.0.2/configure.ac +Index: scilab-6.1.0/configure.ac =================================================================== ---- scilab-6.0.2.orig/configure.ac -+++ scilab-6.0.2/configure.ac -@@ -942,7 +942,7 @@ if test "$with_javasci" != no -o "$with_ +--- scilab-6.1.0.orig/configure.ac ++++ scilab-6.1.0/configure.ac +@@ -952,7 +952,7 @@ if test "$with_javasci" != no -o "$with_ AC_SUBST(SKINLF) # JOGL 2 -- AC_JAVA_CHECK_JAR([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0]) -+ AC_JAVA_CHECK_JAR([jogl2],[com.jogamp.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0]) +- AC_JAVA_CHECK_JAR([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0], [], [], [2.2]) ++ AC_JAVA_CHECK_JAR([jogl2],[com.jogamp.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0], [], [], [2.2]) JOGL2=$PACKAGE_JAR_FILE AC_SUBST(JOGL2) -@@ -973,7 +973,7 @@ interface for JOGL2 - or libGL (OpenGL l +@@ -981,7 +981,7 @@ interface for JOGL2 - or libGL (OpenGL l fi # JoGL Native <=> Java connector @@ -459,3 +428,36 @@ GLUEGEN2_RT=$PACKAGE_JAR_FILE AC_SUBST(GLUEGEN2_RT) +Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +=================================================================== +--- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java ++++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +@@ -20,17 +20,17 @@ 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.awt.GLJPanel; +-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.awt.GLJPanel; ++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; ++++++ scilab-java9-ClassLoader.patch ++++++ --- /var/tmp/diff_new_pack.DY7264/_old 2020-02-28 15:22:16.214006595 +0100 +++ /var/tmp/diff_new_pack.DY7264/_new 2020-02-28 15:22:16.214006595 +0100 @@ -1,7 +1,7 @@ -Index: scilab-6.0.2/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java +Index: scilab-6.1.0/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java =================================================================== ---- scilab-6.0.2.orig/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java -+++ scilab-6.0.2/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java +--- scilab-6.1.0.orig/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java ++++ scilab-6.1.0/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java @@ -62,7 +62,7 @@ public class ClassPath { */ public static void addURL(final URL u, int i) { @@ -26,11 +26,11 @@ return paths; } -Index: scilab-6.0.2/bin/scilab +Index: scilab-6.1.0/bin/scilab =================================================================== ---- scilab-6.0.2.orig/bin/scilab -+++ scilab-6.0.2/bin/scilab -@@ -620,6 +620,10 @@ detect_java_vm() { +--- scilab-6.1.0.orig/bin/scilab ++++ scilab-6.1.0/bin/scilab +@@ -650,6 +650,10 @@ detect_java_vm() { ;; esac @@ -40,4 +40,4 @@ + ####### END OF JAVA ENV DETECTION/SETTING ###### } - + ++++++ scilab-no-return-in-non-void.patch ++++++ --- /var/tmp/diff_new_pack.DY7264/_old 2020-02-28 15:22:16.222006612 +0100 +++ /var/tmp/diff_new_pack.DY7264/_new 2020-02-28 15:22:16.222006612 +0100 @@ -1,7 +1,7 @@ -Index: scilab-6.0.2/modules/ast/includes/exps/opexp.hxx +Index: scilab-6.1.0/modules/ast/includes/exps/opexp.hxx =================================================================== ---- scilab-6.0.2.orig/modules/ast/includes/exps/opexp.hxx -+++ scilab-6.0.2/modules/ast/includes/exps/opexp.hxx +--- scilab-6.1.0.orig/modules/ast/includes/exps/opexp.hxx ++++ scilab-6.1.0/modules/ast/includes/exps/opexp.hxx @@ -261,6 +261,7 @@ public: default: return L"unknown"; @@ -10,22 +10,22 @@ } -Index: scilab-6.0.2/modules/ast/src/cpp/analysis/ConstraintManager.cpp +Index: scilab-6.1.0/modules/ast/src/cpp/analysis/ConstraintManager.cpp =================================================================== ---- scilab-6.0.2.orig/modules/ast/src/cpp/analysis/ConstraintManager.cpp -+++ scilab-6.0.2/modules/ast/src/cpp/analysis/ConstraintManager.cpp -@@ -96,6 +96,7 @@ bool ConstraintManager::check(const MPol - } - } +--- scilab-6.1.0.orig/modules/ast/src/cpp/analysis/ConstraintManager.cpp ++++ scilab-6.1.0/modules/ast/src/cpp/analysis/ConstraintManager.cpp +@@ -98,6 +98,7 @@ bool ConstraintManager::check(const MPol + default: + return false; } + return false; } bool ConstraintManager::check(Kind kind, const std::vector<GVN::Value *> & values) -Index: scilab-6.0.2/modules/ast/src/cpp/analysis/InferenceConstraints.cpp +Index: scilab-6.1.0/modules/ast/src/cpp/analysis/InferenceConstraints.cpp =================================================================== ---- scilab-6.0.2.orig/modules/ast/src/cpp/analysis/InferenceConstraints.cpp -+++ scilab-6.0.2/modules/ast/src/cpp/analysis/InferenceConstraints.cpp +--- scilab-6.1.0.orig/modules/ast/src/cpp/analysis/InferenceConstraints.cpp ++++ scilab-6.1.0/modules/ast/src/cpp/analysis/InferenceConstraints.cpp @@ -187,6 +187,7 @@ InferenceConstraint::Result MPolyConstra } } @@ -34,10 +34,10 @@ } MPolyConstraintSet MPolyConstraint::getMPConstraints(const std::vector<GVN::Value *> & values) const -Index: scilab-6.0.2/modules/core/src/fortran/clunit.f +Index: scilab-6.1.0/modules/core/src/fortran/clunit.f =================================================================== ---- scilab-6.0.2.orig/modules/core/src/fortran/clunit.f -+++ scilab-6.0.2/modules/core/src/fortran/clunit.f +--- scilab-6.1.0.orig/modules/core/src/fortran/clunit.f ++++ scilab-6.1.0/modules/core/src/fortran/clunit.f @@ -61,6 +61,7 @@ c character*800 nomfic double precision res ++++++ scilab-special-jarnames.patch ++++++ --- /var/tmp/diff_new_pack.DY7264/_old 2020-02-28 15:22:16.246006660 +0100 +++ /var/tmp/diff_new_pack.DY7264/_new 2020-02-28 15:22:16.246006660 +0100 @@ -1,8 +1,8 @@ -Index: scilab-6.0.2/configure.ac +Index: scilab-6.1.0/configure.ac =================================================================== ---- scilab-6.0.2.orig/configure.ac -+++ scilab-6.0.2/configure.ac -@@ -1040,8 +1040,14 @@ interface for JOGL2 - or libGL (OpenGL l +--- scilab-6.1.0.orig/configure.ac ++++ scilab-6.1.0/configure.ac +@@ -1048,8 +1048,14 @@ interface for JOGL2 - or libGL (OpenGL l ################ Mandatory for graphic_export features ##### # XML to PDF/other Translator @@ -18,7 +18,7 @@ AC_SUBST(FOP) AC_ARG_WITH(emf, [AS_HELP_STRING([--without-emf], -@@ -1107,9 +1113,16 @@ interface for JOGL2 - or libGL (OpenGL l +@@ -1115,9 +1121,16 @@ interface for JOGL2 - or libGL (OpenGL l if test -z "$XML_APIS_EXT"; then # Other other distribs (Ex: Fedora/Redhat) ++++++ scilab-unicode-in-copyright-header.patch ++++++ Index: scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java =================================================================== --- scilab-6.1.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +++ scilab-6.1.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java @@ -1,7 +1,7 @@ /* * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab * Copyright (C) 2009-2011 - DIGITEO - Pierre Lando - * Copyright (C) 2019 - Stéphane MOTTELET + * Copyright (C) 2019 - Stephane MOTTELET * * Copyright (C) 2012 - 2016 - Scilab Enterprises * ++++++ scilab-xcos-java9.patch ++++++ --- /var/tmp/diff_new_pack.DY7264/_old 2020-02-28 15:22:16.258006684 +0100 +++ /var/tmp/diff_new_pack.DY7264/_new 2020-02-28 15:22:16.258006684 +0100 @@ -11,66 +11,10 @@ .../org/scilab/modules/xcos/palette/Palette.java | 2 -- 4 files changed, 5 deletions(-) -Index: scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/actions/ExportAllAction.java +Index: scilab-6.1.0/modules/xcos/src/java/org/scilab/modules/xcos/BrowserView.java =================================================================== ---- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/actions/ExportAllAction.java -+++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/actions/ExportAllAction.java -@@ -46,7 +46,6 @@ import org.scilab.modules.xcos.JavaContr - import org.scilab.modules.xcos.Kind; - import org.scilab.modules.xcos.ObjectProperties; - import org.scilab.modules.xcos.VectorOfScicosID; --import org.scilab.modules.xcos.Xcos; - import org.scilab.modules.xcos.XcosTab; - import org.scilab.modules.xcos.configuration.ConfigurationManager; - import org.scilab.modules.xcos.graph.XcosDiagram; -Index: scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/CodeGenerationAction.java -=================================================================== ---- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/CodeGenerationAction.java -+++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/CodeGenerationAction.java -@@ -20,7 +20,6 @@ package org.scilab.modules.xcos.block.ac - import java.awt.Cursor; - import java.awt.event.ActionEvent; - import java.awt.event.ActionListener; --import java.util.logging.Logger; - import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException; - import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.asynchronousScilabExec; - import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall; -Index: scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/graph/ScicosParameters.java -=================================================================== ---- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/graph/ScicosParameters.java -+++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/graph/ScicosParameters.java -@@ -18,7 +18,6 @@ package org.scilab.modules.xcos.graph; - - import java.beans.PropertyChangeEvent; - import java.beans.PropertyVetoException; --import java.beans.VetoableChangeListener; - import java.beans.VetoableChangeSupport; - import java.io.Serializable; - -Index: scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java -=================================================================== ---- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java -+++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java -@@ -17,7 +17,6 @@ - package org.scilab.modules.xcos.palette; - - import com.mxgraph.model.mxGeometry; --import java.awt.Dimension; - import java.awt.GraphicsEnvironment; - import java.awt.image.BufferedImage; - import java.io.File; -@@ -50,7 +49,6 @@ import org.scilab.modules.xcos.palette.m - import org.scilab.modules.xcos.palette.model.PaletteBlock; - import org.scilab.modules.xcos.palette.model.PaletteNode; - import org.scilab.modules.xcos.palette.model.PreLoaded; --import org.scilab.modules.xcos.palette.view.PaletteManagerPanel; - import org.scilab.modules.xcos.utils.BlockPositioning; - import org.scilab.modules.xcos.utils.XcosConstants; - -Index: scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/BrowserView.java -=================================================================== ---- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/BrowserView.java -+++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/BrowserView.java +--- scilab-6.1.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/BrowserView.java ++++ scilab-6.1.0/modules/xcos/src/java/org/scilab/modules/xcos/BrowserView.java @@ -21,6 +21,7 @@ import java.util.LinkedList; import javax.swing.SwingUtilities; import javax.swing.tree.DefaultMutableTreeNode; @@ -90,10 +34,10 @@ BrowserTreeNodeData data = (BrowserTreeNodeData) node.getUserObject(); if (data.getId() == uid) { return node; -Index: scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/model/Palette.java +Index: scilab-6.1.0/modules/xcos/src/java/org/scilab/modules/xcos/palette/model/Palette.java =================================================================== ---- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/model/Palette.java -+++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/model/Palette.java +--- scilab-6.1.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/model/Palette.java ++++ scilab-6.1.0/modules/xcos/src/java/org/scilab/modules/xcos/palette/model/Palette.java @@ -58,7 +58,7 @@ public abstract class Palette extends Pa * @see javax.swing.tree.TreeNode#children() */ @@ -103,10 +47,10 @@ return null; } -Index: scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java +Index: scilab-6.1.0/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java =================================================================== ---- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java -+++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java +--- scilab-6.1.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java ++++ scilab-6.1.0/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java @@ -22,6 +22,7 @@ import java.awt.event.ActionListener; import java.util.Arrays; import java.util.Iterator;
