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 - [email protected] + +- 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-java-9-td4037645.html +- 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 - [email protected] + +- 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 [email protected] -- Fix compiler warnings w.r.t 64bit portability Patch3: scilab-fix-64bit-portability-issue.patch -# PATCH-FIX-UPSTREAM scilab-ocaml.patch [email protected] -- Fix build with ocaml-4.05 with scilab-ocaml.patch (bug#15107) -Patch4: scilab-ocaml.patch # PATCH-FIX-OPENSUSE scilab-special-jarnames.patch [email protected] -- 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 [email protected] -- 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 [email protected] -- 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 [email protected] -- Make scilab build with jogl and gluegen >= 2.3.0 Patch8: scilab-build-with-jogl-2.3.patch # PATCH-FIX-OPENSUSE scilab-timestamp.patch [email protected] -- Remove timestamps from binaries Patch9: scilab-timestamp.patch -# PATCH-FIX-UPSTREAM scilab-batik-1.8.patch [email protected] -- 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 [email protected] -- 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 [email protected] -- Fix build failures with updated javadoc Patch13: scilab-self-closing-br.patch # PATCH-FIX-UPSTREAM scilab-hdf5-1_10-compat.patch [email protected] -- 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 [email protected] -- 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 [email protected] -- 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 [email protected] -- 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 [email protected] -- 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 [email protected] -- 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 [email protected] -- 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 [email protected] -- 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 [email protected] -- Fix compilation of xcos against openjdk-java 9; patch sent upstream +Patch24: scilab-xcos-java9.patch +# PATCH-FIX-UPSTREAM scilab-java9-ClassLoader.patch [email protected] -- 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-java-9-td4037645.html +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-java-9-td4037645.html + +# 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<char *>(data) + offset + pos * (stride ? stride : dataSize); void ** ref = &(((void **)cdata)[0]); hid_t file = getFile().getH5Id(); @@ -282,3 +282,37 @@ if (obj < 0) { os << "NULL"; +Index: scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp +=================================================================== +--- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp ++++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp +@@ -648,7 +648,11 @@ static types::InternalType* import_struc + //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()); +Index: scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp +=================================================================== +--- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp ++++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp +@@ -735,7 +735,11 @@ static bool read_struct(int dataset, Var + //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; ++++++ scilab-hdf5-function-return-compatibility.patch ++++++ Index: scilab-6.0.0/modules/hdf5/src/c/h5_writeDataToFile.c =================================================================== --- scilab-6.0.0.orig/modules/hdf5/src/c/h5_writeDataToFile.c +++ scilab-6.0.0/modules/hdf5/src/c/h5_writeDataToFile.c @@ -2166,7 +2166,7 @@ int writeDoubleMatrix6(int parent, const return dset; } -hid_t writeDoubleComplexMatrix6(int parent, const char* name, int dims, int* pdims, double* real, double* img) +int writeDoubleComplexMatrix6(int parent, const char* name, int dims, int* pdims, double* real, double* img) { hid_t space = 0; hid_t dset = 0; ++++++ scilab-java9-ClassLoader.patch ++++++ Index: scilab-6.0.1/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java =================================================================== --- scilab-6.0.1.orig/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java +++ scilab-6.0.1/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java @@ -62,7 +62,7 @@ public class ClassPath { */ public static void addURL(final URL u, int i) { - final URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader(); + final URLClassLoader sysloader = new URLClassLoader (new URL[] {}, ClassLoader.getSystemClassLoader()); Class sysclass = URLClassLoader.class; try { @@ -94,12 +94,8 @@ public class ClassPath { */ public static String[] getClassPath() { - URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader(); - URL[] path = sysloader.getURLs(); - String[] paths = new String[path.length]; - for (int i = 0; i < path.length; i++) { - paths[i] = path[i].getFile(); - } + ClassLoader sysloader = ClassLoader.getSystemClassLoader(); + String[] paths = {""}; return paths; } Index: scilab-6.0.1/bin/scilab =================================================================== --- scilab-6.0.1.orig/bin/scilab +++ scilab-6.0.1/bin/scilab @@ -620,6 +620,10 @@ detect_java_vm() { ;; esac + # Hack to enable frontloading all needed and optional jars during load; TO BE USED IN CONJUNCTION WITH RPM SPECFILE SED HACK + export _JAVA_OPTIONS="${_JAVA_OPTIONS} -Djava.class.path=@SPEC_ALL_JAR_CLASSPATHS@ -Djava.library.path=@SPEC_SCI_LIB_PATH@ -Djava.add.modules=java.xml.bind" + + ####### END OF JAVA ENV DETECTION/SETTING ###### } Index: scilab-6.0.1/configure.ac =================================================================== --- scilab-6.0.1.orig/configure.ac +++ scilab-6.0.1/configure.ac @@ -1037,6 +1037,10 @@ interface for JOGL2 - or libGL (OpenGL l JEUCLID_CORE=$PACKAGE_JAR_FILE AC_SUBST(JEUCLID_CORE) + # JAF required for xmlto* functions + AC_JAVA_CHECK_JAR([jaf],[javax.activation.MimetypesFileTypeMap],[JAF : JavaBeans Activation Framework]) + JAF=$PACKAGE_JAR_FILE + AC_SUBST(JAF) ################ Mandatory for graphic_export features ##### # XML to PDF/other Translator Index: scilab-6.0.1/configure =================================================================== --- scilab-6.0.1.orig/configure +++ scilab-6.0.1/configure @@ -809,6 +809,7 @@ FREEHEP_GRAPHICSIO FREEHEP_GRAPHICS2D FOP JEUCLID_CORE +JAF JROSETTA_ENGINE JROSETTA_API LUCENE_PARSER @@ -17826,6 +17827,224 @@ $as_echo "$as_me: WARNING: Could not fin JEUCLID_CORE=$PACKAGE_JAR_FILE + # JavaBeans Activation Framework + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking jaf" >&5 +$as_echo_n "checking jaf... " >&6; } + PACKAGE_JAR_FILE= + + 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 'jaf.jar' -or -name 'libjaf.jar' -or -name 'libjaf-java.jar' -or -name 'jaf*.jar' \) 2>/dev/null |tr '\n' ':')." + + if test ! -f conftestSharedChecker.class ; then + + cat << \EOF > conftestSharedChecker.java +// #line 14982 "configure" +import java.util.regex.Pattern; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; + +public class conftestSharedChecker { + + /** + * Required arguments : + * argv[0]: name of the jar package + * argv[1]: name of the class (with the package prefix) + * argv[2]: possible paths of the jar package (separated by ':') + * + * Optional arguments: + * argv[3]: field or method used to retrieve the version + * argv[4]: expected version + * argv[5]: String comparator : + * "=" for exact version + */ + public static void main(String[] argv) { + final String packageName = argv[0]; + final String className = argv[1]; + final String[] jarList = argv[2].split(":"); + + ArrayList<URL> found = new ArrayList<>(); + for(String jar : jarList) + { + try { + File f = new File(jar); + if (f.exists()) { + found.add(f.toURI().toURL()); + } + } catch (IOException ex) { + System.err.println(ex.toString()); + } + } + + URLClassLoader localClassLoader = new URLClassLoader(found.toArray(new URL[found.size()])); + URL klassURL = null; + Class<?> klass = null; + try { + String resourceName = className.replace(".", "/") + ".class"; + klassURL = localClassLoader.getResource(resourceName); + klass = localClassLoader.loadClass(className); + } catch (ClassNotFoundException ex) { + System.err.println(className + " not found"); + System.exit(-1); + } + + String pathURL = klassURL.getPath().substring(0, klassURL.getPath().indexOf('!')); + String path = pathURL.substring(pathURL.indexOf(':') + 1); + System.err.println("found: " + path); + + if (argv.length > 3) { + checkVersion(klass, argv); + } + + System.out.println(path); + } + + private static void checkVersion(Class<?> klass, String[] argv) throws SecurityException, IllegalArgumentException { + final String versionMethod = argv[3]; + final String expected = argv[4]; + final String atLeastOrEqual; + if (argv.length > 5) + atLeastOrEqual = argv[5]; + else + atLeastOrEqual = "<="; + + try { + try { + Field field = klass.getField(versionMethod); + Object value = field.get(null); + compareAndDisplay(atLeastOrEqual, expected, value); + } catch (NoSuchFieldException fe) { + Method method = null; + try { + method = klass.getMethod(versionMethod); + } catch (NoSuchMethodException ex) { + System.err.println(ex.toString()); + System.exit(-3); + } + + try { + Object value = method.invoke(null); + compareAndDisplay(atLeastOrEqual, expected, value); + } catch (NullPointerException ex) { + Object value = method.invoke(klass.newInstance()); + compareAndDisplay(atLeastOrEqual, expected, value); + } + } + } catch (IllegalAccessException ex) { + System.err.println(ex); + System.exit(-2); + } catch (InvocationTargetException ex) { + System.err.println(ex); + System.exit(-2); + } catch (InstantiationException ex) { + System.err.println(ex); + System.exit(-2); + } + } + + private static void compareAndDisplay(String atLeastOrEqual, String expected, Object value) { + int cmp = compare(expected, value.toString()); + + switch(atLeastOrEqual) { + case ">": + if (cmp > 0) { + return; + } else { + System.err.println("expected "+atLeastOrEqual+""+expected+" but got "+value); + System.exit(-4); + } + case "==": + if (cmp == 0) { + return; + } else { + System.err.println("expected "+atLeastOrEqual+""+expected+" but got "+value); + System.exit(-4); + } + case "<=": + if (cmp <= 0) { + return; + } else { + System.err.println("expected "+atLeastOrEqual+""+expected+" but got "+value); + System.exit(-4); + } + default: + System.err.println("unable to compare with "+atLeastOrEqual); + System.exit(-4); + } + } + + private static int compare(String v1, String v2) { + String s1 = normalisedVersion(v1); + String s2 = normalisedVersion(v2); + + System.err.println("compare: " + v1 + " normalised to " + s1); + System.err.println("compare: " + v2 + " normalised to " + s2); + return s1.compareTo(s2); + } + + private static String normalisedVersion(String version) { + return normalisedVersion(version, ".", 4); + } + + private static String normalisedVersion(String version, String sep, int maxWidth) { + String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version); + StringBuilder sb = new StringBuilder(); + for (String s : split) { + sb.append(String.format("%" + maxWidth + 's', s)); + } + return sb.toString(); + } +} +EOF + + CLASSPATH=$ac_java_classpath + export CLASSPATH + cmd="$JAVAC ${JAVAC_FLAGS} conftestSharedChecker.java" + if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5) ; then + echo "configure: conftestSharedChecker.class available" >&5 + else + echo "configure: failed program was:" >&5 + cat conftestSharedChecker.java >&5 + echo "configure: CLASSPATH was $CLASSPATH" >&5 + fi + + fi + + CLASSPATH=$ac_java_classpath + export CLASSPATH + cmd="$JAVA conftestSharedChecker jaf javax.activation.MimetypesFileTypeMap $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 +$as_echo "$PACKAGE_JAR_FILE" >&6; } + echo "yes" >&5 + # append the found file to the classpath to manage jar dependency + ac_java_classpath="$ac_java_classpath:$PACKAGE_JAR_FILE" + else + { $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 jaf used by Scilab Gui - JavaBeans Activation Framework (looking for package javax.activation.MimetypesFileTypeMap)" >&5 +$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jaf used by Scilab Gui - JavaBeans Activation Framework (looking for package javax.activation.MimetypesFileTypeMap)" >&2;} + else + as_fn_error $? "Could not find or use the Java package/jar jaf used by Scilab Gui - JavaBeans Activation Framework (looking for package javax.activation.MimetypesFileTypeMap)" "$LINENO" 5 + fi + fi + if test -f conftestSharedChecker.java.output; then + rm conftestSharedChecker.java.output + fi + + JAF=$PACKAGE_JAR_FILE + ################ Mandatory for graphic_export features ##### # XML to PDF/other Translator Index: scilab-6.0.1/etc/classpath.xml.in =================================================================== --- scilab-6.0.1.orig/etc/classpath.xml.in +++ scilab-6.0.1/etc/classpath.xml.in @@ -79,6 +79,8 @@ The option is "disableUnderMode" and can <path value="@GLUEGEN2_RT@"/> +<path value="@JAF@"/> + <!-- Temp. loaded at startup --> <path value="$SCILAB/modules/types/jar/org.scilab.modules.types.jar"/> <!-- END --> Index: scilab-6.0.1/Makefile.in =================================================================== --- scilab-6.0.1.orig/Makefile.in +++ scilab-6.0.1/Makefile.in @@ -630,6 +630,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +JAF= @JAF@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ ++++++ scilab-launch-from-xterm.patch ++++++ Index: scilab-6.0.1/desktop/scilab.desktop =================================================================== --- scilab-6.0.1.orig/desktop/scilab.desktop +++ scilab-6.0.1/desktop/scilab.desktop @@ -3,7 +3,7 @@ Comment=Scientific software package for Comment[fr]=Logiciel scientifique de calcul numérique Comment[de]=eine Wissenschaftssoftware für numerische Berechnungen Comment[ru]=Научная программа для численных расчётов -Exec=scilab -f +Exec=xterm -title "Scilab launcher: DO NOT CLOSE" -e scilab -f GenericName=Scientific Software Package GenericName[fr]=Logiciel de calcul numérique GenericName[de]=Wissenschaftssoftware ++++++ scilab-no-return-in-non-void.patch ++++++ Index: scilab-6.0.1/modules/ast/includes/exps/opexp.hxx =================================================================== --- scilab-6.0.1.orig/modules/ast/includes/exps/opexp.hxx +++ scilab-6.0.1/modules/ast/includes/exps/opexp.hxx @@ -254,6 +254,7 @@ public: case unknown: return L"unknown"; } + return L"\0"; } Index: scilab-6.0.1/modules/ast/src/cpp/analysis/ConstraintManager.cpp =================================================================== --- scilab-6.0.1.orig/modules/ast/src/cpp/analysis/ConstraintManager.cpp +++ scilab-6.0.1/modules/ast/src/cpp/analysis/ConstraintManager.cpp @@ -96,6 +96,7 @@ bool ConstraintManager::check(const MPol } } } + return false; } bool ConstraintManager::check(Kind kind, const std::vector<GVN::Value *> & values) Index: scilab-6.0.1/modules/ast/src/cpp/analysis/InferenceConstraints.cpp =================================================================== --- scilab-6.0.1.orig/modules/ast/src/cpp/analysis/InferenceConstraints.cpp +++ scilab-6.0.1/modules/ast/src/cpp/analysis/InferenceConstraints.cpp @@ -187,6 +187,7 @@ InferenceConstraint::Result MPolyConstra } } } + return Result::RESULT_DUNNO; } MPolyConstraintSet MPolyConstraint::getMPConstraints(const std::vector<GVN::Value *> & values) const Index: scilab-6.0.1/modules/core/src/fortran/clunit.f =================================================================== --- scilab-6.0.1.orig/modules/core/src/fortran/clunit.f +++ scilab-6.0.1/modules/core/src/fortran/clunit.f @@ -61,6 +61,7 @@ c character*800 nomfic double precision res err = 0 + clunit = err c c ---------- c close file ++++++ scilab-openjdk9-no-javah.patch ++++++ From: Clément DAVID <[email protected]> Date: Fri, 8 Dec 2017 12:56:53 +0000 (+0100) Subject: configure: detect Java 9 correctly X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=34213c9e5ca5dbb2f421eeb173a67da236b9327f;hp=5cf6aebe58a73d759b4e53978fdd60bd8b0e0191 configure: detect Java 9 correctly Change-Id: I9b77db62a6fea7ceb1176df1bbf513268dca7e37 --- Index: scilab-6.0.1/configure =================================================================== --- scilab-6.0.1.orig/configure +++ scilab-6.0.1/configure @@ -12987,100 +12987,7 @@ fi JAVA_G=$JAVA fi - TOOL=javah - - if test "$cross_compiling" = "yes" ; then - # Extract the first word of "$TOOL", so it can be a program name with args. -set dummy $TOOL; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_JAVAH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $JAVAH in - [\\/]* | ?:[\\/]*) - ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -JAVAH=$ac_cv_path_JAVAH -if test -n "$JAVAH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5 -$as_echo "$JAVAH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - else - # Extract the first word of "$TOOL", so it can be a program name with args. -set dummy $TOOL; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_JAVAH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $JAVAH in - [\\/]* | ?:[\\/]*) - ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $ac_java_jvm_bin_dir -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -JAVAH=$ac_cv_path_JAVAH -if test -n "$JAVAH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5 -$as_echo "$JAVAH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - - # Check to see if JAVAH could not be found - - - if test "x$JAVAH" = "x" ; then - as_fn_error $? "Cannot find $TOOL" "$LINENO" 5 - fi - - + JAVAH=$JAVAC -h if test "$cross_compiling" = "yes" ; then Index: scilab-6.0.1/m4/java.m4 =================================================================== --- scilab-6.0.1.orig/m4/java.m4 +++ scilab-6.0.1/m4/java.m4 @@ -796,9 +796,6 @@ AC_DEFUN([AC_JAVA_TOOLS], [ JAVA_G=$JAVA fi - TOOL=javah - AC_JAVA_TOOLS_CHECK(JAVAH, $TOOL, $ac_java_jvm_bin_dir) - AC_JAVA_TOOLS_CHECK(JAR, jar, $ac_java_jvm_bin_dir) AC_JAVA_TOOLS_CHECK(JAVADOC, javadoc, $ac_java_jvm_bin_dir) ++++++ scilab-self-closing-br.patch ++++++ ++++ 2486 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/scilab/scilab-self-closing-br.patch ++++ and /work/SRC/openSUSE:Factory/.scilab.new/scilab-self-closing-br.patch ++++++ scilab-special-jarnames.patch ++++++ --- /var/tmp/diff_new_pack.tgqsqS/_old 2018-03-04 12:50:20.000555615 +0100 +++ /var/tmp/diff_new_pack.tgqsqS/_new 2018-03-04 12:50:20.000555615 +0100 @@ -1,31 +1,31 @@ -Index: scilab-5.5.1/configure +Index: scilab-6.0.1/configure =================================================================== ---- scilab-5.5.1.orig/configure -+++ scilab-5.5.1/configure -@@ -13670,7 +13670,7 @@ $as_echo_n "checking looks... " >&6; } - saved_ac_java_classpath=$ac_java_classpath - DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /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) $(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)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do -- for jar in "$jardir/looks.jar" "$jardir/liblooks.jar" "$jardir/liblooks-java.jar" "$jardir/looks*.jar"; do -+ for jar in "$jardir/looks.jar" "$jardir/liblooks.jar" "$jardir/liblooks-java.jar" "$jardir/looks*.jar" "$jardir/jgoodies-looks*.jar"; do - - # TODO check the behaviour when spaces - jars_resolved=`ls $jar 2>/dev/null` -@@ -15274,7 +15274,7 @@ $as_echo_n "checking fop... " >&6; } - saved_ac_java_classpath=$ac_java_classpath - DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /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) $(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)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do -- for jar in "$jardir/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar" "$jardir/fop*.jar"; do -+ for jar in "$jardir/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar" "$jardir/fop*.jar" "$jardir/xmlgraphics-fop.jar"; do - - # TODO check the behaviour when spaces - jars_resolved=`ls $jar 2>/dev/null` -@@ -16722,7 +16722,7 @@ $as_echo_n "checking xml-apis-ext... " > - saved_ac_java_classpath=$ac_java_classpath - DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /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) $(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)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do -- for jar in "$jardir/xml-apis-ext.jar" "$jardir/libxml-apis-ext.jar" "$jardir/libxml-apis-ext-java.jar" "$jardir/xml-apis-ext*.jar"; do -+ for jar in "$jardir/xml-apis-ext.jar" "$jardir/libxml-apis-ext.jar" "$jardir/libxml-apis-ext-java.jar" "$jardir/xml-apis-ext*.jar" "$jardir/xml-commons-jaxp-1.3-apis-ext*.jar"; do +--- scilab-6.0.1.orig/configure ++++ scilab-6.0.1/configure +@@ -14535,7 +14535,7 @@ $as_echo_n "checking looks... " >&6; } + + 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 'looks.jar' -or -name 'liblooks.jar' -or -name 'liblooks-java.jar' -or -name 'looks*.jar' \) 2>/dev/null |tr '\n' ':')." ++ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'looks.jar' -or -name 'liblooks.jar' -or -name 'liblooks-java.jar' -or -name 'looks*.jar' -or -name 'jgoodies-looks*.jar' \) 2>/dev/null |tr '\n' ':')." + + if test ! -f conftestSharedChecker.class ; then + +@@ -17928,7 +17928,7 @@ $as_echo_n "checking fop... " >&6; } + + 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' -or -name 'fop*.jar' -or -name 'xmlgraphics-fop.jar' \) 2>/dev/null |tr '\n' ':')." + + if test ! -f conftestSharedChecker.class ; then + +@@ -20346,7 +20346,7 @@ $as_echo_n "checking xml-apis-ext... " > + + 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 'xml-apis-ext.jar' -or -name 'libxml-apis-ext.jar' -or -name 'libxml-apis-ext-java.jar' -or -name 'xml-apis-ext*.jar' \) 2>/dev/null |tr '\n' ':')." ++ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'xml-apis-ext.jar' -or -name 'libxml-apis-ext.jar' -or -name 'libxml-apis-ext-java.jar' -or -name 'xml-apis-ext*.jar' -or -name 'xml-commons-jaxp-1.3-apis-ext*.jar' \) 2>/dev/null |tr '\n' ':')." + + if test ! -f conftestSharedChecker.class ; then - # TODO check the behaviour when spaces - jars_resolved=`ls $jar 2>/dev/null` ++++++ scilab-timestamp.patch ++++++ --- /var/tmp/diff_new_pack.tgqsqS/_old 2018-03-04 12:50:20.020554886 +0100 +++ /var/tmp/diff_new_pack.tgqsqS/_new 2018-03-04 12:50:20.020554886 +0100 @@ -3,11 +3,11 @@ modules/core/src/c/getstaticdebuginfo.c | 6 ------ 2 files changed, 20 deletions(-) -Index: scilab-5.5.2/modules/core/src/c/getstaticDebugInfo_Windows.c +Index: scilab-6.0.1/modules/core/src/c/getstaticDebugInfo_Windows.c =================================================================== ---- scilab-5.5.2.orig/modules/core/src/c/getstaticDebugInfo_Windows.c -+++ scilab-5.5.2/modules/core/src/c/getstaticDebugInfo_Windows.c -@@ -47,20 +47,6 @@ char **getStaticDebugInfo_Windows(int *s +--- scilab-6.0.1.orig/modules/core/src/c/getstaticDebugInfo_Windows.c ++++ scilab-6.0.1/modules/core/src/c/getstaticDebugInfo_Windows.c +@@ -49,20 +49,6 @@ char **getStaticDebugInfo_Windows(int *s str_info = (char*)MALLOC(sizeof(char) * BUFFER_LEN); if (str_info) { @@ -28,11 +28,11 @@ #ifdef _WIN64 sprintf(str_info, "Compiler Architecture: %s", "X64"); #else -Index: scilab-5.5.2/modules/core/src/c/getstaticdebuginfo.c +Index: scilab-6.0.1/modules/core/src/c/getstaticdebuginfo.c =================================================================== ---- scilab-5.5.2.orig/modules/core/src/c/getstaticdebuginfo.c -+++ scilab-5.5.2/modules/core/src/c/getstaticdebuginfo.c -@@ -47,12 +47,6 @@ char **getStaticDebugInfo(int *sizeArray +--- scilab-6.0.1.orig/modules/core/src/c/getstaticdebuginfo.c ++++ scilab-6.0.1/modules/core/src/c/getstaticdebuginfo.c +@@ -50,12 +50,6 @@ char **getStaticDebugInfo(int *sizeArray #ifdef SCI_VERSION_STRING {"Scilab Version", SCI_VERSION_STRING}, #endif ++++++ scilab-xcos-java9.patch ++++++ >From 1f13645c66b8307bcecf9e87fb45db2c0e88a1a8 Mon Sep 17 00:00:00 2001 From: Paul Bignier <[email protected]> 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" ;;
