Hello community,
here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-03-04 12:49:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scilab (Old)
and /work/SRC/openSUSE:Factory/.scilab.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab"
Sun Mar 4 12:49:48 2018 rev:23 rq:580961 version:6.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2018-02-14 10:51:55.821017984 +0100
+++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2018-03-04 12:50:17.172658673 +0100
@@ -1,0 +2,52 @@
+Thu Feb 22 13:26:14 UTC 2018 - badshah400@gmail.com
+
+- Enforce java 9 for building, as there are runtime error when
+ java 10 is used
+- Add scilab-xcos-java9.patch: Fix xcos compilation against
+ openjdk-java 9; enable building xcos during configure.
+- Add scilab-java9-ClassLoader.patch: Hack frontloading of all
+ necessary jar classpaths by passing them to _JAVA_OPTIONS since
+ dynamic classpath loading doesn not work any more; see
+ http://mailinglists.scilab.org/Scilab-GUI-and-adv-cli-fail-to-launch-with-ja...
+- Enable documentation; building fixed due to above patch.
+- Add scilab-bin-correct-java9-path.patch
+- Drop scilab-batik-1.8.patch
+
+-------------------------------------------------------------------
+Fri Feb 16 16:47:27 UTC 2018 - badshah400@gmail.com
+
+- Update to version 6.0.1:
+ * Long list of changes, see
+ https://help.scilab.org/docs/6.0.1/en_US/CHANGES.html
+- Update BuildRequires and Requires: eigen3-devel [only
+ BuildRequires], ecj, java-devel >= 9, lucene* >= 6.0.
+- Add scilab-launch-from-xterm.patch: Modify Exec key for .desktop
+ file so that scilab is launched via xterm; this is needed
+ because of upstream's negligence:
+ http://bugzilla.scilab.org/show_bug.cgi?id=14682.
+- Disable documentation module: does not build with java >= 9; see
+ http://bugzilla.scilab.org/show_bug.cgi?id=15328.
+ Workaround: Use
+ https://help.scilab.org/docs/6.0.1/en_US/index.html.
+- Add scilab-openjdk9-no-javah.patch: configure
+ should not error out when javah is not found, instead should
+ simply use javac -h. See
+ http://bugzilla.scilab.org/show_bug.cgi?id=15328.
+- Exclude nullpotent post[un] scriptlets for main package: these
+ are instead hndled by rpm file-triggers.
+- Add scilab-no-return-in-non-void.patch: Fix non-void functions
+ to return some trivial values.
+- Add scilab-hdf5-function-return-compatibility.patch: Make
+ function writeDoubleComplexMatrix6's definition and
+ implementation return same data type.
+- Minor rebase of carried over patches.
+- Drop patches incorporated upstream:
+ * scilab-0002-always-use-dynamic-stack.patch
+ * scilab-allow-batik-1.9.patch
+ * scilab-build-with-fop-2_1.patch
+ * scilab-gcc7-nullptr-fix.patch
+ * scilab-build-with-xmlgraphics-commons-2_0.patch
+ * scilab-ocaml.patch
+ * scilab-openjdk9-support.patch.
+
+-------------------------------------------------------------------
Old:
----
scilab-0002-always-use-dynamic-stack.patch
scilab-5.5.2-src.tar.gz
scilab-batik-1.8.patch
scilab-build-with-fop-2_1.patch
scilab-build-with-xmlgraphics-commons-2_0.patch
scilab-gcc7-nullptr-fix.patch
scilab-ocaml.patch
scilab-openjdk9-support.patch
New:
----
scilab-6.0.1-src.tar.gz
scilab-bin-correct-java9-path.patch
scilab-hdf5-function-return-compatibility.patch
scilab-java9-ClassLoader.patch
scilab-launch-from-xterm.patch
scilab-no-return-in-non-void.patch
scilab-openjdk9-no-javah.patch
scilab-xcos-java9.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scilab.spec ++++++
--- /var/tmp/diff_new_pack.tgqsqS/_old 2018-03-04 12:50:19.800562903 +0100
+++ /var/tmp/diff_new_pack.tgqsqS/_new 2018-03-04 12:50:19.804562757 +0100
@@ -16,7 +16,7 @@
#
-%define sover 5
+%define sover 6
%define soname lib%{name}%{sover}
#%define beta_version 5.5.0-beta-1
@@ -24,7 +24,7 @@
Summary: High Level Programming Language/Numerical Analysis Software
License: CECILL-2.0 and BSD-3-Clause
Group: Productivity/Scientific/Math
-Version: 5.5.2
+Version: 6.0.1
Release: 0
Url: http://www.scilab.org
# FOR STABLE RELEASE
@@ -35,43 +35,43 @@
# Bug 767102 - help() should suggest scilab-doc
Patch1: %{name}-0001-Use-pkcon-to-install-doc-package.patch
-# Bug 64307 - Use dynamic stack on 32-bit to avoid miscompilation
-# http://bugzilla.scilab.org/show_bug.cgi?id=12625
-Patch2: %{name}-0002-always-use-dynamic-stack.patch
# PATCH-FIX-UPSTREAM scilab-fix-64bit-portability-issue.patch badshah400@gmail.com -- Fix compiler warnings w.r.t 64bit portability
Patch3: scilab-fix-64bit-portability-issue.patch
-# PATCH-FIX-UPSTREAM scilab-ocaml.patch olaf@aepfle.de -- Fix build with ocaml-4.05 with scilab-ocaml.patch (bug#15107)
-Patch4: scilab-ocaml.patch
# PATCH-FIX-OPENSUSE scilab-special-jarnames.patch badshah400@gmail.com -- Adapt configure script for a few java library names peculiar to openSUSE
Patch5: scilab-special-jarnames.patch
-# PATCH-FIX-UPSTREAM scilab-build-with-xmlgraphics-commons-2_0.patch badshah400@gmail.com -- Fix compilation with xmlgraphics-commons >= 2.0
-Patch6: scilab-build-with-xmlgraphics-commons-2_0.patch
# PATCH-FIX-OPENSUSE scilab-0003-fix-xcos-desktop.patch sfalken@opensuse.org -- Change Desktop categories in xcos.desktop to clear brp-check-suse failure
Patch7: %{name}-0003-fix-desktop-categories.patch
# PATCH-FIX-UPSTREAM scilab-build-with-jogl-gluegen-2.3.patch badshah400@gmail.com -- Make scilab build with jogl and gluegen >= 2.3.0
Patch8: scilab-build-with-jogl-2.3.patch
# PATCH-FIX-OPENSUSE scilab-timestamp.patch olaf@aepfle.de -- Remove timestamps from binaries
Patch9: scilab-timestamp.patch
-# PATCH-FIX-UPSTREAM scilab-batik-1.8.patch idoenmez@suse.de -- Fix build with batik 1.8
-Patch10: scilab-batik-1.8.patch
# to sync with java-1_8_0-openjdk sr #365892
Patch11: scilab_ppc64le_java_archinstall_changed.patch
-# PATCH-FIX-UPSTREAM scilab-build-with-fop-2_1.patch badshah400@gmail.com -- Fix build failures when using xmlgraphics-fop >= 2.1 which has now landed in openSUSE:Factory; patch taken from upstream
-Patch12: scilab-build-with-fop-2_1.patch
# PATCH-FIX-UPSTREAM scilab-self-closing-br.patch badshah400@gmail.com -- Fix build failures with updated javadoc
Patch13: scilab-self-closing-br.patch
# PATCH-FIX-UPSTREAM scilab-hdf5-1_10-compat.patch badshah400@gmail.com -- Adapt to updated HDF5 (>= 1.10) API
Patch14: scilab-hdf5-1_10-compat.patch
# exclude ppc64 build as long as upstream open http://bugzilla.scilab.org/show_bug.cgi?id=13826
-# PATCH-FIX-UPSTREAM scilab-gcc7-nullptr-fix.patch badshah400@gmail.com -- Replace the character-literal '\0' by appropriate null pointer '0' to fix compilation with gcc >= 7
-Patch15: scilab-gcc7-nullptr-fix.patch
-# PATCH-FIX-UPSTREAM scilab-openjdk9-support.patch badshah400@opensuse.org -- Add support for openjdk 9; patch taken from upstream git and rebased for version 5.5.2
-Patch16: scilab-openjdk9-support.patch
+# PATCH-FIX-UPSTREAM scilab-no-return-in-non-void.patch badshah400@gmail.com -- Fix non-void functions that do not return
+Patch17: scilab-no-return-in-non-void.patch
+# PATCH-FIX-UPSTREAM patches/scilab-hdf5-function-return-compatibility.patch badshah400@gmail.com -- Make function writeDoubleComplexMatrix6's definition and implementation return same data type
+Patch20: scilab-hdf5-function-return-compatibility.patch
+# PATCH-FIX-UPSTREAM scilab-openjdk9-no-javah.patch badshah400@opensuse.org -- Ignore missing javah for openjdk 9+: set it to javac -h directly
+Patch21: scilab-openjdk9-no-javah.patch
+# PATCH-FIX-UPSTREAM scilab-launch-from-xterm.patch badshah400@gmail.com -- Scilab needs to be launched from within xterm for the GUI to not crash, so modify .desktop file accordingly desktop; see upstream negligence at http://bugzilla.scilab.org/show_bug.cgi?id=14682
+Patch22: scilab-launch-from-xterm.patch
+# PATCH-FIX-UPSTREAM scilab-bin-correct-java9-path.patch badshah400@gmail.com -- Fix scilab binary to look for libjava.so in the correct location according to java >=9 specifications
+Patch23: scilab-bin-correct-java9-path.patch
+# PATCH-FIX-UPSTREAM scilab-xcos-java9.patch badshah400@gmail.com -- Fix compilation of xcos against openjdk-java 9; patch sent upstream
+Patch24: scilab-xcos-java9.patch
+# PATCH-FIX-UPSTREAM scilab-java9-ClassLoader.patch badshah400@gmail.com -- Hack frontloading of all necessary jar classpaths by passing them to _JAVA_OPTIONS since dynamic classpath loading doesn not work any more; see http://mailinglists.scilab.org/Scilab-GUI-and-adv-cli-fail-to-launch-with-ja...
+Patch25: scilab-java9-ClassLoader.patch
ExcludeArch: ppc64
# Dependencies are extracted from :
# "http://wiki.scilab.org/Dependencies of Scilab 5.X"
# Mandatory
BuildRequires: asm2
+BuildRequires: eigen3-devel
BuildRequires: f2c
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -96,8 +96,17 @@
# GUI/Console
BuildRequires: ant
+BuildRequires: ecj
BuildRequires: java-devel = 9
BuildRequires: jpackage-utils
+BuildRequires: lucene >= 6.0
+BuildRequires: lucene-analyzers-common >= 6.0
+BuildRequires: lucene-queryparser >= 6.0
+
+Requires: ecj
+Requires: lucene >= 6.0
+Requires: lucene-analyzers-common >= 6.0
+Requires: lucene-queryparser >= 6.0
BuildRequires: Mesa-devel
BuildRequires: flexdock
@@ -149,7 +158,9 @@
Requires: saxon9
#BuildRequires: docbook-style-xsl
BuildRequires: docbook-xsl-stylesheets
+BuildRequires: jaf = 1.1
BuildRequires: liberation-fonts
+Requires: jaf = 1.1
# make doc now requires access to display
BuildRequires: Mesa-libGL-devel
BuildRequires: xorg-x11-server
@@ -290,43 +301,53 @@
%patch1 -p1
# PATCH5 and PATCH13 have to be applied before PATCH2; all affect ./configure
%patch5 -p1
-%patch2 -p1
%patch3 -p1
-%patch4 -p1
-# Only > 13.2 and Leap have xmlgraphics-commons > 2.0
-%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
-%patch6 -p1
-%endif
%patch7 -p1
%patch8 -p1
%patch9 -p1
%if 0%{?suse_version} > 1320 || 0%{?leap_version} == 420300
-%patch10 -p1
%patch11 -p1
-%patch12 -p1
%endif
%patch13 -p1
%patch14 -p1
-%if 0%{?suse_version} > 1320
-%patch15 -p1
-%patch16 -p1
-%endif
+%patch17 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
-# Fix Class-Path in manifest
-sed -i '/name="Class-Path"/d' build.incl.xml
-sed -i '/name="Class-Path"/d' modules/javasci/build.xml
-sed -i '/name="Class-Path"/d' modules/scirenderer/build.xml
+# Remove a bad merge remnant (.orig file) to prevent trigerring rpmlint's suse-filelist-forbidden
+rm ./modules/cacsd/tests/unit_tests/dscr.tst.orig
%build
-# Disable xcos until it can build with java >= 9
%configure \
--disable-static-system-lib \
--without-umfpack \
--without-emf \
- --without-xcos
+ --with-xcos
-make
+make -C modules/scicos modelicac modelicat XML2Modelica
+make %{?_smp_mflags}
+
+export SCI_ALL_JAR_CLASSPATHS=`grep -Eo "\".*.jar" etc/classpath.xml | sed 's/$SCILAB/$SCI/' | tr -d "\"" | tr "\n" ":"`
+sed -i "s|@SPEC_ALL_JAR_CLASSPATHS@|${SCI_ALL_JAR_CLASSPATHS}|" bin/scilab
+export SCI_LIB_PATH=%{_libdir}/scilab
+sed -i "s|@SPEC_SCI_LIB_PATH@|${SCI_LIB_PATH}|" bin/scilab
+
+# SED HACK TO FRONTLOAD ALL NECESSARY JARS WHEN STARTING SCILAB
+# See discussion http://mailinglists.scilab.org/Scilab-GUI-and-adv-cli-fail-to-launch-with-ja...
+
+# Documentation doesn't build: see http://bugzilla.scilab.org/show_bug.cgi?id=15328
+export DISPLAY=%{X_display}
+Xvfb %{X_display} >& Xvfb.log &
+sleep 5
+export SCI_ALL_JAR_CLASSPATHS=`grep -Eo "\".*.jar" etc/classpath.xml | sed 's/$SCILAB/./' | tr -d "\"" | tr "\n" ":"`
+export LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:./modules/*/.libs:./modules/.libs
+export _JAVA_OPTIONS='-Djava.class.path=${SCI_ALL_JAR_CLASSPATHS}'
+make doc SCIVERBOSE=1
%install
make install DESTDIR=%{buildroot}
@@ -348,7 +369,7 @@
rm -fr %{buildroot}%{_datadir}/applications/%{name}-*.desktop
# Fix categories and install .desktop files
-for i in scilab scinotes; \
+for i in scilab scinotes xcos; \
do
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
@@ -395,16 +416,6 @@
%postun -n %{soname}
/sbin/ldconfig
-%post
-%mime_database_post
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun
-%mime_database_postun
-%desktop_database_postun
-%icon_theme_cache_postun
-
%files -n %{soname}
%defattr(-,root,root)
%dir %{_libdir}/%{name}
@@ -413,9 +424,7 @@
%files
%defattr(-,root,root)
%doc ACKNOWLEDGEMENTS
-%doc CHANGES_2.X CHANGES_3.X CHANGES_4.X CHANGES_5.0.X CHANGES_5.1.X CHANGES_5.2.X CHANGES_5.3.X CHANGES_5.4.X CHANGES_5.5.X
-%doc RELEASE_NOTES_5.0.X RELEASE_NOTES_5.1.X RELEASE_NOTES_5.2.X RELEASE_NOTES_5.3.X
-%doc README_Unix
+%doc README.md CHANGES.md COPYING COPYING-BSD
%{_bindir}/*
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/etc/
@@ -435,7 +444,7 @@
%defattr(-,root,root)
%{_datadir}/%{name}/modules/
# part of scilab-doc
-#%exclude %{_datadir}/%{name}/modules/helptools/jar/%{name}_*.jar
+%exclude %{_datadir}/%{name}/modules/helptools/jar/%{name}_*.jar
%exclude %{_datadir}/%{name}/modules/*/examples
%exclude %{_datadir}/%{name}/modules/*/help
# part of scilab-tests
@@ -445,15 +454,15 @@
%defattr(-,root,root)
%{_datadir}/%{name}/modules/*/examples
%{_datadir}/%{name}/modules/*/help
-#%{_datadir}/%{name}/modules/helptools/jar/%{name}_images.jar
-#%{_datadir}/%{name}/modules/helptools/jar/%{name}_en_US_help.jar
+%{_datadir}/%{name}/modules/helptools/jar/%{name}_images.jar
+%{_datadir}/%{name}/modules/helptools/jar/%{name}_en_US_help.jar
%files modules-doc-lang -f %{name}-modules-doc.lang
%defattr(-,root,root)
%files devel
%defattr(-,root,root)
-%doc COPYING license.txt
+%doc COPYING COPYING-BSD
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*.so
%{_includedir}/%{name}/
++++++ scilab-0001-Use-pkcon-to-install-doc-package.patch ++++++
--- /var/tmp/diff_new_pack.tgqsqS/_old 2018-03-04 12:50:19.828561883 +0100
+++ /var/tmp/diff_new_pack.tgqsqS/_new 2018-03-04 12:50:19.828561883 +0100
@@ -1,8 +1,8 @@
-Index: scilab-5.5.0/modules/helptools/macros/help.sci
+Index: scilab-6.0.0/modules/helptools/macros/help.sci
===================================================================
---- scilab-5.5.0.orig/modules/helptools/macros/help.sci
-+++ scilab-5.5.0/modules/helptools/macros/help.sci
-@@ -53,7 +53,8 @@ function help(varargin)
+--- scilab-6.0.0.orig/modules/helptools/macros/help.sci
++++ scilab-6.0.0/modules/helptools/macros/help.sci
+@@ -56,7 +56,8 @@ function help(varargin)
error(msprintf(gettext("%s: The help browser is disabled in %s mode.\n"), "help", getscilabmode()));
end
else
++++++ scilab-5.5.2-src.tar.gz -> scilab-6.0.1-src.tar.gz ++++++
/work/SRC/openSUSE:Factory/scilab/scilab-5.5.2-src.tar.gz /work/SRC/openSUSE:Factory/.scilab.new/scilab-6.0.1-src.tar.gz differ: char 5, line 1
++++++ scilab-bin-correct-java9-path.patch ++++++
Index: scilab-6.0.1/bin/scilab
===================================================================
--- scilab-6.0.1.orig/bin/scilab
+++ scilab-6.0.1/bin/scilab
@@ -493,11 +493,7 @@ detect_java_vm() {
echo "JAVA_HOME : $JAVA_HOME"
fi
# Manage JRE & JDK because libjava.so and others are stored in the JRE
- if test -d $JAVA_HOME/jre; then
- JRE_HOME=$JAVA_HOME/jre
- else
- JRE_HOME=$JAVA_HOME
- fi
+ JRE_HOME=$JAVA_HOME
# Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and libxxxx.so
case $OS in
@@ -603,7 +599,7 @@ detect_java_vm() {
fi # IS_SCILAB_BINARY
# Check if the lib exists
- LIBJAVA="$JRE_HOME/lib/$proc/$JAVA_SHLIB"
+ LIBJAVA="$JRE_HOME/lib/$JAVA_SHLIB"
if test ! -f $LIBJAVA; then
if test $SCIVERBOSE -ne 0; then
echo "Cannot find $LIBJAVA"
@@ -612,7 +608,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....
- LD_LIBRARY_PATH="$JRE_HOME/lib/$proc/:$JRE_HOME/lib/$proc/server/:$JRE_HOME/lib/$proc/native_threads/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+ LD_LIBRARY_PATH="$JRE_HOME/lib/:$JRE_HOME/lib/server/:$JRE_HOME/lib/native_threads/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
fi
# Bug http://bugzilla.scilab.org/show_bug.cgi?id=14290 -
@@ -649,7 +645,7 @@ if test $IS_SCILAB_BINARY -eq 1; then
TCL_LIBRARY="$SCIBINARYBASE/thirdparty/tcl8.5"
TK_LIBRARY="$SCIBINARYBASE/thirdparty/tk8.5"
fi
- LD_LIBRARY_PATH=$SCIBINARYBASE/lib/scilab:$SCIBINARYBASE/lib/thirdparty${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}:$SCIBINARYBASE/lib/thirdparty/redist
+ LD_LIBRARY_PATH=/usr/lib/scilab:/usr/lib64/scilab/:$SCIBINARYBASE/lib/scilab:$SCIBINARYBASE/lib/thirdparty${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}:$SCIBINARYBASE/lib/thirdparty/redist
DOCBOOK_ROOT="$SCI/../../thirdparty/docbook"
PATH="$PATH:$SCI/modules/scicos/"
@@ -829,7 +825,7 @@ SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/li
if test -d $SCI/lib/thirdparty; then
SCILIB=$SCI/lib/thirdparty:$SCILIB;
fi
-LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+# LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
if test -d $SCI/lib/thirdparty/redist; then
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SCI/lib/thirdparty/redist;
fi
@@ -876,6 +872,7 @@ case $OS in
*)
esac
+LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:.${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
if test $SCIVERBOSE -ne 0; then
echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
@@ -1172,6 +1169,7 @@ if test "$rest" = "yes"; then
esac
done
+LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:.${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
# If the argument -a is not provided (extraarg) and we found unknown args
# fail and provide help
++++++ scilab-build-with-jogl-2.3.patch ++++++
--- /var/tmp/diff_new_pack.tgqsqS/_old 2018-03-04 12:50:19.868560425 +0100
+++ /var/tmp/diff_new_pack.tgqsqS/_new 2018-03-04 12:50:19.868560425 +0100
@@ -1,18 +1,18 @@
http://bugzilla.scilab.org/show_bug.cgi?id=13809
-Index: scilab-5.5.2/configure
+Index: scilab-6.0.0/configure
===================================================================
---- scilab-5.5.2.orig/configure
-+++ scilab-5.5.2/configure
-@@ -14264,7 +14264,7 @@ $as_echo_n "checking jogl2... " >&6; }
- // #line 14264 "configure"
- import java.util.regex.Pattern;
-
--import javax.media.opengl.glu.GLUnurbs;
-+import com.jogamp.opengl.glu.GLUnurbs;
-
- public class conftest {
- public static void main(String[] argv) {
-@@ -14350,10 +14350,10 @@ $as_echo "$jar_resolved" >&6; }
+--- scilab-6.0.0.orig/configure
++++ scilab-6.0.0/configure
+@@ -15276,7 +15276,7 @@ EOF
+
+ CLASSPATH=$ac_java_classpath
+ export CLASSPATH
+- cmd="$JAVA conftestSharedChecker jogl2 javax.media.opengl.glu.GLUnurbs $jar_resolved "
++ cmd="$JAVA conftestSharedChecker jogl2 com.jogamp.opengl.glu.GLUnurbs $jar_resolved "
+ if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5); then
+ PACKAGE_JAR_FILE=$(tail -n 1 conftestSharedChecker.java.output);
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_JAR_FILE" >&5
+@@ -15288,10 +15288,10 @@ $as_echo "$PACKAGE_JAR_FILE" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if test "" = "yes"; then
@@ -25,25 +25,35 @@
+ as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package com.jogamp.opengl.glu.GLUnurbs)" "$LINENO" 5
fi
fi
+ if test -f conftestSharedChecker.java.output; then
+@@ -15763,7 +15763,7 @@ EOF
-Index: scilab-5.5.2/configure.ac
+ CLASSPATH=$ac_java_classpath
+ export CLASSPATH
+- cmd="$JAVA conftestSharedChecker gluegen2-rt jogamp.common.os.MachineDescriptionRuntime $jar_resolved "
++ cmd="$JAVA conftestSharedChecker gluegen2-rt jogamp.common.os.MachineDataInfoRuntime $jar_resolved "
+ if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5); then
+ PACKAGE_JAR_FILE=$(tail -n 1 conftestSharedChecker.java.output);
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_JAR_FILE" >&5
+@@ -15775,10 +15775,10 @@ $as_echo "$PACKAGE_JAR_FILE" >&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 jogamp.common.os.MachineDataInfoRuntime)" >&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.MachineDataInfoRuntime)" >&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 jogamp.common.os.MachineDataInfoRuntime)" "$LINENO" 5
+ fi
+ fi
+ if test -f conftestSharedChecker.java.output; then
+Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
===================================================================
---- scilab-5.5.2.orig/configure.ac
-+++ scilab-5.5.2/configure.ac
-@@ -912,7 +912,7 @@ if test "$with_javasci" != no -o "$with_
- AC_SUBST(SKINLF)
-
- # JOGL 2
-- AC_JAVA_CHECK_PACKAGE([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0])
-+ AC_JAVA_CHECK_PACKAGE([jogl2],[com.jogamp.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0])
- JOGL2=$PACKAGE_JAR_FILE
- AC_SUBST(JOGL2)
-
-Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
-===================================================================
---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
-+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
-@@ -84,10 +84,10 @@ import java.util.Map;
+--- scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
++++ scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
+@@ -87,10 +87,10 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -58,11 +68,11 @@
import javax.swing.JComponent;
import javax.swing.JSeparator;
import javax.swing.SwingUtilities;
-Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
+Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
===================================================================
---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
-+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
-@@ -20,7 +20,7 @@ import java.awt.Cursor;
+--- scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
++++ scilab-6.0.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;
@@ -71,11 +81,11 @@
import org.scilab.modules.gui.canvas.Canvas;
import org.scilab.modules.gui.canvas.ScilabCanvas;
-Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
+Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
===================================================================
---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
-+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
-@@ -32,8 +32,8 @@ import java.awt.event.MouseListener;
+--- scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
++++ scilab-6.0.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;
@@ -86,11 +96,11 @@
import javax.swing.JPanel;
import org.scilab.forge.scirenderer.Canvas;
-Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
+Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
===================================================================
---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
-+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
-@@ -19,12 +19,12 @@ import java.awt.HeadlessException;
+--- scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
++++ scilab-6.0.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;
@@ -109,11 +119,11 @@
import org.scilab.modules.action_binding.InterpreterManagement;
import org.scilab.modules.commons.OS;
-Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
+Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
===================================================================
---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
-+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
-@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas;
+--- scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
++++ scilab-6.0.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;
@@ -122,11 +132,11 @@
import org.scilab.modules.gui.dockable.Dockable;
-Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
+Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
===================================================================
---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
-+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
-@@ -16,7 +16,7 @@ package org.scilab.modules.gui.canvas;
+--- scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
++++ scilab-6.0.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;
@@ -135,11 +145,11 @@
import org.scilab.modules.gui.bridge.ScilabBridge;
import org.scilab.modules.gui.dockable.ScilabDockable;
-Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
+Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
===================================================================
---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
-+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
-@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas;
+--- scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
++++ scilab-6.0.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;
@@ -148,11 +158,11 @@
import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas;
import org.scilab.modules.gui.utils.Position;
-Index: scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
+Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
===================================================================
---- scilab-5.5.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
-+++ scilab-5.5.2/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
-@@ -15,7 +15,7 @@ package org.scilab.modules.gui.canvas;
+--- scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
++++ scilab-6.0.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;
@@ -161,10 +171,10 @@
import java.awt.image.BufferedImage;
/**
-Index: scilab-5.5.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java
+Index: scilab-6.0.0/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java
-+++ scilab-5.5.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java
+--- scilab-6.0.0.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java
++++ scilab-6.0.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;
@@ -176,11 +186,11 @@
import javax.swing.*;
import java.awt.*;
-Index: scilab-5.5.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java
+Index: scilab-6.0.0/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java
-+++ scilab-5.5.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java
-@@ -15,7 +15,7 @@ import com.jogamp.opengl.util.Animator;
+--- scilab-6.0.0.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java
++++ scilab-6.0.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;
@@ -189,11 +199,11 @@
import javax.swing.JFrame;
import javax.swing.JPanel;
import java.awt.BorderLayout;
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
-@@ -16,16 +16,16 @@ import java.awt.image.BufferedImage;
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
++++ scilab-6.0.0/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;
@@ -220,11 +230,11 @@
import javax.swing.SwingUtilities;
import org.scilab.forge.scirenderer.Canvas;
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
-@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
++++ scilab-6.0.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;
@@ -233,11 +243,11 @@
/**
* @author Pierre Lando
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
-@@ -11,7 +11,7 @@
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
++++ scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
+@@ -14,7 +14,7 @@
package org.scilab.forge.scirenderer.implementation.jogl;
@@ -246,11 +256,11 @@
/**
* This class store current OpenGl context capacity.
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
-@@ -30,7 +30,7 @@ import org.scilab.forge.scirenderer.tran
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
++++ scilab-6.0.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;
@@ -259,11 +269,11 @@
/**
*
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
-@@ -11,8 +11,8 @@
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
++++ scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
+@@ -14,8 +14,8 @@
package org.scilab.forge.scirenderer.implementation.jogl;
@@ -274,11 +284,11 @@
/**
* @author Pierre Lando
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
-@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buff
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
++++ scilab-6.0.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;
@@ -287,11 +297,11 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
-@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
++++ scilab-6.0.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;
@@ -300,11 +310,11 @@
import java.nio.Buffer;
/**
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
-@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
++++ scilab-6.0.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;
@@ -313,11 +323,11 @@
import java.nio.Buffer;
import java.nio.FloatBuffer;
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
-@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
++++ scilab-6.0.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;
@@ -326,11 +336,11 @@
import java.nio.Buffer;
import java.nio.IntBuffer;
import java.util.Collection;
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
-@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.clip
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
++++ scilab-6.0.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;
@@ -339,11 +349,11 @@
/**
* @author Pierre Lando
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
-@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.tran
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
++++ scilab-6.0.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;
@@ -352,11 +362,11 @@
/**
* @author Pierre Lando
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
-@@ -23,7 +23,7 @@ import org.scilab.forge.scirenderer.text
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
++++ scilab-6.0.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;
@@ -365,11 +375,11 @@
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
-@@ -11,7 +11,7 @@
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
++++ scilab-6.0.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;
@@ -378,11 +388,11 @@
import org.scilab.forge.scirenderer.implementation.jogl.utils.GLShortCuts;
import org.scilab.forge.scirenderer.lightning.Light;
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
-@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.ligh
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
++++ scilab-6.0.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;
@@ -391,11 +401,11 @@
/**
* JoGL implementation of {@link LightManager}
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
-@@ -11,7 +11,7 @@
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
++++ scilab-6.0.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;
@@ -404,11 +414,11 @@
/**
* @author Pierre Lando
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
-@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.impl
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
++++ scilab-6.0.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;
@@ -417,11 +427,11 @@
import java.awt.Point;
import java.nio.FloatBuffer;
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
-@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.Draw
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
++++ scilab-6.0.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;
@@ -430,11 +440,11 @@
/**
* @author Pierre Lando
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
-@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.impl
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
++++ scilab-6.0.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;
@@ -443,11 +453,11 @@
import java.util.HashSet;
import java.util.Set;
import java.util.Stack;
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
-@@ -28,11 +28,11 @@ import org.scilab.forge.scirenderer.tran
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
++++ scilab-6.0.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;
@@ -464,11 +474,11 @@
import java.awt.Dimension;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
-Index: scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
+Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
===================================================================
---- scilab-5.5.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
-+++ scilab-5.5.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
-@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.imp
+--- scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
++++ scilab-6.0.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;
@@ -477,44 +487,3 @@
/**
*
-
-Index: scilab-5.5.2/configure
-===================================================================
---- scilab-5.5.2.orig/configure
-+++ scilab-5.5.2/configure
-@@ -14649,7 +14649,7 @@ $as_echo_n "checking gluegen2-rt... " >&
- // #line 14649 "configure"
- import java.util.regex.Pattern;
-
--import jogamp.common.os.MachineDescriptionRuntime;
-+import jogamp.common.os.MachineDataInfoRuntime;
-
- public class conftest {
- public static void main(String[] argv) {
-@@ -14735,10 +14735,10 @@ $as_echo "$jar_resolved" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- if test "" = "yes"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" >&5
--$as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDataInfoRuntime)" >&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.MachineDataInfoRuntime)" >&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 jogamp.common.os.MachineDataInfoRuntime)" "$LINENO" 5
- fi
- fi
-
-Index: scilab-5.5.2/configure.ac
-===================================================================
---- scilab-5.5.2.orig/configure.ac
-+++ scilab-5.5.2/configure.ac
-@@ -943,7 +943,7 @@ interface for JOGL2 - or libGL (OpenGL l
- fi
-
- # JoGL Native <=> Java connector
-- AC_JAVA_CHECK_PACKAGE([gluegen2-rt],[jogamp.common.os.MachineDescriptionRuntime],[Scilab 3D rendering])
-+ AC_JAVA_CHECK_PACKAGE([gluegen2-rt],[jogamp.common.os.MachineDataInfoRuntime],[Scilab 3D rendering])
- GLUEGEN2_RT=$PACKAGE_JAR_FILE
- AC_SUBST(GLUEGEN2_RT)
-
++++++ scilab-fix-64bit-portability-issue.patch ++++++
--- /var/tmp/diff_new_pack.tgqsqS/_old 2018-03-04 12:50:19.880559988 +0100
+++ /var/tmp/diff_new_pack.tgqsqS/_new 2018-03-04 12:50:19.884559842 +0100
@@ -1,14 +1,57 @@
Upstream bug: http://bugzilla.scilab.org/13267
-Index: scilab-5.5.0/modules/core/src/c/stack2.c
+Index: scilab-6.0.0/modules/graphics/src/c/getHandleProperty/get_tight_limits_property.c
===================================================================
---- scilab-5.5.0.orig/modules/core/src/c/stack2.c
-+++ scilab-5.5.0/modules/core/src/c/stack2.c
-@@ -396,7 +396,7 @@ int get_optionals(char *fname, rhs_opts
- ro->iPos = k;
- if (ro->iType != '?')
- {
-- GetRhsVar(ro->iPos, ro->iType, &ro->iRows, &ro->iCols, &ro->piAddr);
-+ GetRhsVar(ro->iPos, &ro->iType, &ro->iRows, &ro->iCols, &ro->piAddr);
- }
+--- scilab-6.0.0.orig/modules/graphics/src/c/getHandleProperty/get_tight_limits_property.c
++++ scilab-6.0.0/modules/graphics/src/c/getHandleProperty/get_tight_limits_property.c
+@@ -47,6 +47,7 @@ void* get_tight_limits_property(void* _p
+ int i = 0;
+ int j = 0;
+ void* status = NULL;
++ int err = -1;
+
+ for (i = 0 ; i < 3 ; i++)
+ {
+@@ -55,7 +56,7 @@ void* get_tight_limits_property(void* _p
+ if (piTightLimits == NULL)
+ {
+ Scierror(999, _("'%s' property does not exist for this handle.\n"), "tight_limits");
+- return -1;
++ return &err;
+ }
+
+ if (iTightLimits)
+@@ -75,7 +76,7 @@ void* get_tight_limits_property(void* _p
}
- else
+
+ Scierror(999, _("%s: No more memory.\n"), "get_tight_limits_property");
+- return -1;
++ return &err;
+ }
+
+ }
+Index: scilab-6.0.0/modules/scicos/src/c/scicos.c
+===================================================================
+--- scilab-6.0.0.orig/modules/scicos/src/c/scicos.c
++++ scilab-6.0.0/modules/scicos/src/c/scicos.c
+@@ -4073,7 +4073,7 @@ static void call_debug_scicos(scicos_blo
+ // Temporarily replacing the block's computational function with DEBUG_BLOCK's so that sciblk4 will call %debug_scicos()
+ block->scsptr = Blocks[deb_blk].scsptr;
+ (*loc4)(block, *flag);
+- block->scsptr = C2F(scsptr).ptr;
++ block->scsptr = &C2F(scsptr).ptr;
+
+ /* Implicit Solver & explicit block & flag==0 */
+ /* adjust continuous state vector after call */
+Index: scilab-6.0.0/modules/scicos/src/c/import.c
+===================================================================
+--- scilab-6.0.0.orig/modules/scicos/src/c/import.c
++++ scilab-6.0.0/modules/scicos/src/c/import.c
+@@ -934,7 +934,7 @@ int C2F(getsciblockbylabel)(int*kfun, in
+ }
+ nblk = scicos_imp.nblk[0];
+
+- F2C(cvstr)(n, lab, *label, &job, *n);
++ F2C(cvstr)(n, label, *lab, &job, *n);
+
+ *kfun = 0;
+ for (k = 0; k < nblk; k++)
++++++ scilab-hdf5-1_10-compat.patch ++++++
--- /var/tmp/diff_new_pack.tgqsqS/_old 2018-03-04 12:50:19.896559405 +0100
+++ /var/tmp/diff_new_pack.tgqsqS/_new 2018-03-04 12:50:19.896559405 +0100
@@ -1,8 +1,8 @@
-Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile.c
+Index: scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c
===================================================================
---- scilab-5.5.2.orig/modules/hdf5/src/c/h5_readDataFromFile.c
-+++ scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile.c
-@@ -716,7 +716,11 @@ int readCommonPolyMatrix(int _iDatasetId
+--- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile.c
++++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c
+@@ -742,7 +742,11 @@ int readCommonPolyMatrix(int _iDatasetId
/*
* Open the referenced object, get its name and type.
*/
@@ -15,7 +15,7 @@
if (_iComplex)
{
status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
-@@ -950,7 +954,11 @@ int readCommonSparseComplexMatrix(int _i
+@@ -976,7 +980,11 @@ int readCommonSparseComplexMatrix(int _i
}
//read Row data
@@ -28,7 +28,7 @@
status = readInteger32Matrix(obj, _piNbItemRow);
if (status < 0)
{
-@@ -958,7 +966,11 @@ int readCommonSparseComplexMatrix(int _i
+@@ -984,7 +992,11 @@ int readCommonSparseComplexMatrix(int _i
}
//read cols data
@@ -41,7 +41,7 @@
status = readInteger32Matrix(obj, _piColPos);
if (status < 0)
{
-@@ -966,7 +978,11 @@ int readCommonSparseComplexMatrix(int _i
+@@ -992,7 +1004,11 @@ int readCommonSparseComplexMatrix(int _i
}
//read sparse data
@@ -54,7 +54,7 @@
if (_iComplex)
{
-@@ -1017,7 +1033,11 @@ int readBooleanSparseMatrix(int _iDatase
+@@ -1043,7 +1059,11 @@ int readBooleanSparseMatrix(int _iDatase
}
//read Row data
@@ -67,7 +67,7 @@
status = readInteger32Matrix(obj, _piNbItemRow);
if (status < 0)
{
-@@ -1027,7 +1047,11 @@ int readBooleanSparseMatrix(int _iDatase
+@@ -1053,7 +1073,11 @@ int readBooleanSparseMatrix(int _iDatase
if (_iNbItem != 0)
{
//read cols data
@@ -80,7 +80,7 @@
status = readInteger32Matrix(obj, _piColPos);
if (status < 0)
{
-@@ -1132,7 +1156,11 @@ int getListItemDataset(int _iDatasetId,
+@@ -1154,7 +1178,11 @@ int getListItemDataset(int _iDatasetId,
{
hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
@@ -93,11 +93,11 @@
if (*_piItemDataset == 0)
{
-Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
+Index: scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c
===================================================================
---- scilab-5.5.2.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c
-+++ scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
-@@ -471,7 +471,11 @@ int readDoubleMatrix_v1(int _iDatasetId,
+--- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c
++++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c
+@@ -474,7 +474,11 @@ int readDoubleMatrix_v1(int _iDatasetId,
}
//Open the referenced object, get its name and type.
@@ -110,7 +110,7 @@
readDouble_v1(obj, _iRows, _iCols, _pdblData);
}
-@@ -498,14 +502,22 @@ int readDoubleComplexMatrix_v1(int _iDat
+@@ -501,14 +505,22 @@ int readDoubleComplexMatrix_v1(int _iDat
}
//Open the referenced object, get its name and type.
@@ -135,7 +135,7 @@
status = readDouble_v1(obj, _iRows, _iCols, _pdblImg);
if (status < 0)
{
-@@ -831,7 +843,11 @@ int readCommonPolyMatrix_v1(int _iDatase
+@@ -834,7 +846,11 @@ int readCommonPolyMatrix_v1(int _iDatase
/*
* Open the referenced object, get its name and type.
*/
@@ -148,7 +148,7 @@
if (_iComplex)
{
status = readComplexPoly_v1(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
-@@ -1066,7 +1082,11 @@ int readCommonSparseComplexMatrix_v1(int
+@@ -1069,7 +1085,11 @@ int readCommonSparseComplexMatrix_v1(int
}
//read Row data
@@ -161,7 +161,7 @@
status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
if (status < 0)
{
-@@ -1074,7 +1094,11 @@ int readCommonSparseComplexMatrix_v1(int
+@@ -1077,7 +1097,11 @@ int readCommonSparseComplexMatrix_v1(int
}
//read cols data
@@ -174,7 +174,7 @@
status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
if (status < 0)
{
-@@ -1082,7 +1106,11 @@ int readCommonSparseComplexMatrix_v1(int
+@@ -1085,7 +1109,11 @@ int readCommonSparseComplexMatrix_v1(int
}
//read sparse data
@@ -187,7 +187,7 @@
if (_iComplex)
{
-@@ -1128,7 +1156,11 @@ int readBooleanSparseMatrix_v1(int _iDat
+@@ -1131,7 +1159,11 @@ int readBooleanSparseMatrix_v1(int _iDat
}
//read Row data
@@ -200,7 +200,7 @@
status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
if (status < 0)
{
-@@ -1136,7 +1168,11 @@ int readBooleanSparseMatrix_v1(int _iDat
+@@ -1139,7 +1171,11 @@ int readBooleanSparseMatrix_v1(int _iDat
}
//read cols data
@@ -213,7 +213,7 @@
status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
if (status < 0)
{
-@@ -1235,7 +1271,11 @@ int getListItemDataset_v1(int _iDatasetI
+@@ -1234,7 +1270,11 @@ int getListItemDataset_v1(int _iDatasetI
{
hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
@@ -226,11 +226,11 @@
if (*_piItemDataset == 0)
{
-Index: scilab-5.5.2/modules/hdf5/src/cpp/H5ReferenceData.cpp
+Index: scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp
===================================================================
---- scilab-5.5.2.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp
-+++ scilab-5.5.2/modules/hdf5/src/cpp/H5ReferenceData.cpp
-@@ -39,7 +39,11 @@ const char ** H5ReferenceData::getRefere
+--- scilab-6.0.0.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp
++++ scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp
+@@ -42,7 +42,11 @@ const char ** H5ReferenceData::getRefere
for (int i = 0; i < totalSize; i++)
{
void * ref = &(((void **)cdata)[i]);
@@ -243,7 +243,7 @@
H5O_info_t info;
H5Oget_info(obj, &info);
H5Oclose(obj);
-@@ -81,7 +85,11 @@ H5Object & H5ReferenceData::getData(cons
+@@ -84,7 +88,11 @@ H5Object & H5ReferenceData::getData(cons
file = getFile().getH5Id();
ref = &(((void **)cdata)[0]);
@@ -256,7 +256,7 @@
if (obj < 0)
{
throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position."));
-@@ -123,7 +131,11 @@ H5Object ** H5ReferenceData::getReferenc
+@@ -126,7 +134,11 @@ H5Object ** H5ReferenceData::getReferenc
for (int i = 0; i < totalSize; i++)
{
void * ref = &(((void **)cdata)[i]);
@@ -269,7 +269,7 @@
objs[i] = &H5Object::getObject(getParent(), obj);
}
-@@ -178,7 +190,11 @@ void H5ReferenceData::printData(std::ost
+@@ -181,7 +193,11 @@ void H5ReferenceData::printData(std::ost
char * cdata = static_cast
From 1f13645c66b8307bcecf9e87fb45db2c0e88a1a8 Mon Sep 17 00:00:00 2001 From: Paul Bignier
Date: Fri, 10 Feb 2017 14:54:11 +0100 Subject: [PATCH 1/1] Xcos java: minor cleanup
Change-Id: Ibd88d95fe2a8a9f37969e08d76c7e3f53e660f69 --- .../modules/xcos/actions/ExportAllAction.java | 1 - .../xcos/block/actions/CodeGenerationAction.java | 1 - .../modules/xcos/graph/ScicosParameters.java | 1 - .../org/scilab/modules/xcos/palette/Palette.java | 2 -- 4 files changed, 5 deletions(-) Index: scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/actions/ExportAllAction.java =================================================================== --- scilab-6.0.1.orig/modules/xcos/src/java/org/scilab/modules/xcos/actions/ExportAllAction.java +++ scilab-6.0.1/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.1/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/CodeGenerationAction.java =================================================================== --- scilab-6.0.1.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/CodeGenerationAction.java +++ scilab-6.0.1/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.1/modules/xcos/src/java/org/scilab/modules/xcos/graph/ScicosParameters.java =================================================================== --- scilab-6.0.1.orig/modules/xcos/src/java/org/scilab/modules/xcos/graph/ScicosParameters.java +++ scilab-6.0.1/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.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java =================================================================== --- scilab-6.0.1.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java +++ scilab-6.0.1/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.1/modules/xcos/src/java/org/scilab/modules/xcos/BrowserView.java =================================================================== --- scilab-6.0.1.orig/modules/xcos/src/java/org/scilab/modules/xcos/BrowserView.java +++ scilab-6.0.1/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; import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeNode; import org.scilab.modules.xcos.explorer.BrowserTreeNodeData; @@ -257,8 +258,8 @@ public class BrowserView extends View { final DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); DefaultMutableTreeNode node; - for (Enumeration<DefaultMutableTreeNode> e = root.depthFirstEnumeration(); e.hasMoreElements();) { - node = e.nextElement(); + for (Enumeration<TreeNode> e = root.depthFirstEnumeration(); e.hasMoreElements();) { + node = (DefaultMutableTreeNode) e.nextElement(); BrowserTreeNodeData data = (BrowserTreeNodeData) node.getUserObject(); if (data.getId() == uid) { return node; Index: scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/model/Palette.java =================================================================== --- scilab-6.0.1.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/model/Palette.java +++ scilab-6.0.1/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() */ @Override - public Enumeration<Object> children() { + public Enumeration<? extends TreeNode> children() { return null; } Index: scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java =================================================================== --- scilab-6.0.1.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java +++ scilab-6.0.1/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; import java.util.List; +import java.util.Vector; import java.util.Map; import java.util.Set; import java.util.logging.Level; @@ -755,12 +756,14 @@ public final class SuperblockMaskCustomi * it */ @SuppressWarnings("unchecked") - final List < List<? >> data = model.getDataVector(); + final Vector<Vector> data = model.getDataVector(); /* Inverting data */ - List<?> tmp = data.get(row2); - data.set(row2, data.get(row1)); - data.set(row1, tmp); + Vector tmp = data.get(row2); + model.removeRow(row2); + model.insertRow(row2, data.get(row1)); + model.removeRow(row1); + model.insertRow(row1, tmp); } } } ++++++ scilab_ppc64le_java_archinstall_changed.patch ++++++ --- /var/tmp/diff_new_pack.tgqsqS/_old 2018-03-04 12:50:20.044554011 +0100 +++ /var/tmp/diff_new_pack.tgqsqS/_new 2018-03-04 12:50:20.044554011 +0100 @@ -4,11 +4,11 @@ m4/java.m4 | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) -Index: scilab-5.5.2/m4/java.m4 +Index: scilab-6.0.1/m4/java.m4 =================================================================== ---- scilab-5.5.2.orig/m4/java.m4 -+++ scilab-5.5.2/m4/java.m4 -@@ -481,9 +481,12 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [ +--- scilab-6.0.1.orig/m4/java.m4 ++++ scilab-6.0.1/m4/java.m4 +@@ -480,9 +480,12 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [ powerpc) machine=ppc ;; @@ -22,11 +22,11 @@ armv*) machine=arm ;; -Index: scilab-5.5.2/configure +Index: scilab-6.0.1/configure =================================================================== ---- scilab-5.5.2.orig/configure -+++ scilab-5.5.2/configure -@@ -11810,9 +11810,12 @@ $as_echo "$ac_cv_java_jvm_jni_working" > +--- scilab-6.0.1.orig/configure ++++ scilab-6.0.1/configure +@@ -12391,9 +12391,12 @@ $as_echo "$ac_cv_java_jvm_jni_working" > powerpc) machine=ppc ;; @@ -40,11 +40,11 @@ armv*) machine=arm ;; -Index: scilab-5.5.2/bin/scilab +Index: scilab-6.0.1/bin/scilab =================================================================== ---- scilab-5.5.2.orig/bin/scilab -+++ scilab-5.5.2/bin/scilab -@@ -528,9 +528,12 @@ detect_java_vm() { +--- scilab-6.0.1.orig/bin/scilab ++++ scilab-6.0.1/bin/scilab +@@ -538,9 +538,12 @@ detect_java_vm() { "ppc"|"powerpc") proc="ppc" ;;