Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2019-03-14 22:42:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab" Thu Mar 14 22:42:43 2019 rev:31 rq:684803 version:6.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2018-12-19 13:50:45.607172991 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new.28833/scilab.changes 2019-03-14 22:42:48.670631315 +0100 @@ -1,0 +2,34 @@ +Thu Mar 7 13:55:18 UTC 2019 - Atri B <[email protected]> + +- Update to version 6.0.2: + * See https://help.scilab.org/docs/6.0.2/en_US/CHANGES.html. +- Drop patches either directly incorporated upstream or otherwise + fixed: + * scilab-0003-fix-desktop-categories.patch (fixed because of + updated desktop menu categories on openSUSE). + * scilab_ppc64le_java_archinstall_changed.patch. + * scilab-hdf5-1_10-compat.patch. + * scilab-hdf5-function-return-compatibility.patch. + * scilab-launch-from-xterm.patch (also drop xterm Requires). + * scilab-gfortran8-errors.patch. +- Modify scilab-java9-ClassLoader.patch to add java modules to + _JAVA_OPTIONS using "--add-modules" as opposed to + "-Djava.add.modules" which does not work. +- Add scilab-drop-javax-annotation.patch: Remove references to + javax.annotation as it is unavailable with java >= 11 and the + code referencing this doesn't do anything anyway. +- Modify patches touching configure directly to instead work on m4 + and configure.ac and regenerate configure script before + building; this makes the patches cleaner and simpler to + maintain. Add libtool BuildRequires for autoreconf dependencies. +- Minor rebase of other patches to apply cleanly. +- Use suse_update_desktop_file macro to install .desktop files + instead of desktop-file-install (less clunky). +- New BuildRequires: time. +- Update java version in Requires and BuildRequires: >= 11 now + needed. +- Drop scilab-dont-test-for-jaf.patch as JAF has been added back + to openjdk >= 11 packages for openSUSE 15.0 and newer; drop + BuildRequires and Requires on external jaf. + +------------------------------------------------------------------- Old: ---- scilab-0003-fix-desktop-categories.patch scilab-6.0.1-src.tar.gz scilab-dont-test-for-jaf.patch scilab-gfortran8-errors.patch scilab-hdf5-1_10-compat.patch scilab-hdf5-function-return-compatibility.patch scilab-launch-from-xterm.patch scilab_ppc64le_java_archinstall_changed.patch New: ---- scilab-6.0.2-src.tar.gz scilab-drop-javax-annotation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scilab.spec ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.074630481 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.078630479 +0100 @@ -1,7 +1,7 @@ # # spec file for package scilab # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define sover 6 %define soname lib%{name}%{sover} -#%define beta_version 5.5.0-beta-1 +#%%define beta_version 5.5.0-beta-1 Name: scilab Summary: High Level Programming Language/Numerical Analysis Software License: GPL-2.0-only AND BSD-3-Clause Group: Productivity/Scientific/Math -Version: 6.0.1 +Version: 6.0.2 Release: 0 Url: http://www.scilab.org # FOR STABLE RELEASE Source0: http://www.scilab.org/download/%{version}/%{name}-%{version}-src.tar.gz # FOR BETA RELEASE -#Source0: http://www.scilab.org/download/%{beta_version}/%{name}-%{beta_version}-src.tar.gz +#Source0: http://www.scilab.org/download/%%{beta_version}/%%{name}-%%{beta_version}-src.tar.gz Source1: %{name}-rpmlintrc # Bug 767102 - help() should suggest scilab-doc @@ -39,25 +39,14 @@ Patch3: scilab-fix-64bit-portability-issue.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-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 -# to sync with java-1_8_0-openjdk sr #365892 -Patch11: scilab_ppc64le_java_archinstall_changed.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-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 @@ -66,11 +55,14 @@ Patch25: scilab-java9-ClassLoader.patch # PATCH-FIX-OPENSUSE scilab-java_source_target.patch [email protected] -- Build with source and target 6 in order to avoid runtime errors of unrecognized bytecode Patch26: scilab-java_source_target.patch -# PATCH-FIX-UPSTREAM scilab-gfortran8-errors.patch [email protected] -- Fix argument size mismatch in variable sizes; these crop up as errors when compiling against gfortran >= 8. -Patch27: scilab-gfortran8-errors.patch -# PATCH-FIX-UPSTREAM scilab-dont-test-for-jaf.patch [email protected] -- Disable the autoconf tests for jar-based activation framework (JAF); JAF is available for openjdk-11 (for openSUSE anyway), but uses jmod instead -Patch28: scilab-dont-test-for-jaf.patch +# PATCH-FIX-UPSTREAM scilab-drop-javax-annotation.patch [email protected] -- Remove references to javax.annotation as it is unavailable with java >= 11 and the code referencing this doesn't do anything anyway +Patch27: scilab-drop-javax-annotation.patch ExcludeArch: i586 ppc64 + +# SECTION Dependency to rebuild configure after patching autotools files +BuildRequires: libtool +# /SECTION + # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -84,6 +76,7 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gcc-fortran +BuildRequires: time ## for dynamic link features Requires: gcc @@ -105,18 +98,14 @@ # GUI/Console BuildRequires: ant BuildRequires: ecj -%if 0%{?suse_version} >= 1500 BuildRequires: java-devel >= 11 -%else -BuildRequires: java-devel = 1.8.0 -%endif BuildRequires: jpackage-utils BuildRequires: lucene >= 6.0 BuildRequires: lucene-analyzers-common >= 6.0 BuildRequires: lucene-queryparser >= 6.0 Requires: ecj -Requires: java = 10 +Requires: java >= 11 Requires: lucene >= 6.0 Requires: lucene-analyzers-common >= 6.0 Requires: lucene-queryparser >= 6.0 @@ -171,10 +160,6 @@ Requires: saxon9 #BuildRequires: docbook-style-xsl BuildRequires: docbook-xsl-stylesheets -%if 0%{?suse_version} >= 1500 -BuildRequires: jaf = 1.1 -Requires: jaf = 1.1 -%endif BuildRequires: liberation-fonts # make doc now requires access to display BuildRequires: Mesa-libGL-devel @@ -202,16 +187,13 @@ Requires: hdf5 = %{_hdf5_version} # Specific dependencies for packaging purpose -BuildRequires: desktop-file-utils BuildRequires: fdupes +BuildRequires: update-desktop-files # scilab parts Requires: scilab-devel = %{version} Requires: scilab-modules = %{version} -# Scilab needs to be run from a running terminal, so require xterm [http://bugzilla.scilab.org/show_bug.cgi?id=14682] -Requires: xterm - Recommends: scilab-lang = %{version} Requires(post): shared-mime-info @@ -322,26 +304,15 @@ %patch5 -p1 %patch3 -p1 -%patch7 -p1 %patch8 -p1 %patch9 -p1 -%if 0%{?suse_version} > 1320 || 0%{?leap_version} == 420300 -%patch11 -p1 -%endif -%patch14 -p1 %patch17 -p1 -%patch20 -p1 %patch21 -p1 -%patch22 -p1 -# JAVA 9 IS ONLY USED FOR openSUSE >= 1500 -%if 0%{?suse_version} >= 1500 %patch23 -p1 %patch24 -p1 %patch25 -p1 -%endif %patch26 -p1 %patch27 -p1 -%patch28 -p1 # Remove a bad merge remnant (.orig file) to prevent trigerring rpmlint's suse-filelist-forbidden rm ./modules/cacsd/tests/unit_tests/dscr.tst.orig @@ -352,6 +323,7 @@ sed -i '/name="Class-Path"/d' modules/scirenderer/build.xml %build +autoreconf -fvi %configure \ --disable-static-system-lib \ --without-umfpack \ @@ -361,27 +333,20 @@ make -C modules/scicos modelicac modelicat XML2Modelica make %{?_smp_mflags} -# JAVA 9 IS ONLY USED FOR openSUSE >= 1500 -%if 0%{?suse_version} >= 1500 +# SECTION 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 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 -%endif +# /SECTION -# 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 & +export DISPLAY=%%{X_display} +Xvfb %%{X_display} >& Xvfb.log & sleep 5 -# JAVA 9 IS ONLY USED FOR openSUSE >= 1500 -%if 0%{?suse_version} >= 1500 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}' -%endif +export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:./modules/*/.libs:./modules/.libs +export _JAVA_OPTIONS="--add-modules=java.xml.bind,java.activation -Djava.awt.headless=true -Djava.class.path=${SCI_ALL_JAR_CLASSPATHS}" make doc SCIVERBOSE=1 %install @@ -391,7 +356,7 @@ mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d echo %{_libdir}/%{name} > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf -# remove docs +# remove docs packaged using %%doc rm -rf %{buildroot}%{_datadir}/scilab/ACK* rm -rf %{buildroot}%{_datadir}/scilab/CHANGES* rm -rf %{buildroot}%{_datadir}/scilab/COPYING* @@ -403,13 +368,9 @@ # Remove more advanced repl, user should use CLI options instead rm -fr %{buildroot}%{_datadir}/applications/%{name}-*.desktop -# Fix categories and install .desktop files -for i in scilab scinotes xcos; \ -do - desktop-file-install \ - --dir=%{buildroot}%{_datadir}/applications \ - desktop/$i.desktop; -done +%suse_update_desktop_file -i scilab +%suse_update_desktop_file -i scinotes +%suse_update_desktop_file -i -r xcos Education Math Physics %find_lang %{name} %{?no_lang_C} @@ -426,7 +387,7 @@ s:%lang(en) :: s:%lang(C) :: /^$/d' |tee %{name}-modules-doc.lang -# Remove en localization doc files from lang package; bundle these in %{name}-modules-doc directly +## Remove en localization doc files from lang package; bundle these in %%{name}-modules-doc directly sed -i '/scilab_en_US_help.jar/d' %{name}-modules-doc.lang sed -i '/scilab_images.jar/d' %{name}-modules-doc.lang @@ -450,14 +411,13 @@ %postun -n %{soname} -p /sbin/ldconfig %files -n %{soname} -%defattr(-,root,root) %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so.* %files -%defattr(-,root,root) %doc ACKNOWLEDGEMENTS -%doc README.md CHANGES.md COPYING COPYING-BSD +%doc README.md CHANGES.md +%license COPYING COPYING-BSD %{_bindir}/* %dir %{_datadir}/%{name}/ %{_datadir}/%{name}/etc/ @@ -471,10 +431,8 @@ %{_datadir}/appdata/scilab.appdata.xml %files lang -f %{name}.lang -%defattr(-,root,root) %files modules -%defattr(-,root,root) %{_datadir}/%{name}/modules/ # part of scilab-doc %exclude %{_datadir}/%{name}/modules/helptools/jar/%{name}_*.jar @@ -484,18 +442,15 @@ %exclude %{_datadir}/%{name}/modules/*/tests %files modules-doc -%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 %files modules-doc-lang -f %{name}-modules-doc.lang -%defattr(-,root,root) %files devel -%defattr(-,root,root) -%doc COPYING COPYING-BSD +%license COPYING COPYING-BSD %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so %{_includedir}/%{name}/ @@ -503,7 +458,6 @@ %config %{_sysconfdir}/ld.so.conf.d/%{name}.conf %files tests -%defattr(-,root,root) %{_datadir}/%{name}/modules/*/tests %changelog ++++++ scilab-0001-Use-pkcon-to-install-doc-package.patch ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.090630475 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.090630475 +0100 @@ -1,8 +1,8 @@ -Index: scilab-6.0.0/modules/helptools/macros/help.sci +Index: scilab-6.0.2/modules/helptools/macros/help.sci =================================================================== ---- 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) +--- scilab-6.0.2.orig/modules/helptools/macros/help.sci ++++ scilab-6.0.2/modules/helptools/macros/help.sci +@@ -58,7 +58,8 @@ function help(varargin) error(msprintf(gettext("%s: The help browser is disabled in %s mode.\n"), "help", getscilabmode())); end else @@ -12,3 +12,4 @@ end endfunction + ++++++ scilab-6.0.1-src.tar.gz -> scilab-6.0.2-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/scilab/scilab-6.0.1-src.tar.gz /work/SRC/openSUSE:Factory/.scilab.new.28833/scilab-6.0.2-src.tar.gz differ: char 5, line 1 ++++++ scilab-bin-correct-java9-path.patch ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.110630468 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.114630467 +0100 @@ -1,12 +1,13 @@ -Index: scilab-6.0.1/bin/scilab +Index: scilab-6.0.2/bin/scilab =================================================================== ---- scilab-6.0.1.orig/bin/scilab -+++ scilab-6.0.1/bin/scilab -@@ -493,11 +493,7 @@ detect_java_vm() { +--- scilab-6.0.2.orig/bin/scilab ++++ scilab-6.0.2/bin/scilab +@@ -493,12 +493,7 @@ detect_java_vm() { + if test $SCIVERBOSE -ne 0; then 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 +-# 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 @@ -15,16 +16,16 @@ # Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and libxxxx.so case $OS in -@@ -603,7 +599,7 @@ detect_java_vm() { +@@ -604,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 ! -f "$LIBJAVA"; then if test $SCIVERBOSE -ne 0; then echo "Cannot find $LIBJAVA" -@@ -612,7 +608,7 @@ detect_java_vm() { +@@ -613,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.... @@ -33,7 +34,7 @@ fi # Bug http://bugzilla.scilab.org/show_bug.cgi?id=14290 - -@@ -649,7 +645,7 @@ if test $IS_SCILAB_BINARY -eq 1; then +@@ -650,7 +645,7 @@ if test $IS_SCILAB_BINARY -eq 1; then TCL_LIBRARY="$SCIBINARYBASE/thirdparty/tcl8.5" TK_LIBRARY="$SCIBINARYBASE/thirdparty/tk8.5" fi @@ -42,16 +43,16 @@ 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 +@@ -832,7 +827,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 + 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 +@@ -879,6 +874,7 @@ case $OS in *) esac @@ -59,7 +60,7 @@ if test $SCIVERBOSE -ne 0; then echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH" -@@ -1172,6 +1169,7 @@ if test "$rest" = "yes"; then +@@ -1182,6 +1178,7 @@ if test "$rest" = "yes"; then esac done ++++++ scilab-build-with-jogl-2.3.patch ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.118630466 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.122630464 +0100 @@ -1,59 +1,9 @@ http://bugzilla.scilab.org/show_bug.cgi?id=13809 -Index: scilab-6.0.0/configure +Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/SwingView.java =================================================================== ---- 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 -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&5 --$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package com.jogamp.opengl.glu.GLUnurbs)" >&5 -+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package com.jogamp.opengl.glu.GLUnurbs)" >&2;} - else -- as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" "$LINENO" 5 -+ as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.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 - - 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-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; +--- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/SwingView.java ++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/SwingView.java +@@ -88,10 +88,10 @@ import java.util.Map; import java.util.Set; import java.util.UUID; @@ -68,10 +18,10 @@ import javax.swing.JComponent; import javax.swing.JSeparator; import javax.swing.SwingUtilities; -Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java +Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java ++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java @@ -23,7 +23,7 @@ import java.awt.Cursor; import java.awt.Font; import java.awt.image.BufferedImage; @@ -81,10 +31,10 @@ import org.scilab.modules.gui.canvas.Canvas; import org.scilab.modules.gui.canvas.ScilabCanvas; -Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java +Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java ++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java @@ -35,8 +35,8 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; import java.awt.image.BufferedImage; @@ -96,10 +46,10 @@ import javax.swing.JPanel; import org.scilab.forge.scirenderer.Canvas; -Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java +Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java ++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java @@ -22,12 +22,12 @@ import java.awt.HeadlessException; import java.util.Calendar; import java.util.StringTokenizer; @@ -119,10 +69,10 @@ import org.scilab.modules.action_binding.InterpreterManagement; import org.scilab.modules.commons.OS; -Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java +Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java ++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java @@ -17,7 +17,7 @@ package org.scilab.modules.gui.canvas; import java.awt.image.BufferedImage; @@ -132,10 +82,10 @@ import org.scilab.modules.gui.dockable.Dockable; -Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java +Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java ++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java @@ -19,7 +19,7 @@ package org.scilab.modules.gui.canvas; import java.awt.image.BufferedImage; @@ -145,10 +95,10 @@ import org.scilab.modules.gui.bridge.ScilabBridge; import org.scilab.modules.gui.dockable.ScilabDockable; -Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java +Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java ++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java @@ -17,7 +17,7 @@ package org.scilab.modules.gui.canvas; import java.awt.image.BufferedImage; @@ -158,10 +108,10 @@ import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas; import org.scilab.modules.gui.utils.Position; -Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java +Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java ++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java @@ -18,7 +18,7 @@ package org.scilab.modules.gui.canvas; import org.scilab.modules.gui.utils.Position; import org.scilab.modules.gui.utils.Size; @@ -171,10 +121,10 @@ import java.awt.image.BufferedImage; /** -Index: scilab-6.0.0/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java +Index: scilab-6.0.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 +--- scilab-6.0.2.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java ++++ scilab-6.0.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java @@ -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; @@ -186,10 +136,10 @@ import javax.swing.*; import java.awt.*; -Index: scilab-6.0.0/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java +Index: scilab-6.0.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java ++++ scilab-6.0.2/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java @@ -18,7 +18,7 @@ import com.jogamp.opengl.util.Animator; import org.scilab.forge.scirenderer.Canvas; import org.scilab.forge.scirenderer.implementation.jogl.JoGLCanvasFactory; @@ -199,10 +149,10 @@ import javax.swing.JFrame; import javax.swing.JPanel; import java.awt.BorderLayout; -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java @@ -19,16 +19,16 @@ import java.awt.image.BufferedImage; import java.lang.reflect.InvocationTargetException; import java.util.concurrent.Semaphore; @@ -230,10 +180,10 @@ import javax.swing.SwingUtilities; import org.scilab.forge.scirenderer.Canvas; -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java @@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp import org.scilab.forge.scirenderer.Canvas; @@ -243,10 +193,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java @@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl; @@ -256,10 +206,10 @@ /** * This class store current OpenGl context capacity. -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java @@ -34,7 +34,7 @@ import org.scilab.forge.scirenderer.tran import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener; import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -269,10 +219,10 @@ /** * -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java @@ -14,8 +14,8 @@ package org.scilab.forge.scirenderer.implementation.jogl; @@ -284,10 +234,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java @@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.buff import org.scilab.forge.scirenderer.buffers.ElementsBuffer; import org.scilab.forge.scirenderer.buffers.IndicesBuffer; @@ -297,10 +247,10 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java @@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp import org.scilab.forge.scirenderer.buffers.DataBuffer; @@ -310,10 +260,10 @@ import java.nio.Buffer; /** -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java @@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp import org.scilab.forge.scirenderer.buffers.ElementsBuffer; @@ -323,10 +273,10 @@ import java.nio.Buffer; import java.nio.FloatBuffer; -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java @@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp import org.scilab.forge.scirenderer.buffers.IndicesBuffer; @@ -336,10 +286,10 @@ import java.nio.Buffer; import java.nio.IntBuffer; import java.util.Collection; -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java @@ -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; @@ -349,10 +299,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java @@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.tran import org.scilab.forge.scirenderer.tranformations.TransformationFactory; import org.scilab.forge.scirenderer.tranformations.Vector4d; @@ -362,10 +312,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java @@ -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; @@ -375,10 +325,10 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java @@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.lightning; @@ -388,10 +338,10 @@ import org.scilab.forge.scirenderer.implementation.jogl.utils.GLShortCuts; import org.scilab.forge.scirenderer.lightning.Light; -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java @@ -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; @@ -401,10 +351,10 @@ /** * JoGL implementation of {@link LightManager} -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java @@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.picking; @@ -414,10 +364,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java @@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.impl import org.scilab.forge.scirenderer.picking.PickingTools; import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -427,10 +377,10 @@ import java.awt.Point; import java.nio.FloatBuffer; -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java @@ -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; @@ -440,10 +390,10 @@ /** * @author Pierre Lando -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java @@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.impl import org.scilab.forge.scirenderer.renderer.Renderer; import org.scilab.forge.scirenderer.renderer.RendererManager; @@ -453,10 +403,10 @@ import java.util.HashSet; import java.util.Set; import java.util.Stack; -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java @@ -32,11 +32,11 @@ import org.scilab.forge.scirenderer.tran import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -474,10 +424,10 @@ import java.awt.Dimension; import java.nio.ByteBuffer; import java.nio.FloatBuffer; -Index: scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java +Index: scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java ++++ scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java @@ -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; @@ -487,3 +437,25 @@ /** * +Index: scilab-6.0.2/configure.ac +=================================================================== +--- scilab-6.0.2.orig/configure.ac ++++ scilab-6.0.2/configure.ac +@@ -942,7 +942,7 @@ if test "$with_javasci" != no -o "$with_ + AC_SUBST(SKINLF) + + # JOGL 2 +- AC_JAVA_CHECK_JAR([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0]) ++ AC_JAVA_CHECK_JAR([jogl2],[com.jogamp.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0]) + JOGL2=$PACKAGE_JAR_FILE + AC_SUBST(JOGL2) + +@@ -973,7 +973,7 @@ interface for JOGL2 - or libGL (OpenGL l + fi + + # JoGL Native <=> Java connector +- AC_JAVA_CHECK_JAR([gluegen2-rt],[jogamp.common.os.MachineDescriptionRuntime],[Scilab 3D rendering]) ++ AC_JAVA_CHECK_JAR([gluegen2-rt],[jogamp.common.os.MachineDataInfoRuntime],[Scilab 3D rendering]) + GLUEGEN2_RT=$PACKAGE_JAR_FILE + AC_SUBST(GLUEGEN2_RT) + ++++++ scilab-drop-javax-annotation.patch ++++++ Index: scilab-6.0.2/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/xmlloader/CSSParser.java =================================================================== --- scilab-6.0.2.orig/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/xmlloader/CSSParser.java +++ scilab-6.0.2/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/xmlloader/CSSParser.java @@ -14,7 +14,6 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; [email protected]("JFlex") @SuppressWarnings("fallthrough") /** Index: scilab-6.0.2/modules/helptools/src/java/jflex/c.jflex =================================================================== --- scilab-6.0.2.orig/modules/helptools/src/java/jflex/c.jflex +++ scilab-6.0.2/modules/helptools/src/java/jflex/c.jflex @@ -6,7 +6,6 @@ import java.io.Reader; import java.io.StringReader; import java.io.IOException; [email protected]("JFlex") @SuppressWarnings("fallthrough") %% Index: scilab-6.0.2/modules/helptools/src/java/jflex/function.jflex =================================================================== --- scilab-6.0.2.orig/modules/helptools/src/java/jflex/function.jflex +++ scilab-6.0.2/modules/helptools/src/java/jflex/function.jflex @@ -5,7 +5,6 @@ package org.scilab.modules.helptools ; import java.io.IOException; import java.io.StringReader; [email protected]("JFlex") @SuppressWarnings("fallthrough") %% Index: scilab-6.0.2/modules/helptools/src/java/jflex/java.jflex =================================================================== --- scilab-6.0.2.orig/modules/helptools/src/java/jflex/java.jflex +++ scilab-6.0.2/modules/helptools/src/java/jflex/java.jflex @@ -8,7 +8,6 @@ import java.io.IOException; import org.scilab.modules.helptools.c.AbstractCCodeHandler; [email protected]("JFlex") @SuppressWarnings("fallthrough") %% Index: scilab-6.0.2/modules/helptools/src/java/jflex/scilab.jflex =================================================================== --- scilab-6.0.2.orig/modules/helptools/src/java/jflex/scilab.jflex +++ scilab-6.0.2/modules/helptools/src/java/jflex/scilab.jflex @@ -15,7 +15,6 @@ import java.io.Reader; import java.io.StringReader; import java.io.IOException; [email protected]("JFlex") @SuppressWarnings("fallthrough") %% Index: scilab-6.0.2/modules/helptools/src/java/jflex/xml.jflex =================================================================== --- scilab-6.0.2.orig/modules/helptools/src/java/jflex/xml.jflex +++ scilab-6.0.2/modules/helptools/src/java/jflex/xml.jflex @@ -6,7 +6,6 @@ import java.io.Reader; import java.io.StringReader; import java.io.IOException; [email protected]("JFlex") @SuppressWarnings("fallthrough") %% Index: scilab-6.0.2/modules/helptools/src/java/org/scilab/modules/helptools/SynopsisLexer.java =================================================================== --- scilab-6.0.2.orig/modules/helptools/src/java/org/scilab/modules/helptools/SynopsisLexer.java +++ scilab-6.0.2/modules/helptools/src/java/org/scilab/modules/helptools/SynopsisLexer.java @@ -7,7 +7,6 @@ package org.scilab.modules.helptools ; import java.io.IOException; import java.io.StringReader; [email protected]("JFlex") @SuppressWarnings("fallthrough") /** Index: scilab-6.0.2/modules/helptools/src/java/org/scilab/modules/helptools/XML/XMLLexer.java =================================================================== --- scilab-6.0.2.orig/modules/helptools/src/java/org/scilab/modules/helptools/XML/XMLLexer.java +++ scilab-6.0.2/modules/helptools/src/java/org/scilab/modules/helptools/XML/XMLLexer.java @@ -8,7 +8,6 @@ import java.io.Reader; import java.io.StringReader; import java.io.IOException; [email protected]("JFlex") @SuppressWarnings("fallthrough") /** Index: scilab-6.0.2/modules/helptools/src/java/org/scilab/modules/helptools/c/CLexer.java =================================================================== --- scilab-6.0.2.orig/modules/helptools/src/java/org/scilab/modules/helptools/c/CLexer.java +++ scilab-6.0.2/modules/helptools/src/java/org/scilab/modules/helptools/c/CLexer.java @@ -8,7 +8,6 @@ import java.io.Reader; import java.io.StringReader; import java.io.IOException; [email protected]("JFlex") @SuppressWarnings("fallthrough") /** Index: scilab-6.0.2/modules/helptools/src/java/org/scilab/modules/helptools/java/JavaLexer.java =================================================================== --- scilab-6.0.2.orig/modules/helptools/src/java/org/scilab/modules/helptools/java/JavaLexer.java +++ scilab-6.0.2/modules/helptools/src/java/org/scilab/modules/helptools/java/JavaLexer.java @@ -10,7 +10,6 @@ import java.io.IOException; import org.scilab.modules.helptools.c.AbstractCCodeHandler; [email protected]("JFlex") @SuppressWarnings("fallthrough") /** Index: scilab-6.0.2/modules/helptools/src/java/org/scilab/modules/helptools/scilab/ScilabLexer.java =================================================================== --- scilab-6.0.2.orig/modules/helptools/src/java/org/scilab/modules/helptools/scilab/ScilabLexer.java +++ scilab-6.0.2/modules/helptools/src/java/org/scilab/modules/helptools/scilab/ScilabLexer.java @@ -14,7 +14,6 @@ import java.io.Reader; import java.io.StringReader; import java.io.IOException; [email protected]("JFlex") @SuppressWarnings("fallthrough") /** Index: scilab-6.0.2/modules/scinotes/src/java/jflex/function.jflex =================================================================== --- scilab-6.0.2.orig/modules/scinotes/src/java/jflex/function.jflex +++ scilab-6.0.2/modules/scinotes/src/java/jflex/function.jflex @@ -8,7 +8,6 @@ import java.util.ArrayList; import javax.swing.text.BadLocationException; import javax.swing.text.Element; [email protected]("JFlex") @SuppressWarnings("fallthrough") %% Index: scilab-6.0.2/modules/scinotes/src/java/jflex/indentation.jflex =================================================================== --- scilab-6.0.2.orig/modules/scinotes/src/java/jflex/indentation.jflex +++ scilab-6.0.2/modules/scinotes/src/java/jflex/indentation.jflex @@ -6,7 +6,6 @@ import java.io.IOException; import javax.swing.text.Element; import javax.swing.text.BadLocationException; [email protected]("JFlex") @SuppressWarnings("fallthrough") %% Index: scilab-6.0.2/modules/scinotes/src/java/jflex/matchingblock.jflex =================================================================== --- scilab-6.0.2.orig/modules/scinotes/src/java/jflex/matchingblock.jflex +++ scilab-6.0.2/modules/scinotes/src/java/jflex/matchingblock.jflex @@ -5,7 +5,6 @@ package org.scilab.modules.scinotes; import java.io.IOException; import javax.swing.text.Element; [email protected]("JFlex") @SuppressWarnings("fallthrough") %% Index: scilab-6.0.2/modules/scinotes/src/java/jflex/scilab.jflex =================================================================== --- scilab-6.0.2.orig/modules/scinotes/src/java/jflex/scilab.jflex +++ scilab-6.0.2/modules/scinotes/src/java/jflex/scilab.jflex @@ -12,7 +12,6 @@ import javax.swing.text.BadLocationExcep import javax.swing.text.Element; import org.scilab.modules.commons.ScilabCommonsUtils; [email protected]("JFlex") @SuppressWarnings("fallthrough") %% Index: scilab-6.0.2/modules/scinotes/src/java/org/scilab/modules/scinotes/FunctionScanner.java =================================================================== --- scilab-6.0.2.orig/modules/scinotes/src/java/org/scilab/modules/scinotes/FunctionScanner.java +++ scilab-6.0.2/modules/scinotes/src/java/org/scilab/modules/scinotes/FunctionScanner.java @@ -10,7 +10,6 @@ import java.util.ArrayList; import javax.swing.text.BadLocationException; import javax.swing.text.Element; [email protected]("JFlex") @SuppressWarnings("fallthrough") /** Index: scilab-6.0.2/modules/scinotes/src/java/org/scilab/modules/scinotes/IndentScanner.java =================================================================== --- scilab-6.0.2.orig/modules/scinotes/src/java/org/scilab/modules/scinotes/IndentScanner.java +++ scilab-6.0.2/modules/scinotes/src/java/org/scilab/modules/scinotes/IndentScanner.java @@ -8,7 +8,6 @@ import java.io.IOException; import javax.swing.text.Element; import javax.swing.text.BadLocationException; [email protected]("JFlex") @SuppressWarnings("fallthrough") /** Index: scilab-6.0.2/modules/scinotes/src/java/org/scilab/modules/scinotes/MatchingBlockScanner.java =================================================================== --- scilab-6.0.2.orig/modules/scinotes/src/java/org/scilab/modules/scinotes/MatchingBlockScanner.java +++ scilab-6.0.2/modules/scinotes/src/java/org/scilab/modules/scinotes/MatchingBlockScanner.java @@ -7,7 +7,6 @@ package org.scilab.modules.scinotes; import java.io.IOException; import javax.swing.text.Element; [email protected]("JFlex") @SuppressWarnings("fallthrough") /** Index: scilab-6.0.2/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java =================================================================== --- scilab-6.0.2.orig/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java +++ scilab-6.0.2/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java @@ -14,7 +14,6 @@ import javax.swing.text.BadLocationExcep import javax.swing.text.Element; import org.scilab.modules.commons.ScilabCommonsUtils; [email protected]("JFlex") @SuppressWarnings("fallthrough") ++++++ scilab-fix-64bit-portability-issue.patch ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.134630460 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.134630460 +0100 @@ -1,8 +1,8 @@ Upstream bug: http://bugzilla.scilab.org/13267 -Index: scilab-6.0.0/modules/graphics/src/c/getHandleProperty/get_tight_limits_property.c +Index: scilab-6.0.2/modules/graphics/src/c/getHandleProperty/get_tight_limits_property.c =================================================================== ---- 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 +--- scilab-6.0.2.orig/modules/graphics/src/c/getHandleProperty/get_tight_limits_property.c ++++ scilab-6.0.2/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; @@ -20,20 +20,11 @@ } if (iTightLimits) -@@ -75,7 +76,7 @@ void* get_tight_limits_property(void* _p - } - - 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 +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/scicos/src/c/scicos.c ++++ scilab-6.0.2/modules/scicos/src/c/scicos.c +@@ -4075,7 +4075,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); @@ -42,10 +33,10 @@ /* Implicit Solver & explicit block & flag==0 */ /* adjust continuous state vector after call */ -Index: scilab-6.0.0/modules/scicos/src/c/import.c +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/scicos/src/c/import.c ++++ scilab-6.0.2/modules/scicos/src/c/import.c @@ -934,7 +934,7 @@ int C2F(getsciblockbylabel)(int*kfun, in } nblk = scicos_imp.nblk[0]; ++++++ scilab-java9-ClassLoader.patch ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.142630457 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.146630456 +0100 @@ -1,7 +1,7 @@ -Index: scilab-6.0.1/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java ++++ scilab-6.0.2/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java @@ -62,7 +62,7 @@ public class ClassPath { */ public static void addURL(final URL u, int i) { @@ -26,295 +26,18 @@ return paths; } -Index: scilab-6.0.1/bin/scilab +Index: scilab-6.0.2/bin/scilab =================================================================== ---- scilab-6.0.1.orig/bin/scilab -+++ scilab-6.0.1/bin/scilab +--- scilab-6.0.2.orig/bin/scilab ++++ scilab-6.0.2/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" ++ export _JAVA_OPTIONS="${_JAVA_OPTIONS} --add-modules=java.xml.bind,java.activation -Djava.class.path=@SPEC_ALL_JAR_CLASSPATHS@ -Djava.library.path=@SPEC_SCI_LIB_PATH@" + + ####### 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-java_source_target.patch ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.150630454 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.154630452 +0100 @@ -1,5 +1,7 @@ ---- scilab-6.0.1/modules/scirenderer/build.xml 2018-02-15 09:40:51.000000000 +0100 -+++ scilab-6.0.1/modules/scirenderer/build.xml 2018-03-20 16:39:49.477864166 +0100 +Index: scilab-6.0.2/modules/scirenderer/build.xml +=================================================================== +--- scilab-6.0.2.orig/modules/scirenderer/build.xml ++++ scilab-6.0.2/modules/scirenderer/build.xml @@ -102,7 +102,7 @@ <!-- Compile sources --> ++++++ scilab-no-return-in-non-void.patch ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.158630452 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.162630450 +0100 @@ -1,19 +1,19 @@ -Index: scilab-6.0.1/modules/ast/includes/exps/opexp.hxx +Index: scilab-6.0.2/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: +--- scilab-6.0.2.orig/modules/ast/includes/exps/opexp.hxx ++++ scilab-6.0.2/modules/ast/includes/exps/opexp.hxx +@@ -261,6 +261,7 @@ public: + default: return L"unknown"; } + return L"\0"; } -Index: scilab-6.0.1/modules/ast/src/cpp/analysis/ConstraintManager.cpp +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/ast/src/cpp/analysis/ConstraintManager.cpp ++++ scilab-6.0.2/modules/ast/src/cpp/analysis/ConstraintManager.cpp @@ -96,6 +96,7 @@ bool ConstraintManager::check(const MPol } } @@ -22,10 +22,10 @@ } bool ConstraintManager::check(Kind kind, const std::vector<GVN::Value *> & values) -Index: scilab-6.0.1/modules/ast/src/cpp/analysis/InferenceConstraints.cpp +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/ast/src/cpp/analysis/InferenceConstraints.cpp ++++ scilab-6.0.2/modules/ast/src/cpp/analysis/InferenceConstraints.cpp @@ -187,6 +187,7 @@ InferenceConstraint::Result MPolyConstra } } @@ -34,10 +34,10 @@ } MPolyConstraintSet MPolyConstraint::getMPConstraints(const std::vector<GVN::Value *> & values) const -Index: scilab-6.0.1/modules/core/src/fortran/clunit.f +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/core/src/fortran/clunit.f ++++ scilab-6.0.2/modules/core/src/fortran/clunit.f @@ -61,6 +61,7 @@ c character*800 nomfic double precision res ++++++ scilab-openjdk9-no-javah.patch ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.166630449 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.166630449 +0100 @@ -7,116 +7,10 @@ Change-Id: I9b77db62a6fea7ceb1176df1bbf513268dca7e37 --- - -Index: scilab-6.0.1/configure -=================================================================== ---- scilab-6.0.1.orig/configure -+++ scilab-6.0.1/configure -@@ -12987,100 +12987,6 @@ 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 -- -- - - - if test "$cross_compiling" = "yes" ; then -Index: scilab-6.0.1/m4/java.m4 +Index: scilab-6.0.2/m4/java.m4 =================================================================== ---- scilab-6.0.1.orig/m4/java.m4 -+++ scilab-6.0.1/m4/java.m4 +--- scilab-6.0.2.orig/m4/java.m4 ++++ scilab-6.0.2/m4/java.m4 @@ -796,9 +796,6 @@ AC_DEFUN([AC_JAVA_TOOLS], [ JAVA_G=$JAVA fi ++++++ scilab-special-jarnames.patch ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.186630442 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.186630442 +0100 @@ -1,31 +1,38 @@ -Index: scilab-6.0.1/configure +Index: scilab-6.0.2/configure.ac =================================================================== ---- 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 +--- scilab-6.0.2.orig/configure.ac ++++ scilab-6.0.2/configure.ac +@@ -1040,8 +1040,14 @@ interface for JOGL2 - or libGL (OpenGL l + + ################ Mandatory for graphic_export features ##### + # XML to PDF/other Translator +- AC_JAVA_CHECK_JAR([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)]) ++ AC_JAVA_CHECK_JAR([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)], "yes") + FOP=$PACKAGE_JAR_FILE ++ ++ if test -z "$FOP"; then ++ AC_JAVA_CHECK_JAR([xmlgraphics-fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)]) ++ FOP=$PACKAGE_JAR_FILE ++ fi ++ + AC_SUBST(FOP) + + AC_ARG_WITH(emf, [AS_HELP_STRING([--without-emf], +@@ -1107,9 +1113,16 @@ interface for JOGL2 - or libGL (OpenGL l + + if test -z "$XML_APIS_EXT"; then + # Other other distribs (Ex: Fedora/Redhat) +- AC_JAVA_CHECK_JAR([xml-commons-apis-ext],[org.w3c.dom.svg.SVGDocument],[XML Commons external code]) ++ AC_JAVA_CHECK_JAR([xml-commons-apis-ext],[org.w3c.dom.svg.SVGDocument],[XML Commons external code],"yes") ++ XML_APIS_EXT=$PACKAGE_JAR_FILE ++ fi ++ ++ if test -z "$XML_APIS_EXT"; then ++ # Other other distribs (Ex: openSUSE) ++ AC_JAVA_CHECK_JAR([xml-commons-jaxp-1.3-apis-ext],[org.w3c.dom.svg.SVGDocument],[XML Commons external code]) + XML_APIS_EXT=$PACKAGE_JAR_FILE + fi ++ + AC_SUBST(XML_APIS_EXT) + ################ END Mandatory for graphic_export features ##### ++++++ scilab-timestamp.patch ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.198630437 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.198630437 +0100 @@ -3,10 +3,10 @@ modules/core/src/c/getstaticdebuginfo.c | 6 ------ 2 files changed, 20 deletions(-) -Index: scilab-6.0.1/modules/core/src/c/getstaticDebugInfo_Windows.c +Index: scilab-6.0.2/modules/core/src/c/getstaticDebugInfo_Windows.c =================================================================== ---- scilab-6.0.1.orig/modules/core/src/c/getstaticDebugInfo_Windows.c -+++ scilab-6.0.1/modules/core/src/c/getstaticDebugInfo_Windows.c +--- scilab-6.0.2.orig/modules/core/src/c/getstaticDebugInfo_Windows.c ++++ scilab-6.0.2/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,10 +28,10 @@ #ifdef _WIN64 sprintf(str_info, "Compiler Architecture: %s", "X64"); #else -Index: scilab-6.0.1/modules/core/src/c/getstaticdebuginfo.c +Index: scilab-6.0.2/modules/core/src/c/getstaticdebuginfo.c =================================================================== ---- scilab-6.0.1.orig/modules/core/src/c/getstaticdebuginfo.c -+++ scilab-6.0.1/modules/core/src/c/getstaticdebuginfo.c +--- scilab-6.0.2.orig/modules/core/src/c/getstaticdebuginfo.c ++++ scilab-6.0.2/modules/core/src/c/getstaticdebuginfo.c @@ -50,12 +50,6 @@ char **getStaticDebugInfo(int *sizeArray #ifdef SCI_VERSION_STRING {"Scilab Version", SCI_VERSION_STRING}, ++++++ scilab-xcos-java9.patch ++++++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.206630435 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.206630435 +0100 @@ -11,10 +11,10 @@ .../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 +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/actions/ExportAllAction.java ++++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/actions/ExportAllAction.java @@ -46,7 +46,6 @@ import org.scilab.modules.xcos.JavaContr import org.scilab.modules.xcos.Kind; import org.scilab.modules.xcos.ObjectProperties; @@ -23,10 +23,10 @@ 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 +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/CodeGenerationAction.java ++++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/CodeGenerationAction.java @@ -20,7 +20,6 @@ package org.scilab.modules.xcos.block.ac import java.awt.Cursor; import java.awt.event.ActionEvent; @@ -35,10 +35,10 @@ 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 +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/graph/ScicosParameters.java ++++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/graph/ScicosParameters.java @@ -18,7 +18,6 @@ package org.scilab.modules.xcos.graph; import java.beans.PropertyChangeEvent; @@ -47,10 +47,10 @@ import java.beans.VetoableChangeSupport; import java.io.Serializable; -Index: scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java ++++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java @@ -17,7 +17,6 @@ package org.scilab.modules.xcos.palette; @@ -67,10 +67,10 @@ 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 +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/BrowserView.java ++++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/BrowserView.java @@ -21,6 +21,7 @@ import java.util.LinkedList; import javax.swing.SwingUtilities; import javax.swing.tree.DefaultMutableTreeNode; @@ -90,10 +90,10 @@ 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 +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/model/Palette.java ++++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/model/Palette.java @@ -58,7 +58,7 @@ public abstract class Palette extends Pa * @see javax.swing.tree.TreeNode#children() */ @@ -103,10 +103,10 @@ return null; } -Index: scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java +Index: scilab-6.0.2/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 +--- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java ++++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java @@ -22,6 +22,7 @@ import java.awt.event.ActionListener; import java.util.Arrays; import java.util.Iterator;
