From 25cd007a36e4bbae2c39acbd034d6285826618d6 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Wed, 6 Nov 2024 13:15:44 +0100 Subject: [PATCH] update to 2025.0.0 [release 2025.0.0-1mamba;Thu Oct 31 2024] --- scilab-6.1.0-fix-core-link.patch | 30 -- scilab-6.1.0-hdf5_18_api.patch | 81 --- scilab-6.1.0-jogl-2.3.2.patch | 550 --------------------- scilab-6.1.0-libhdf5-1.8.10.patch | 308 ------------ scilab-6.1.0-matio-fix-uint32_t-type.patch | 20 - scilab-6.1.0-ocaml.patch | 30 -- scilab-6.1.0-strict-jar.patch | 29 -- scilab-6.1.1-pause_to_scipause.patch | 51 -- scilab.spec | 147 +++--- 9 files changed, 67 insertions(+), 1179 deletions(-) delete mode 100644 scilab-6.1.0-fix-core-link.patch delete mode 100644 scilab-6.1.0-hdf5_18_api.patch delete mode 100644 scilab-6.1.0-jogl-2.3.2.patch delete mode 100644 scilab-6.1.0-libhdf5-1.8.10.patch delete mode 100644 scilab-6.1.0-matio-fix-uint32_t-type.patch delete mode 100644 scilab-6.1.0-ocaml.patch delete mode 100644 scilab-6.1.0-strict-jar.patch delete mode 100644 scilab-6.1.1-pause_to_scipause.patch diff --git a/scilab-6.1.0-fix-core-link.patch b/scilab-6.1.0-fix-core-link.patch deleted file mode 100644 index 6ba228a..0000000 --- a/scilab-6.1.0-fix-core-link.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- scilab-6.1.0/modules/core/Makefile.am.orig 2021-05-16 12:15:27.242176556 +0200 -+++ scilab-6.1.0/modules/core/Makefile.am 2021-05-16 12:15:38.414362002 +0200 -@@ -130,7 +130,6 @@ - sci_gateway/cpp/sci_fieldnames.cpp \ - sci_gateway/cpp/sci_checkNamedArguments.cpp - --if ENABLE_DEBUG - GATEWAY_CPP_SOURCES += \ - sci_gateway/cpp/sci_inspectorDeleteUnreferencedItems.cpp \ - sci_gateway/cpp/sci_inspectorGetItem.cpp \ -@@ -139,7 +138,6 @@ - sci_gateway/cpp/sci_inspectorShowItem.cpp \ - sci_gateway/cpp/sci_inspectorShowUnreferencedItem.cpp \ - sci_gateway/cpp/sci_inspectorGetFunctionList.cpp --endif - - libscicore_la_CPPFLAGS = \ - -I$(srcdir)/includes/ \ ---- scilab-6.1.0/modules/ast/Makefile.am.orig 2021-05-16 13:07:04.254552724 +0200 -+++ scilab-6.1.0/modules/ast/Makefile.am 2021-05-16 13:07:15.439752622 +0200 -@@ -253,9 +253,7 @@ - src/cpp/analysis/check_acos.cpp \ - src/cpp/analysis/check_____dottimes____.cpp - --if ENABLE_DEBUG - libsciast_la_SOURCES += src/cpp/types/inspector.cpp --endif - - - libsciast_la_CPPFLAGS = \ diff --git a/scilab-6.1.0-hdf5_18_api.patch b/scilab-6.1.0-hdf5_18_api.patch deleted file mode 100644 index a80e29f..0000000 --- a/scilab-6.1.0-hdf5_18_api.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur orig/scilab-6.1.0/modules/hdf5/Makefile.am scilab-6.1.0/modules/hdf5/Makefile.am ---- orig/scilab-6.1.0/modules/hdf5/Makefile.am 2020-02-25 10:59:56.000000000 +0100 -+++ scilab-6.1.0/modules/hdf5/Makefile.am 2020-06-16 17:11:11.934227935 +0200 -@@ -103,8 +103,7 @@ - -DH5Gopen_vers=2 \ - -DH5Tget_array_dims_vers=2 \ - -DH5Acreate_vers=2 \ -- -DH5Rdereference_vers=2 \ -- -DNO_DEPRECATED_SYMBOLS -+ -DH5Rdereference_vers=2 - - - libscihdf5_la_CPPFLAGS = \ -diff -Naur orig/scilab-6.1.0/modules/hdf5/Makefile.in scilab-6.1.0/modules/hdf5/Makefile.in ---- orig/scilab-6.1.0/modules/hdf5/Makefile.in 2020-02-25 10:59:56.000000000 +0100 -+++ scilab-6.1.0/modules/hdf5/Makefile.in 2020-06-16 17:11:23.374128670 +0200 -@@ -788,8 +788,7 @@ - -DH5Gopen_vers=2 \ - -DH5Tget_array_dims_vers=2 \ - -DH5Acreate_vers=2 \ -- -DH5Rdereference_vers=2 \ -- -DNO_DEPRECATED_SYMBOLS -+ -DH5Rdereference_vers=2 - - libscihdf5_la_CPPFLAGS = \ - -I$(srcdir)/includes/ \ -diff -Naur orig/scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h ---- orig/scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h 2020-02-25 10:59:56.000000000 +0100 -+++ scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h 2020-06-16 17:07:00.129746134 +0200 -@@ -16,14 +16,12 @@ - #ifndef __HDF5OBJECTS_H__ - #define __HDF5OBJECTS_H__ - --#define H5_NO_DEPRECATED_SYMBOLS - #undef H5_USE_16_API -+#define H5_USE_18_API - --#define H5Eset_auto_vers 2 - #include - #include - --#undef H5_NO_DEPRECATED_SYMBOLS - - //#define __HDF5OBJECTS_DEBUG__ - //#define __HDF5ERROR_PRINT__ -diff -Naur orig/scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp ---- orig/scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2020-02-25 10:59:56.000000000 +0100 -+++ scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2020-06-16 17:15:08.605507554 +0200 -@@ -13,6 +13,8 @@ - * - */ - -+#define H5_USE_18_API -+ - #include - #include "function.hxx" - #include "string.hxx" -diff -Naur orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c ---- orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c 2020-02-25 10:59:56.000000000 +0100 -+++ scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c 2020-06-16 17:13:05.759906899 +0200 -@@ -13,7 +13,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include -diff -Naur orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c ---- orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2020-02-25 10:59:56.000000000 +0100 -+++ scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2020-06-16 17:13:20.183115080 +0200 -@@ -13,7 +13,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include diff --git a/scilab-6.1.0-jogl-2.3.2.patch b/scilab-6.1.0-jogl-2.3.2.patch deleted file mode 100644 index 583e22a..0000000 --- a/scilab-6.1.0-jogl-2.3.2.patch +++ /dev/null @@ -1,550 +0,0 @@ -From 1364c083acb58a55fcf2c5ca8d244313dfe9bbcb Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Cl=C3=A9ment=20DAVID?= -Date: Wed, 2 Dec 2015 15:09:07 +0100 -Subject: [PATCH] Update to JoGL 2.3.2 - -Change-Id: Ic188bb392d1dd8441d1a4132004f77b63a3353df ---- - scilab/configure | 16 +++++++------- - scilab/configure.ac | 4 ++-- - .../src/java/org/scilab/modules/gui/SwingView.java | 8 +++---- - .../scilab/modules/gui/bridge/ScilabBridge.java | 2 +- - .../gui/bridge/canvas/SwingScilabCanvas.java | 4 ++-- - .../gui/bridge/canvas/SwingScilabCanvasImpl.java | 12 +++++------ - .../java/org/scilab/modules/gui/canvas/Canvas.java | 2 +- - .../scilab/modules/gui/canvas/ScilabCanvas.java | 2 +- - .../modules/gui/canvas/ScilabCanvasBridge.java | 2 +- - .../scilab/modules/gui/canvas/SimpleCanvas.java | 2 +- - .../scirenderer/scirenderer-libs.properties | 4 ++-- - .../implementation/jogl/JoGLCanvas.java | 22 ++++++++++---------- - .../implementation/jogl/JoGLCanvasFactory.java | 2 +- - .../implementation/jogl/JoGLCapacity.java | 2 +- - .../implementation/jogl/JoGLDrawingTools.java | 2 +- - .../implementation/jogl/JoGLParameters.java | 4 ++-- - .../jogl/buffers/JoGLBuffersManager.java | 2 +- - .../jogl/buffers/JoGLDataBuffer.java | 2 +- - .../jogl/buffers/JoGLElementsBuffer.java | 2 +- - .../jogl/buffers/JoGLIndicesBuffer.java | 2 +- - .../jogl/clipping/JoGLClippingManager.java | 2 +- - .../jogl/clipping/JoGLClippingPlane.java | 2 +- - .../jogl/drawer/JoGLShapeDrawer.java | 2 +- - .../implementation/jogl/lightning/JoGLLight.java | 2 +- - .../jogl/lightning/JoGLLightManager.java | 2 +- - .../jogl/picking/GLPickingManager.java | 2 +- - .../jogl/picking/JoGLPickingTools.java | 2 +- - .../implementation/jogl/renderer/JoGLRenderer.java | 2 +- - .../jogl/renderer/JoGLRendererManager.java | 2 +- - .../jogl/texture/JoGLTextureManager.java | 10 ++++----- - .../implementation/jogl/utils/GLShortCuts.java | 2 +- - 31 files changed, 64 insertions(+), 64 deletions(-) - -diff --git a/scilab/configure b/scilab/configure -index 192bb93..ef8699d 100755 ---- a/scilab/configure -+++ b/scilab/configure -@@ -16245,7 +16245,7 @@ EOF - CLASSPATH=$ac_java_classpath - export CLASSPATH - echo "CLASSPATH="$CLASSPATH >&5 -- cmd="$JAVA conftestSharedChecker \"jogl2\" \"javax.media.opengl.glu.GLUnurbs\" \"$jar_resolved\" \"\" \"2.2\" \"\"" -+ cmd="$JAVA conftestSharedChecker \"jogl2\" \"jogamp.opengl.x11.glx.GLX\" \"$jar_resolved\" \"\" \"2.3\" \"\"" - if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5); then - read PACKAGE_JAR_FILE PACKAGE_JAR_VERSION << EOF - $(tail -n 1 conftestSharedChecker.java.output) -@@ -16259,10 +16259,10 @@ $as_echo " $PACKAGE_JAR_FILE $PACKAGE_JAR_VERSION " >&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 - if test -f conftestSharedChecker.java.output; then -@@ -16585,7 +16585,7 @@ EOF - CLASSPATH=$ac_java_classpath - export CLASSPATH - echo "CLASSPATH="$CLASSPATH >&5 -- cmd="$JAVA conftestSharedChecker \"gluegen2-rt\" \"jogamp.common.os.MachineDescriptionRuntime\" \"$jar_resolved\" \"\" \"\" \"\"" -+ cmd="$JAVA conftestSharedChecker \"gluegen2-rt\" \"com.jogamp.common.os.Platform\" \"$jar_resolved\" \"\" \"\" \"\"" - if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5); then - read PACKAGE_JAR_FILE PACKAGE_JAR_VERSION << EOF - $(tail -n 1 conftestSharedChecker.java.output) -@@ -16599,10 +16599,10 @@ $as_echo " $PACKAGE_JAR_FILE $PACKAGE_JAR_VERSION " >&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 - if test -f conftestSharedChecker.java.output; then -diff --git a/scilab/configure.ac b/scilab/configure.ac -index 49d9281..eba2c3d 100644 ---- a/scilab/configure.ac -+++ b/scilab/configure.ac -@@ -951,7 +951,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no - AC_SUBST(SKINLF) - - # JOGL 2 -- AC_JAVA_CHECK_JAR([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0], [], [], [2.2]) -+ AC_JAVA_CHECK_JAR([jogl2],[jogamp.opengl.x11.glx.GLX],[Scilab 3D rendering - Version 2.3], [], [], 2.3) - JOGL2=$PACKAGE_JAR_FILE - AC_SUBST(JOGL2) - -@@ -980,7 +980,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version - fi - - # JoGL Native <=> Java connector -- AC_JAVA_CHECK_JAR([gluegen2-rt],[jogamp.common.os.MachineDescriptionRuntime],[Scilab 3D rendering]) -+ AC_JAVA_CHECK_JAR([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 ea28e4c..50704af 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 -@@ -88,10 +88,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 112a904..d1a2438 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 -@@ -23,7 +23,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 477fa3f..9e969b4 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 -@@ -35,8 +35,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 f27ea69..68b7613 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 -@@ -22,12 +22,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 03e7b5b..c84b257 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 -@@ -17,7 +17,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 6fb2ef9..ce0f1a9 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 -@@ -19,7 +19,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 2d7e304..56c4ee4 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 -@@ -17,7 +17,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 307486a..91a40b0 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 -@@ -18,7 +18,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/scirenderer-libs.properties b/scilab/modules/scirenderer/scirenderer-libs.properties -index 4d1636d..0ea2197 100644 ---- a/scilab/modules/scirenderer/scirenderer-libs.properties -+++ b/scilab/modules/scirenderer/scirenderer-libs.properties -@@ -1,7 +1,7 @@ - ; Define all libs needed by scirenderer - - ; Uncomment this line and declare path to jogl2.jar gluegen2-rt.jar jlatexmath.jar and native libraries --jogl2.jar = /usr/share/java/jogl2.jar --gluegen2.jar = /usr/share/java/gluegen2-rt.jar -+jogl2.jar = /usr/lib/java/jogl2.jar -+gluegen2.jar = /usr/lib/java/gluegen2-rt.jar - jlatexmath.jar = /usr/share/java/jlatexmath.jar - jni.path = /usr/lib/jni -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 a823629..8a776a0 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 -@@ -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 - * -@@ -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; -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 4fec356..6de9267 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 -@@ -16,7 +16,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 4597be3..4ed3220 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 -@@ -14,7 +14,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 623cc1e..161f9ca 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 -@@ -34,7 +34,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 429e1a3..c26d5a2 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 -@@ -14,8 +14,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 d5f1f06..99e6854 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 -@@ -19,7 +19,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 25d3a3e..b56c9d7 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 -@@ -16,7 +16,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 5206566..5d01b87 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 -@@ -16,7 +16,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 2a14656..f7f019f 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 -@@ -16,7 +16,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 22d28b2..57885f0 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 -@@ -18,7 +18,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 cf3ed8b..a5a5770 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 -@@ -20,7 +20,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 2b1066c..c1549b4 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 -@@ -26,7 +26,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 f06809e..9e89b7c 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 -@@ -14,7 +14,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 0c8ae45..42d1e32 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 -@@ -20,7 +20,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 11c4b3f..6895a53 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 -@@ -14,7 +14,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 f9fe5a8..9ac3537 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 -@@ -19,7 +19,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 3f4b47d..9f9f856 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 -@@ -18,7 +18,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 4b4dd17..440750f 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 -@@ -18,7 +18,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 659f37f..25d3bc3 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 -@@ -32,11 +32,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 1d799e9..8a493fb 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 -@@ -17,7 +17,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; - - /** - * --- -1.7.9.5 - diff --git a/scilab-6.1.0-libhdf5-1.8.10.patch b/scilab-6.1.0-libhdf5-1.8.10.patch deleted file mode 100644 index 7fbb033..0000000 --- a/scilab-6.1.0-libhdf5-1.8.10.patch +++ /dev/null @@ -1,308 +0,0 @@ ---- scilab-6.0.0.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-15 20:08:00.761619371 +0100 -@@ -42,7 +42,11 @@ - for (int i = 0; i < totalSize; i++) - { - void * ref = &(((void **)cdata)[i]); -- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ hid_t obj = H5Rdereference(file, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - H5O_info_t info; - H5Oget_info(obj, &info); - H5Oclose(obj); -@@ -84,7 +88,11 @@ - - file = getFile().getH5Id(); - ref = &(((void **)cdata)[0]); -- obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ obj = H5Rdereference(file, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - if (obj < 0) - { - throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position.")); -@@ -126,7 +134,11 @@ - for (int i = 0; i < totalSize; i++) - { - void * ref = &(((void **)cdata)[i]); -- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ hid_t obj = H5Rdereference(file, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - objs[i] = &H5Object::getObject(getParent(), obj); - } - -@@ -181,7 +193,11 @@ - char * cdata = static_cast(data) + offset + pos * (stride ? stride : dataSize); - void ** ref = &(((void **)cdata)[0]); - hid_t file = getFile().getH5Id(); -- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ hid_t obj = H5Rdereference(file, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - if (obj < 0) - { - os << "NULL"; ---- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-15 20:08:00.758286029 +0100 -@@ -474,7 +474,11 @@ - } - - //Open the referenced object, get its name and type. -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &Ref); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &Ref); - readDouble_v1(obj, _iRows, _iCols, _pdblData); - } - -@@ -501,14 +505,22 @@ - } - - //Open the referenced object, get its name and type. -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readDouble_v1(obj, _iRows, _iCols, _pdblReal); - if (status < 0) - { - return -1; - } - -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readDouble_v1(obj, _iRows, _iCols, _pdblImg); - if (status < 0) - { -@@ -834,7 +846,11 @@ - /* - * Open the referenced object, get its name and type. - */ -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &pData[i]); - if (_iComplex) - { - status = readComplexPoly_v1(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]); -@@ -1069,7 +1085,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow); - if (status < 0) - { -@@ -1077,7 +1097,11 @@ - } - - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos); - if (status < 0) - { -@@ -1085,7 +1109,11 @@ - } - - //read sparse data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[2]); - - if (_iComplex) - { -@@ -1131,7 +1159,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow); - if (status < 0) - { -@@ -1139,7 +1171,11 @@ - } - - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos); - if (status < 0) - { -@@ -1234,7 +1270,11 @@ - { - hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos]; - -- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef); -+ *_piItemDataset = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &poRef); - - if (*_piItemDataset == 0) - { ---- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-15 20:08:00.758286029 +0100 -@@ -742,7 +742,11 @@ - /* - * Open the referenced object, get its name and type. - */ -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &pData[i]); - if (_iComplex) - { - status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]); -@@ -976,7 +980,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix(obj, _piNbItemRow); - if (status < 0) - { -@@ -984,7 +992,11 @@ - } - - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix(obj, _piColPos); - if (status < 0) - { -@@ -992,7 +1004,11 @@ - } - - //read sparse data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[2]); - - if (_iComplex) - { -@@ -1043,7 +1059,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix(obj, _piNbItemRow); - if (status < 0) - { -@@ -1053,7 +1073,11 @@ - if (_iNbItem != 0) - { - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix(obj, _piColPos); - if (status < 0) - { -@@ -1154,7 +1178,11 @@ - { - hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos]; - -- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef); -+ *_piItemDataset = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &poRef); - - if (*_piItemDataset == 0) - { ---- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp 2017-02-15 20:11:46.775525827 +0100 -@@ -648,7 +648,11 @@ - //import field - for (int j = 0; j < refcount; ++j) - { -- int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]); -+ int data = H5Rdereference(refs, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &vrefs[j]); - if (data < 0) - { - freeStringMatrix(dfield, fields.data()); ---- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2017-02-15 20:11:36.838833848 +0100 -@@ -735,7 +735,11 @@ - //import field - for (int j = 0; j < refcount; ++j) - { -- int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]); -+ int data = H5Rdereference(refs, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &vrefs[j]); - if (data < 0) - { - return false; diff --git a/scilab-6.1.0-matio-fix-uint32_t-type.patch b/scilab-6.1.0-matio-fix-uint32_t-type.patch deleted file mode 100644 index 53cee27..0000000 --- a/scilab-6.1.0-matio-fix-uint32_t-type.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- scilab-6.1.0/modules/matio/src/cpp/GetSparseVariable.cpp.orig 2021-05-15 20:35:23.779949805 +0200 -+++ scilab-6.1.0/modules/matio/src/cpp/GetSparseVariable.cpp 2021-05-15 20:36:43.336525958 +0200 -@@ -65,7 +65,7 @@ - int* itemsRow = new int[pSparse->getRows()]; - pSparse->getNbItemByRow(itemsRow); - -- int* colIndexes = (int*)MALLOC(sizeof(int) * (pSparse->getRows() + 1)); -+ mat_uint32_t* colIndexes = (mat_uint32_t*)MALLOC(sizeof(mat_uint32_t) * (pSparse->getRows() + 1)); - if (colIndexes == NULL) - { - FREE(sparseData); -@@ -82,7 +82,7 @@ - colIndexes[K + 1] = colIndexes[K] + itemsRow[K]; - } - -- int* rowIndexes = (int*)MALLOC(sizeof(int) * nonZeros); -+ mat_uint32_t* rowIndexes = (mat_uint32_t*)MALLOC(sizeof(mat_uint32_t) * nonZeros); - if (rowIndexes == NULL) - { - FREE(sparseData); diff --git a/scilab-6.1.0-ocaml.patch b/scilab-6.1.0-ocaml.patch deleted file mode 100644 index 6a9772e..0000000 --- a/scilab-6.1.0-ocaml.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/modules/scicos/src/modelica_compiler/optimization.ml -+++ b/modules/scicos/src/modelica_compiler/optimization.ml -@@ -20,6 +20,7 @@ - * - *) - -+open Num - open SymbolicExpression - - -@@ -162,8 +163,7 @@ let num_of_float f = - let num_of_positive_float f = - let m, e = frexp f in - let sm = string_of_float m in -- let s = String.make 16 '0' in -- String.blit sm 2 s 0 (String.length sm - 2); -+ let s = String.sub sm 2 (String.length sm - 2) in - let e' = Num.power_num (Num.Int 2) (Num.num_of_int e) in - Num.div_num (Num.mult_num (Num.num_of_string s) e') scaling_factor - in ---- a/modules/scicos/src/modelica_compiler/xMLCodeGeneration.ml -+++ b/modules/scicos/src/modelica_compiler/xMLCodeGeneration.ml -@@ -20,6 +20,7 @@ - * - *) - -+open Num - type 'a tree = Leaf of (string * 'a) | Node of string * 'a tree list - - (* function used to hide XML special characters *) diff --git a/scilab-6.1.0-strict-jar.patch b/scilab-6.1.0-strict-jar.patch deleted file mode 100644 index 805dd8d..0000000 --- a/scilab-6.1.0-strict-jar.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.old 2016-04-24 14:32:13.301199078 +0200 -+++ configure 2016-04-24 14:34:47.821731712 +0200 -@@ -17159,7 +17159,7 @@ - - DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/" - -- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'fop.jar' -or -name 'libfop.jar' -or -name 'libfop-java.jar' -or -name 'fop*.jar' \) 2>/dev/null |tr '\n' ':')." -+ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'fop.jar' -or -name 'libfop.jar' -or -name 'libfop-java.jar' \) 2>/dev/null |tr '\n' ':')." - - if test ! -f conftestSharedChecker.class ; then - -@@ -19139,7 +19139,7 @@ - - DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/" - -- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'xmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons-java.jar' -or -name 'xmlgraphics-commons*.jar' \) 2>/dev/null |tr '\n' ':')." -+ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'xmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons-java.jar' \) 2>/dev/null |tr '\n' ':')." - - if test ! -f conftestSharedChecker.class ; then - -@@ -20019,7 +20019,7 @@ - - DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/" - -- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'commons-logging.jar' -or -name 'libcommons-logging.jar' -or -name 'libcommons-logging-java.jar' -or -name 'commons-logging*.jar' \) 2>/dev/null |tr '\n' ':')." -+ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'commons-logging.jar' -or -name 'libcommons-logging.jar' -or -name 'libcommons-logging-java.jar' \) 2>/dev/null |tr '\n' ':')." - - if test ! -f conftestSharedChecker.class ; then - diff --git a/scilab-6.1.1-pause_to_scipause.patch b/scilab-6.1.1-pause_to_scipause.patch deleted file mode 100644 index 3aaa2c8..0000000 --- a/scilab-6.1.1-pause_to_scipause.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/scilab/modules/core/src/cpp/pause.cpp -+++ b/scilab/modules/core/src/cpp/pause.cpp -@@ -11,15 +11,15 @@ - * - */ - --#include "configvariable.hxx" --#include "threadmanagement.hxx" --#include "runner.hxx" -- - extern "C" { - #include "pause.h" - } - --void pause(void) -+#include "configvariable.hxx" -+#include "threadmanagement.hxx" -+#include "runner.hxx" -+ -+void scipause(void) - { - ConfigVariable::IncreasePauseLevel(); - -@@ -43,4 +43,4 @@ - - //return from console so change mode to initial - ConfigVariable::setPromptMode(iOldMode); --} -\ No newline at end of file -+} ---- a/scilab/modules/core/includes/pause.h -+++ b/scilab/modules/core/includes/pause.h -@@ -15,6 +15,6 @@ - #define __PAUSE_H__ - - #include "dynlib_core.h" --CORE_IMPEXP void pause(void); -+CORE_IMPEXP void scipause(void); - - #endif /* !__PAUSE_H__ */ ---- a/scilab/modules/core/sci_gateway/cpp/sci_pause.cpp -+++ b/scilab/modules/core/sci_gateway/cpp/sci_pause.cpp -@@ -47,7 +47,7 @@ - ConfigVariable::macroFirstLine_begin(2); - - // do pause -- pause(); -+ scipause(); - - return types::Function::OK; - } diff --git a/scilab.spec b/scilab.spec index 83ee777..88b0dcb 100644 --- a/scilab.spec +++ b/scilab.spec @@ -1,5 +1,5 @@ Name: scilab -Version: 6.1.1 +Version: 2025.0.0 Release: 1mamba Summary: A scientific software package for numerical computations Group: Graphical Desktop/Applications/Scientific @@ -7,29 +7,22 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://www.scilab.org/ -Source0: http://www.scilab.org/download/%{version}/scilab-%{version}-src.tar.gz +Source0: https://gitlab.com/scilab/scilab/-/archive/%{version}/scilab-%{version}.tar.bz2 Source1: scilab.desktop Source2: scilab_256x256x32.png -Patch0: scilab-6.1.0-jogl-2.3.2.patch -Patch1: scilab-6.1.0-strict-jar.patch -Patch2: scilab-6.1.0-libhdf5-1.8.10.patch -Patch3: scilab-6.1.0-hdf5_18_api.patch -Patch4: scilab-6.1.0-matio-fix-uint32_t-type.patch Patch5: scilab-6.1.1-ocaml-num.patch -Patch6: scilab-6.1.0-ocaml.patch -Patch7: scilab-6.1.0-fix-core-link.patch -Patch8: scilab-6.1.1-pause_to_scipause.patch License: CeCILL, GPL ## AUTOBUILDREQ-BEGIN -BuildRequires: gcc-fortran BuildRequires: glibc-devel -BuildRequires: java-openjdk8-runtime +BuildRequires: libarchive-devel BuildRequires: libarpack-devel BuildRequires: libcurl-devel BuildRequires: libfftw-devel BuildRequires: libgcc +BuildRequires: libgfortran BuildRequires: libgomp-devel BuildRequires: libhdf5-devel +BuildRequires: libicu-devel BuildRequires: liblzma-devel BuildRequires: libmatio-devel BuildRequires: libmpi-devel @@ -44,54 +37,47 @@ BuildRequires: libtk-devel BuildRequires: libxml2-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END +BuildRequires: libmatio-devel >= 1.5.27 BuildRequires: libmpi-devel >= 4.1.5 BuildRequires: ocaml BuildRequires: ocaml-num BuildRequires: desktop-file-utils BuildRequires: ImageMagick # java stuff -BuildRequires: apache-ant -BuildRequires: apache-batik -BuildRequires: apache-fop -BuildRequires: java-openjdk8 -BuildRequires: java-flexdock -BuildRequires: java-graphx -BuildRequires: java-jogl -BuildRequires: java-jeuclid -BuildRequires: java-jlatexmath -BuildRequires: java-lucene -BuildRequires: java-rosetta -BuildRequires: java-skinlf -BuildRequires: java-xmlgraphics-commons -#BuildRequires: jakarta-commons-io -#BuildRequires: java-excalibur-avalon-framework-api -#BuildRequires: jakarta-commons-logging -#BuildRequires: java-junit48 -BuildRequires: javahelp2 -BuildRequires: jgoodies-looks -Requires: antlr -Requires: apache-batik -Requires: apache-fop +#BuildRequires: apache-ant +#BuildRequires: apache-batik +#BuildRequires: apache-fop +#BuildRequires: jakarta-activation +#BuildRequires: java-openjdk17 +#BuildRequires: java-flexdock +#BuildRequires: java-graphx +#BuildRequires: java-jogl +#BuildRequires: java-jeuclid +#BuildRequires: java-jlatexmath +#BuildRequires: java-lucene +#BuildRequires: java-rosetta +#BuildRequires: java-skinlf +#BuildRequires: java-xmlgraphics-commons +#BuildRequires: javahelp2 +#BuildRequires: jgoodies-looks +#Requires: antlr +#Requires: apache-batik +#Requires: apache-fop Requires: docbook-xsl -#Requires: jakarta-commons-beanutils -#Requires: jakarta-commons-io -#Requires: jakarta-commons-logging -Requires: java-checkstyle -#Requires: java-excalibur-avalon-framework -Requires: java-flexdock -Requires: java-graphx -Requires: java-jeuclid -Requires: java-jlatexmath -#Requires: java-junit48 -#Requires: java-openjdk8 -Requires: java-qdox -Requires: java-rosetta -Requires: java-saxon9 -Requires: java-skinlf -Requires: java-testng -Requires: java-xmlgraphics-commons -Requires: javahelp2 -Requires: jgoodies-looks +#Requires: jakarta-activation +#Requires: java-checkstyle +#Requires: java-flexdock +#Requires: java-graphx +#Requires: java-jeuclid +#Requires: java-jlatexmath +#Requires: java-qdox +#Requires: java-rosetta +#Requires: java-saxon9 +#Requires: java-skinlf +#Requires: java-testng +#Requires: java-xmlgraphics-commons +#Requires: javahelp2 +#Requires: jgoodies-looks Requires: ocaml Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} @@ -126,19 +112,12 @@ This package contains development files for with Scilab. %setup -q #-D -T #:<< _EOF -%patch 0 -p2 -%patch 3 -p1 -#%patch 4 -p1 +cd scilab %patch 5 -p0 -%patch 6 -p1 -#%patch 7 -p1 -%patch 8 -p2 - -#autoreconf -f -i - %build #:<< _EOF +cd scilab %configure \ --enable-debug \ --with-gcc \ @@ -150,13 +129,15 @@ This package contains development files for with Scilab. --with-modelica \ --without-emf \ --with-install-help-xml \ - --enable-build-help \ - --enable-build-localization \ + --without-javasci \ + --without-jdk \ + --disable-build-doxygen \ + --disable-build-help \ + --disable-debug-java \ --disable-static-system-lib \ - --with-jdk=%{_jvmdir}/java-8-openjdk/ \ - FFLAGS="-fallow-argument-mismatch" \ - CFLAGS="%{optflags} -fcommon" \ - CXXFLAGS="%{optflags} -fcommon" + FFLAGS="-fallow-argument-mismatch" \ + CFLAGS="%{optflags} -fcommon" \ + CXXFLAGS="%{optflags} -fcommon" %make -j1 \ OCAMLCFLAGS="" OCAMLOPTFLAGS="" @@ -165,9 +146,9 @@ make doc %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall +%makeinstall -C scilab -make DESTDIR=%{buildroot} install-data install-html +make -C scilab DESTDIR=%{buildroot} install-data install-html %find_lang scilab @@ -175,12 +156,10 @@ make DESTDIR=%{buildroot} install-data install-html [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %post -/sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : : %postun -/sbin/ldconfig if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -195,13 +174,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/XML2Modelica %{_bindir}/modelicac %{_bindir}/modelicat -%{_bindir}/scilab -%{_bindir}/scilab-adv-cli -%{_bindir}/scilab-bin +#%{_bindir}/scilab +#%{_bindir}/scilab-adv-cli +#%{_bindir}/scilab-bin %{_bindir}/scilab-cli %{_bindir}/scilab-cli-bin -%{_bindir}/scinotes -%{_bindir}/xcos +#%{_bindir}/scinotes +#%{_bindir}/xcos %dir %{_datadir}/scilab %{_datadir}/scilab/ACKNOWLEDGEMENTS %{_datadir}/scilab/CHANGES.md @@ -210,7 +189,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/scilab/Version.incl %{_datadir}/scilab/contrib %{_datadir}/scilab/etc -#%{_datadir}/scilab/icons %{_datadir}/scilab/tools %dir %{_datadir}/scilab/modules %{_datadir}/scilab/modules/* @@ -224,18 +202,27 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -n lib%{name} %defattr(-,root,root) %dir %{_libdir}/scilab -%{_libdir}/scilab/libjavasci2.so.* +#%{_libdir}/scilab/libjavasci2.so.* %{_libdir}/scilab/libsci*.so.* %{_libdir}/scilab/*.so -%doc COPYING COPYING-BSD +#%doc COPYING COPYING-BSD %files -n lib%{name}-devel %defattr(-,root,root) %dir %{_includedir}/scilab %{_includedir}/scilab/* +%dir %{_includedir}/nvector +%{_includedir}/nvector/* +%dir %{_includedir}/sundials +%{_includedir}/sundials/* +%dir %{_includedir}/sunmatrix +%{_includedir}/sunmatrix/* %{_libdir}/pkgconfig/scilab.pc %changelog +* Thu Oct 31 2024 Silvan Calarco 2025.0.0-1mamba +- update to 2025.0.0 + * Sat Oct 21 2023 Silvan Calarco 6.1.1-1mamba - update to 6.1.1