From owner-svn-ports-all@freebsd.org Sun May 31 13:11:30 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 13352334961; Sun, 31 May 2020 13:11:30 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Zdwx73Rwz45SF; Sun, 31 May 2020 13:11:29 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED2021A660; Sun, 31 May 2020 13:11:29 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VDBTDY059123; Sun, 31 May 2020 13:11:29 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VDBRJo059113; Sun, 31 May 2020 13:11:27 GMT (envelope-from makc@FreeBSD.org) Message-Id: <202005311311.04VDBRJo059113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Sun, 31 May 2020 13:11:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537160 - in head/math/scilab: . files X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: in head/math/scilab: . files X-SVN-Commit-Revision: 537160 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 13:11:30 -0000 Author: makc Date: Sun May 31 13:11:27 2020 New Revision: 537160 URL: https://svnweb.freebsd.org/changeset/ports/537160 Log: math/scilab: - Update to 6.1.0. Requires decent c++ compiler and iconv from ports. - Clean up patch target: remove no longer needed patches and those ones which don't affect build - at least for me. - Remove MAKE_JOBS_UNSAFE. It was added in svn r417126 arguing that many ocaml-dependent ports are not jobs safe, but there were no logs to analyse. The plist change in that commit is unrelated to jobs safety. Added: head/math/scilab/files/patch-etc_librarypath.xml - copied, changed from r537159, head/math/scilab/files/patch-etc-librarypath.xml head/math/scilab/files/patch-modules_fileio_includes_os__wfopen.h (contents, props changed) head/math/scilab/files/patch-modules_threads_src_cpp_Thread__Wrapper.cpp - copied, changed from r537159, head/math/scilab/files/patch-modules-core-includes-Thread_Wrapper.h Deleted: head/math/scilab/files/extra-patch-Makefile.in head/math/scilab/files/patch-Makefile.in head/math/scilab/files/patch-batik-1.8 head/math/scilab/files/patch-clang head/math/scilab/files/patch-etc-librarypath.xml head/math/scilab/files/patch-fop2 head/math/scilab/files/patch-gfortran8 head/math/scilab/files/patch-modules-core-includes-Thread_Wrapper.h head/math/scilab/files/patch-modules-dynamic_link-macros-ilib_gen_Make_unix.sci head/math/scilab/files/patch-modules_hdf5_includes_HDF5Objects.h head/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile.c head/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile__v1.c head/math/scilab/files/patch-modules_output__stream_src_cpp_diary__manager.cpp head/math/scilab/files/patch-modules_scicos_Makefile.in head/math/scilab/files/patch-xmlgraphics-commons-2.0 Modified: head/math/scilab/Makefile head/math/scilab/distinfo head/math/scilab/files/extra-patch-bin-JAVA_HOME head/math/scilab/files/patch-configure head/math/scilab/files/patch-jogamp-jogl-2.3.2 head/math/scilab/files/patch-xdg-open head/math/scilab/pkg-plist Modified: head/math/scilab/Makefile ============================================================================== --- head/math/scilab/Makefile Sun May 31 13:10:32 2020 (r537159) +++ head/math/scilab/Makefile Sun May 31 13:11:27 2020 (r537160) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= scilab -PORTVERSION= 5.5.2 -PORTREVISION= 25 +PORTVERSION= 6.1.0 CATEGORIES= math cad java MASTER_SITES= https://www.scilab.org/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} @@ -16,8 +15,7 @@ LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING-BSD -# A partial dependencies list can be found at: -# http://wiki.scilab.org/Dependencies_of_Scilab_5.X +BUILD_DEPENDS= ${LOCALBASE}/include/eigen3/Eigen/Sparse:math/eigen3 LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libpcre.so:devel/pcre \ libcurl.so:ftp/curl \ @@ -28,25 +26,23 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libamd.so:math/suitesparse RUN_DEPENDS= xdg-open:devel/xdg-utils -USES= cpe desktop-file-utils fortran gettext gmake gnome iconv \ - libtool ncurses pathfix pkgconfig shared-mime-info -USE_CXXSTD= gnu++98 +USES= compiler:c++17-lang cpe desktop-file-utils fortran \ + gettext gmake gnome iconv:wchar_t libtool \ + localbase ncurses pathfix pkgconfig shared-mime-info USE_LOCALE= en_US.UTF-8 GNU_CONFIGURE= yes INSTALLS_ICONS= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gfortran \ --without-emf \ - -disable-static-system-lib + --with-eigen-include=${LOCALBASE}/include/eigen3 \ + ${ICONV_CONFIGURE_ARG} +LDFLAGS+= ${ICONV_LIB} + CONFIGURE_ENV= BLAS_LIBS="${BLASLIB}" LAPACK_LIBS="${LAPACKLIB}" INSTALL_TARGET= install-strip -TEST_TARGET= check # XXX: tests fail -MAKE_JOBS_UNSAFE= yes - PLIST_SUB= SHLIB_VER=${PORTVERSION} OPTIONS_DEFINE= GUI OCAML TK @@ -71,7 +67,8 @@ _GUI_DEPENDS+= ${JAVALIBDIR}/flexdock.jar:devel/flexdo ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ ${JAVALIBDIR}/jgraphx.jar:java/jgraphx \ ${JAVALIBDIR}/jlatexmath.jar:math/jlatexmath \ - ${LOCALBASE}/share/java/ecj-4.5.jar:lang/gcc-ecj45 + ${LOCALBASE}/share/java/ecj-4.5.jar:lang/gcc-ecj45 \ + ${JAVALIBDIR}/lucene-core-5.5.5.jar:textproc/lucene5 # Documentation, graphic export: _GUI_DEPENDS+= ${LOCALBASE}/share/java/fop/build/fop.jar:textproc/fop \ ${JAVALIBDIR}/jlatexmath-fop.jar:math/jlatexmath \ @@ -128,47 +125,32 @@ TK_RUN_DEPENDS= ${LOCALBASE}/lib/bwidget/init.tcl:x11- CONFIGURE_ARGS+= --without-openmp .endif -.include - -.if ${PORT_OPTIONS:MGUI} && ${JAVA_PORT_VERSION:M*8*} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug .endif post-patch: - @# Configure fixes - @${REINPLACE_CMD} -e 's|-ldl | |' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-lumfpack|-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd $$LAPACK_LIBS $$BLAS_LIBS|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|TCLTK_LIBS=" -ldl"|TCLTK_LIBS=" "|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|"x=" ==|"x" =|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|"x" ==|"x" =|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|sparc64-\*-netbsd\*|amd64-\*-freebsd\*|' ${WRKSRC}/configure - @# Build fixes - @${REINPLACE_CMD} -e 's|$$(CFLAGS:-O%=)|-I${LOCALBASE}/include -L${LOCALBASE}/lib|' ${WRKSRC}/modules/elementary_functions/Makefile.in - @${REINPLACE_CMD} -e 's|freebsd|__FreeBSD__|g' ${WRKSRC}/modules/sparse/includes/spConfig.h - @# malloc.h -> stdlib.h conversions - @${GREP} -lr "" ${WRKSRC} \ - | ${XARGS} ${REINPLACE_CMD} -e \ - 's/[<"]malloc.h[>"]//' - @# Run fixes - @${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/etc/librarypath.xml - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/etc/librarypath.xml + @${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/etc/librarypath.xml @${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure post-patch-GUI-on: +# scilab segfaults on FreeBSD with C locale + @${REINPLACE_CMD} 's,LC_ALL=C,,' ${WRKSRC}/Makefile.in @# Configure fixes + @${REINPLACE_CMD} '/ac_java_jvm_jni_lib_flags/s,\(ljvm\),\1 -pthread,' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/lib/java|${JAVALIBDIR}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/lib64/jni|${LOCALBASE}/lib/|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|$$jardir/batik-all.jar|${LOCALBASE}/share/java/batik/lib/batik-all.jar|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|$$jardir/fop.jar|${LOCALBASE}/share/java/fop/build/fop.jar|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|$$jardir/jeuclid-core*.jar|${LOCALBASE}/share/java/jeuclid/repo/jeuclid-core*.jar|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|jrosetta-API.jar|jrosetta-api.jar|' ${WRKSRC}/configure + @${REINPLACE_CMD} 's,\(DEFAULT_JAR_DIR="\),\1 \ + ${LOCALBASE}/share/java/classes \ + ${LOCALBASE}/share/java/fop/build \ + ${LOCALBASE}/share/java/batik/lib \ + ${LOCALBASE}/share/java/jeuclid/repo ,' ${WRKSRC}/configure + @${REINPLACE_CMD} 's|fop\*.jar|fop.jar|' ${WRKSRC}/configure +# Part of the jogamp-jogl-2.3 patch: @${REINPLACE_CMD} -e 's|javax.media.opengl.glu.GLUnurbs|com.jogamp.opengl.glu.GLUnurbs|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|jogamp.common.os.MachineDescriptionRuntime|jogamp.common.os.MachineDataInfoRuntime|' ${WRKSRC}/configure @# Run fixes @${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/bin/scilab - @${REINPLACE_CMD} -e 's|/usr/share/scilab|${DATADIR}|' ${WRKSRC}/desktop/scilab.desktop - @${REINPLACE_CMD} -e 's|/usr/share/scilab-cli|${DATADIR}|' \ - ${WRKSRC}/desktop/scilab-adv-cli.desktop ${WRKSRC}/desktop/scilab-cli.desktop pre-install: ${MKDIR} ${STAGEDIR}${DATADIR}/.atoms @@ -178,4 +160,4 @@ post-install: @# toolbox uninstaller otherwise if 3rd party toolboxes are used @${FIND} ${STAGEDIR}${DATADIR}/modules -type d -empty -delete -.include +.include Modified: head/math/scilab/distinfo ============================================================================== --- head/math/scilab/distinfo Sun May 31 13:10:32 2020 (r537159) +++ head/math/scilab/distinfo Sun May 31 13:11:27 2020 (r537160) @@ -1,2 +1,3 @@ -SHA256 (scilab-5.5.2-src.tar.gz) = a734519de96d35b8f081768a5584086e46db089ab11c021744897b22ec4d0f5e -SIZE (scilab-5.5.2-src.tar.gz) = 69626327 +TIMESTAMP = 1585325753 +SHA256 (scilab-6.1.0-src.tar.gz) = ae6befb0153fb823fd647f4eb36076f98fd20fed601f7dfa94d8c13e31044964 +SIZE (scilab-6.1.0-src.tar.gz) = 80556033 Modified: head/math/scilab/files/extra-patch-bin-JAVA_HOME ============================================================================== --- head/math/scilab/files/extra-patch-bin-JAVA_HOME Sun May 31 13:10:32 2020 (r537159) +++ head/math/scilab/files/extra-patch-bin-JAVA_HOME Sun May 31 13:11:27 2020 (r537160) @@ -1,9 +1,9 @@ ---- bin/scilab.orig 2010-09-01 19:31:19.000000000 -0700 -+++ bin/scilab 2010-09-01 19:32:29.000000000 -0700 +--- bin/scilab.orig 2020-02-25 09:59:42 UTC ++++ bin/scilab @@ -1,4 +1,7 @@ #!/bin/sh + -+export JAVA_HOME=%%JAVA_HOME%% ++[ -z "$JAVA_HOME" ] && JAVA_HOME=%%JAVA_HOME%% + # # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab Modified: head/math/scilab/files/patch-configure ============================================================================== --- head/math/scilab/files/patch-configure Sun May 31 13:10:32 2020 (r537159) +++ head/math/scilab/files/patch-configure Sun May 31 13:11:27 2020 (r537160) @@ -1,11 +1,29 @@ ---- configure.orig 2015-10-02 17:09:45.251035000 +0000 -+++ configure 2015-10-02 17:07:21.796652000 +0000 -@@ -11863,7 +11863,7 @@ - fi - fi - ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D" -- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm" -+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm -pthread" - D=$ac_java_jvm_dir/jre/lib/$machine/native_threads - if test -d $D; then - ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D" +--- configure.orig 2020-02-25 09:59:42 UTC ++++ configure +@@ -9995,7 +9995,7 @@ if test -z "$CXX"; then + fi + + case "$CXX" in +- g++-* | g++ | ccache*g++ | ccache*g++-* ) ++ g++-* | g++ | ccache*g++ | ccache*g++-* | c++ | clang++* ) + ## With GNU C++ Compiler + + # enable the code coverage +@@ -10022,7 +10022,7 @@ esac + #### 64 bits detection + IS_64_BITS_CPU=false + case "$host" in +- x86_64-*-linux-gnu | x86_64-linux-gnu | ia64-*-linux-gnu | alpha-*-linux-gnu | alpha-*-netbsd* | x86_64-*-netbsd* | sparc64-*-netbsd*) ++ x86_64-*-linux-gnu | x86_64-linux-gnu | ia64-*-linux-gnu | alpha-*-linux-gnu | alpha-*-netbsd* | x86_64-*-netbsd* | sparc64-*-netbsd* | amd64-*-freebsd* ) + IS_64_BITS_CPU=true + ;; + esac +@@ -10030,7 +10030,7 @@ esac + ##########" + + case "$CC" in +- gcc-* | gcc | ccache*gcc | ccache*gcc-* ) ++ gcc-* | gcc | ccache*gcc | ccache*gcc-* | cc | clang* ) + ## With GNU Compiler + + # enable the code coverage Copied and modified: head/math/scilab/files/patch-etc_librarypath.xml (from r537159, head/math/scilab/files/patch-etc-librarypath.xml) ============================================================================== --- head/math/scilab/files/patch-etc-librarypath.xml Sun May 31 13:10:32 2020 (r537159, copy source) +++ head/math/scilab/files/patch-etc_librarypath.xml Sun May 31 13:11:27 2020 (r537160) @@ -1,9 +1,12 @@ ---- etc/librarypath.xml.orig 2015-03-31 09:31:16 UTC +--- etc/librarypath.xml.orig 2020-02-25 09:59:42 UTC +++ etc/librarypath.xml -@@ -62,4 +62,6 @@ - - - -+ -+ - +@@ -42,6 +42,9 @@ + + + ++ ++ ++ + + + Modified: head/math/scilab/files/patch-jogamp-jogl-2.3.2 ============================================================================== --- head/math/scilab/files/patch-jogamp-jogl-2.3.2 Sun May 31 13:10:32 2020 (r537159) +++ head/math/scilab/files/patch-jogamp-jogl-2.3.2 Sun May 31 13:11:27 2020 (r537160) @@ -1,112 +1,6 @@ ---- modules/gui/src/java/org/scilab/modules/gui/SwingView.java -+++ modules/gui/src/java/org/scilab/modules/gui/SwingView.java -@@ -84,10 +84,10 @@ import java.util.Map; - import java.util.Set; - import java.util.UUID; - --import javax.media.opengl.GL; --import javax.media.opengl.GLCapabilities; --import javax.media.opengl.GLProfile; --import javax.media.opengl.awt.GLCanvas; -+import com.jogamp.opengl.GL; -+import com.jogamp.opengl.GLCapabilities; -+import com.jogamp.opengl.GLProfile; -+import com.jogamp.opengl.awt.GLCanvas; - import javax.swing.JComponent; - import javax.swing.JSeparator; - import javax.swing.SwingUtilities; ---- modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java -+++ modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java -@@ -20,7 +20,7 @@ import java.awt.Cursor; - import java.awt.Font; - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.canvas.Canvas; - import org.scilab.modules.gui.canvas.ScilabCanvas; ---- modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java -+++ modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java -@@ -32,8 +32,8 @@ import java.awt.event.MouseListener; - import java.awt.event.MouseMotionListener; - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; --import javax.media.opengl.GLAutoDrawable; -+import com.jogamp.opengl.GL; -+import com.jogamp.opengl.GLAutoDrawable; - import javax.swing.JPanel; - - import org.scilab.forge.scirenderer.Canvas; ---- modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java -+++ modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java -@@ -19,12 +19,12 @@ import java.awt.HeadlessException; - import java.util.Calendar; - import java.util.StringTokenizer; - --import javax.media.opengl.GL; --import javax.media.opengl.GLCapabilities; --import javax.media.opengl.GLException; --import javax.media.opengl.GLProfile; --import javax.media.opengl.awt.GLCanvas; --import javax.media.opengl.awt.GLJPanel; -+import com.jogamp.opengl.GL; -+import com.jogamp.opengl.GLCapabilities; -+import com.jogamp.opengl.GLException; -+import com.jogamp.opengl.GLProfile; -+import com.jogamp.opengl.awt.GLCanvas; -+import com.jogamp.opengl.awt.GLJPanel; - - import org.scilab.modules.action_binding.InterpreterManagement; - import org.scilab.modules.commons.OS; ---- modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java -+++ modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java -@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas; - - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.dockable.Dockable; - ---- modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java -+++ modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java -@@ -16,7 +16,7 @@ package org.scilab.modules.gui.canvas; - - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.bridge.ScilabBridge; - import org.scilab.modules.gui.dockable.ScilabDockable; ---- modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java -+++ modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java -@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas; - - import java.awt.image.BufferedImage; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - - import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas; - import org.scilab.modules.gui.utils.Position; ---- modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java -+++ modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java -@@ -15,7 +15,7 @@ package org.scilab.modules.gui.canvas; - import org.scilab.modules.gui.utils.Position; - import org.scilab.modules.gui.utils.Size; - --import javax.media.opengl.GL; -+import com.jogamp.opengl.GL; - import java.awt.image.BufferedImage; - - /** --- modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java +++ modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java -@@ -13,8 +13,8 @@ import org.scilab.forge.scirenderer.tran +@@ -13,8 +13,8 @@ import org.scilab.forge.scirenderer.tranformations.TransformationFactory; import org.scilab.forge.scirenderer.utils.shapes.geometry.CubeFactory; @@ -119,7 +13,7 @@ --- modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java +++ modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java -@@ -15,7 +15,7 @@ import com.jogamp.opengl.util.Animator; +@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.Canvas; import org.scilab.forge.scirenderer.implementation.jogl.JoGLCanvasFactory; @@ -130,13 +24,14 @@ import java.awt.BorderLayout; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java -@@ -16,16 +16,16 @@ import java.awt.image.BufferedImage; +@@ -20,17 +20,17 @@ import java.lang.reflect.InvocationTargetException; import java.util.concurrent.Semaphore; -import javax.media.opengl.DebugGL2; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; +-import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLDrawableFactory; @@ -147,6 +42,7 @@ +import com.jogamp.opengl.DebugGL2; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; ++import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLDrawableFactory; @@ -159,7 +55,7 @@ import org.scilab.forge.scirenderer.Canvas; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp +@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.Canvas; @@ -170,7 +66,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java -@@ -11,7 +11,7 @@ +@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl; @@ -181,7 +77,7 @@ * This class store current OpenGl context capacity. --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java -@@ -30,7 +30,7 @@ import org.scilab.forge.scirenderer.tran +@@ -34,7 +34,7 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener; import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -192,7 +88,7 @@ * --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java -@@ -11,8 +11,8 @@ +@@ -14,8 +14,8 @@ package org.scilab.forge.scirenderer.implementation.jogl; @@ -205,7 +101,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java -@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buff +@@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.buffers.ElementsBuffer; import org.scilab.forge.scirenderer.buffers.IndicesBuffer; @@ -216,7 +112,7 @@ import java.util.Set; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp +@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buffers.DataBuffer; @@ -227,7 +123,7 @@ /** --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp +@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buffers.ElementsBuffer; @@ -238,7 +134,7 @@ --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java -@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp +@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buffers.IndicesBuffer; @@ -249,7 +145,7 @@ import java.util.Collection; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java -@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.clip +@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.clipping.ClippingPlane; import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; @@ -260,7 +156,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java -@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.tran +@@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.tranformations.TransformationFactory; import org.scilab.forge.scirenderer.tranformations.Vector4d; @@ -271,7 +167,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java -@@ -23,7 +23,7 @@ import org.scilab.forge.scirenderer.text +@@ -26,7 +26,7 @@ import org.scilab.forge.scirenderer.lightning.LightManager; import org.scilab.forge.scirenderer.shapes.appearance.Material; @@ -282,7 +178,7 @@ --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java -@@ -11,7 +11,7 @@ +@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.lightning; @@ -293,7 +189,7 @@ import org.scilab.forge.scirenderer.lightning.Light; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java -@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.ligh +@@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.lightning.LightManager; import org.scilab.forge.scirenderer.shapes.appearance.Material; @@ -304,7 +200,7 @@ * JoGL implementation of {@link LightManager} --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java -@@ -11,7 +11,7 @@ +@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.picking; @@ -315,7 +211,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java -@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.impl +@@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.picking.PickingTools; import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -326,7 +222,7 @@ --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java -@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.Draw +@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; import org.scilab.forge.scirenderer.renderer.Renderer; @@ -337,7 +233,7 @@ * @author Pierre Lando --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java -@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.impl +@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.renderer.Renderer; import org.scilab.forge.scirenderer.renderer.RendererManager; @@ -348,7 +244,7 @@ import java.util.Stack; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java -@@ -28,11 +28,11 @@ import org.scilab.forge.scirenderer.tran +@@ -32,11 +32,11 @@ import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -367,7 +263,7 @@ import java.nio.FloatBuffer; --- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java +++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java -@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.imp +@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.shapes.appearance.Appearance; import org.scilab.forge.scirenderer.shapes.appearance.Color; @@ -376,3 +272,109 @@ /** * +--- modules/gui/src/java/org/scilab/modules/gui/SwingView.java ++++ modules/gui/src/java/org/scilab/modules/gui/SwingView.java +@@ -88,10 +88,10 @@ + import java.util.Set; + import java.util.UUID; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLCapabilities; +-import javax.media.opengl.GLProfile; +-import javax.media.opengl.awt.GLCanvas; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLCapabilities; ++import com.jogamp.opengl.GLProfile; ++import com.jogamp.opengl.awt.GLCanvas; + import javax.swing.JComponent; + import javax.swing.JSeparator; + import javax.swing.SwingUtilities; +--- modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java ++++ modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java +@@ -23,7 +23,7 @@ + import java.awt.Font; + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.canvas.Canvas; + import org.scilab.modules.gui.canvas.ScilabCanvas; +--- modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java +@@ -35,8 +35,8 @@ + import java.awt.event.MouseMotionListener; + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLAutoDrawable; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLAutoDrawable; + import javax.swing.JPanel; + + import org.scilab.forge.scirenderer.Canvas; +--- modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java ++++ modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java +@@ -22,12 +22,12 @@ + import java.util.Calendar; + import java.util.StringTokenizer; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLCapabilities; +-import javax.media.opengl.GLException; +-import javax.media.opengl.GLProfile; +-import javax.media.opengl.awt.GLCanvas; +-import javax.media.opengl.awt.GLJPanel; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLCapabilities; ++import com.jogamp.opengl.GLException; ++import com.jogamp.opengl.GLProfile; ++import com.jogamp.opengl.awt.GLCanvas; ++import com.jogamp.opengl.awt.GLJPanel; + + import org.scilab.modules.action_binding.InterpreterManagement; + import org.scilab.modules.commons.OS; +--- modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java +@@ -17,7 +17,7 @@ + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.dockable.Dockable; + +--- modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java +@@ -19,7 +19,7 @@ + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.bridge.ScilabBridge; + import org.scilab.modules.gui.dockable.ScilabDockable; +--- modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java +@@ -17,7 +17,7 @@ + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas; + import org.scilab.modules.gui.utils.Position; +--- modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java +@@ -18,7 +18,7 @@ + import org.scilab.modules.gui.utils.Position; + import org.scilab.modules.gui.utils.Size; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + import java.awt.image.BufferedImage; + + /** Added: head/math/scilab/files/patch-modules_fileio_includes_os__wfopen.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/scilab/files/patch-modules_fileio_includes_os__wfopen.h Sun May 31 13:11:27 2020 (r537160) @@ -0,0 +1,11 @@ +--- modules/fileio/includes/os_wfopen.h.orig 2020-02-25 09:59:50 UTC ++++ modules/fileio/includes/os_wfopen.h +@@ -25,7 +25,7 @@ + #endif + + // Linux +-#ifdef __linux__ ++#if defined(__linux__) || defined(__FreeBSD__) + #define os_wfopen linux_fopen + FILE* linux_fopen(const wchar_t* _pstFilename, const wchar_t* _pstMode); + #endif Copied and modified: head/math/scilab/files/patch-modules_threads_src_cpp_Thread__Wrapper.cpp (from r537159, head/math/scilab/files/patch-modules-core-includes-Thread_Wrapper.h) ============================================================================== --- head/math/scilab/files/patch-modules-core-includes-Thread_Wrapper.h Sun May 31 13:10:32 2020 (r537159, copy source) +++ head/math/scilab/files/patch-modules_threads_src_cpp_Thread__Wrapper.cpp Sun May 31 13:11:27 2020 (r537160) @@ -1,16 +1,16 @@ ---- modules/core/includes/Thread_Wrapper.h.orig 2010-09-01 02:34:21.000000000 -0700 -+++ modules/core/includes/Thread_Wrapper.h 2010-09-01 02:34:47.000000000 -0700 -@@ -70,13 +70,6 @@ - #define __Lock(lockName) pthread_mutex_lock(lockName) - - #define __UnLock(lockName) pthread_mutex_unlock(lockName) --/* PTHREAD_MUTEX_ERRORCHECK needed for a safe release atexit when we try to release without knowing if we own the lock --PTHREAD_PROCESS_SHARED needed for interprocess synch (plus alloc in shared mem thread_mutexattr_settype --Linux uses PTHREAD_MUTEX_ERRORCHECK_NP other Posix use PTHREAD_MUTEX_ERRORCHECK --*/ +--- modules/threads/src/cpp/Thread_Wrapper.cpp.orig 2020-02-25 10:00:14 UTC ++++ modules/threads/src/cpp/Thread_Wrapper.cpp +@@ -52,13 +52,6 @@ void __InitSignalLock(__threadSignalLock *lockName) + #ifdef _MSC_VER + InitializeCriticalSection(lockName); + #else +- /* PTHREAD_MUTEX_ERRORCHECK needed for a safe release atexit when we try to release without knowing if we own the lock +- PTHREAD_PROCESS_SHARED needed for interprocess synch (plus alloc in shared mem thread_mutexattr_settype +- Linux uses PTHREAD_MUTEX_ERRORCHECK_NP other Posix use PTHREAD_MUTEX_ERRORCHECK +- */ -#ifndef PTHREAD_MUTEX_ERRORCHECK -#define PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP -#endif - #define __InitSignalLock(lockName) \ - do { \ - pthread_mutexattr_t attr; \ + pthread_mutexattr_t attr; + pthread_mutexattr_init (&attr); + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); Modified: head/math/scilab/files/patch-xdg-open ============================================================================== --- head/math/scilab/files/patch-xdg-open Sun May 31 13:10:32 2020 (r537159) +++ head/math/scilab/files/patch-xdg-open Sun May 31 13:11:27 2020 (r537160) @@ -1,6 +1,6 @@ ---- ./modules/gui/src/java/org/scilab/modules/gui/utils/WebBrowser.java.orig 2014-07-24 22:44:04.242274707 +0000 -+++ ./modules/gui/src/java/org/scilab/modules/gui/utils/WebBrowser.java 2014-07-24 22:50:25.305278583 +0000 -@@ -98,14 +98,14 @@ +--- modules/gui/src/java/org/scilab/modules/gui/utils/WebBrowser.java.orig 2020-02-25 09:59:55 UTC ++++ modules/gui/src/java/org/scilab/modules/gui/utils/WebBrowser.java +@@ -101,14 +101,14 @@ public final class WebBrowser implements XConfiguratio // We have String mail = "mailto:" + url.substring(1, url.length() - 1); if (webprefs.defaultMailer) { @@ -17,7 +17,7 @@ } else { Runtime.getRuntime().exec(webprefs.cmdMailer + " " + new URI(url).toString()); } -@@ -113,7 +113,7 @@ +@@ -116,7 +116,7 @@ public final class WebBrowser implements XConfiguratio if (webprefs.defaultBrowser) { // Under Windows, ShellExecute is called with the URI and under Linux it is gnome_url_show. // So to handle different protocol in URI, user must config its OS to handle them. Modified: head/math/scilab/pkg-plist ============================================================================== --- head/math/scilab/pkg-plist Sun May 31 13:10:32 2020 (r537159) +++ head/math/scilab/pkg-plist Sun May 31 13:11:27 2020 (r537160) @@ -1,22 +1,28 @@ %%OCAML%%bin/XML2Modelica -bin/intersci %%OCAML%%bin/modelicac %%OCAML%%bin/modelicat -bin/scilab -bin/scilab-adv-cli -bin/scilab-bin +%%GUI%%bin/scilab +%%GUI%%bin/scilab-adv-cli +%%GUI%%bin/scilab-bin bin/scilab-cli bin/scilab-cli-bin -bin/scinotes -bin/xcos +%%GUI%%bin/scinotes +%%GUI%%bin/xcos +include/scilab/AnalysisVisitor.hxx include/scilab/BOOL.h +include/scilab/Checkers.hxx +include/scilab/ConsolePrintf.h +include/scilab/ConsoleRead.h +include/scilab/ConstantValue.hxx +include/scilab/Decorator.hxx include/scilab/ExternalObjects.h +include/scilab/ForList.hxx include/scilab/HistoryManager.h +include/scilab/InitializeConsole.h include/scilab/InitializeHistoryManager.h -include/scilab/MALLOC.h include/scilab/OptionsHelper.hxx include/scilab/PATH_MAX.h -include/scilab/SCIHOME.h +include/scilab/Result.hxx include/scilab/Scierror.h include/scilab/ScilabAbstractEnvironment.hxx include/scilab/ScilabAbstractEnvironmentException.hxx @@ -31,277 +37,527 @@ include/scilab/ScilabGatewayOptions.hxx include/scilab/ScilabObjects.hxx include/scilab/ScilabOptionsSetter.hxx include/scilab/ScilabStream.hxx +include/scilab/SetConsolePrompt.h +include/scilab/StringConvert.h +include/scilab/TIType.hxx include/scilab/TerminateHistoryManager.h include/scilab/Thread_Wrapper.h +include/scilab/UTF8.hxx +include/scilab/abstractdebugger.hxx include/scilab/addToClasspath.h include/scilab/addToLibrarypath.h +include/scilab/addfunction.h +include/scilab/all.hxx +include/scilab/alldec.hxx +include/scilab/allexp.hxx +include/scilab/alltypes.hxx +include/scilab/allvar.hxx include/scilab/api_boolean.h -include/scilab/api_boolean_sparse.h +include/scilab/api_cell.h include/scilab/api_common.h include/scilab/api_double.h include/scilab/api_error.h include/scilab/api_handle.h -include/scilab/api_hypermat.h include/scilab/api_int.h include/scilab/api_list.h include/scilab/api_optional.h include/scilab/api_pointer.h include/scilab/api_poly.h include/scilab/api_scilab.h -include/scilab/api_sparse.h +include/scilab/api_scilab.hxx +include/scilab/api_stack_boolean.h +include/scilab/api_stack_boolean_sparse.h +include/scilab/api_stack_common.h +include/scilab/api_stack_double.h +include/scilab/api_stack_error.h +include/scilab/api_stack_handle.h +include/scilab/api_stack_hypermat.h +include/scilab/api_stack_int.h +include/scilab/api_stack_list.h +include/scilab/api_stack_optional.h +include/scilab/api_stack_pointer.h +include/scilab/api_stack_poly.h +include/scilab/api_stack_sparse.h +include/scilab/api_stack_string.h include/scilab/api_string.h +include/scilab/api_struct.h +include/scilab/arraylistexp.hxx +include/scilab/arraylistvar.hxx +include/scilab/arrayof.hxx +include/scilab/assignexp.hxx +include/scilab/assignlistexp.hxx +include/scilab/ast.hxx +include/scilab/autoCompletionCli.h include/scilab/backtrace_print.h %%GUI%%include/scilab/blocks.h +include/scilab/bool.hxx +include/scilab/boolexp.hxx +include/scilab/breakexp.hxx +include/scilab/breakpoint.hxx +include/scilab/c_gateway_prototype.h +include/scilab/call/Call.hxx include/scilab/call_scilab.h +include/scilab/callable.hxx +include/scilab/callexp.hxx +include/scilab/caseexp.hxx +include/scilab/cell.hxx +include/scilab/cellcallexp.hxx +include/scilab/cellexp.hxx include/scilab/cerro.h include/scilab/charEncoding.h +include/scilab/charactersManagement.h +include/scilab/cliDisplayManagement.h +include/scilab/cliHistory.h +include/scilab/cliPrompt.h +include/scilab/colon.hxx +include/scilab/colonvar.hxx +include/scilab/commentexp.hxx include/scilab/completeLine.h include/scilab/completion.h +include/scilab/complex_array.h +include/scilab/configvariable.hxx +include/scilab/configvariable_interface.h +include/scilab/console_gw.hxx +include/scilab/consoledebugger.hxx +include/scilab/constexp.hxx +include/scilab/container.hxx +include/scilab/context.hxx +include/scilab/context_get.h +include/scilab/continueexp.hxx +include/scilab/controlexp.hxx +include/scilab/convstr.h include/scilab/core_math.h +include/scilab/cpp_gateway_prototype.hxx +include/scilab/cvstr.h +include/scilab/daxpyexp.hxx +include/scilab/debuggervisitor.hxx +include/scilab/debugmanager.hxx +include/scilab/dec.hxx +include/scilab/decls.hxx +include/scilab/deserializervisitor.hxx include/scilab/do_error_number.h +include/scilab/dollarvar.hxx +include/scilab/double.hxx include/scilab/doublecomplex.h +include/scilab/doubleexp.hxx +include/scilab/dtoa.h +include/scilab/dummyvisitor.hxx +include/scilab/dynamic_module.h include/scilab/dynamiclibrary.h include/scilab/dynamiclibrary_others.h +include/scilab/dynlib_api_scilab.h +include/scilab/dynlib_ast.h include/scilab/dynlib_completion.h +include/scilab/dynlib_console.h +include/scilab/dynlib_console_gw.h include/scilab/dynlib_external_objects_scilab.h include/scilab/dynlib_fileio.h include/scilab/dynlib_history_manager.h -include/scilab/dynlib_scicos.h +include/scilab/dynlib_localization.h +include/scilab/dynlib_output_stream.h +%%GUI%%include/scilab/dynlib_scicos.h +include/scilab/dynlib_string.h +include/scilab/dynlib_string_gw.h +include/scilab/dynlib_threads.h +include/scilab/execvisitor.hxx +include/scilab/existfunction.h +include/scilab/exit_status.hxx +include/scilab/exp.hxx +include/scilab/expHistory.hxx +include/scilab/fieldexp.hxx +include/scilab/file.hxx +include/scilab/forexp.hxx include/scilab/freeArrayOfString.h +include/scilab/function.hxx +include/scilab/functiondec.hxx +include/scilab/gatewaystruct.hxx +include/scilab/generic_operations.hxx include/scilab/getCommonPart.h include/scilab/getFullFilename.h +include/scilab/getKey.h +include/scilab/getNbrLine.h include/scilab/getPartLine.h include/scilab/getScilabJNIEnv.h include/scilab/getScilabJavaVM.h include/scilab/getScilabObject.h include/scilab/getcommandlineargs.h +include/scilab/getfastcode.h include/scilab/getmemory.h include/scilab/getos.h include/scilab/getversion.h -include/scilab/gw_completion.h +include/scilab/gotoFunctions.h +include/scilab/graphichandle.hxx +include/scilab/gvn/ConstraintManager.hxx +include/scilab/gvn/GVN.hxx +include/scilab/gvn/InferenceConstraint.hxx +include/scilab/gvn/MultivariateMonomial.hxx +include/scilab/gvn/MultivariatePolynomial.hxx +include/scilab/gvn/OpValue.hxx +include/scilab/gvn/SymbolicDimension.hxx +include/scilab/gvn/SymbolicRange.hxx +include/scilab/gvn/TestGVNVisitor.hxx +include/scilab/gvn/VarExp.hxx +include/scilab/gw_console.h include/scilab/gw_history_manager.h include/scilab/hashtable.h -include/scilab/hashtable_itr.h include/scilab/hashtable_utility.h -include/scilab/import.h -include/scilab/libinter.h +include/scilab/home.h +include/scilab/ifexp.hxx +include/scilab/implicitlist.hxx +%%GUI%%include/scilab/import.h +include/scilab/initConsoleMode.h +include/scilab/initMacOSXEnv.h +include/scilab/inspector.hxx +include/scilab/int.hxx +include/scilab/interface_addition.h +include/scilab/internal.hxx +include/scilab/invert_matrix.h +include/scilab/isatty.hxx +include/scilab/keepForSparse.hxx +include/scilab/lasterror.h +include/scilab/libraries.hxx +include/scilab/library.hxx +include/scilab/list.hxx +include/scilab/listdelete.hxx +include/scilab/listexp.hxx +include/scilab/listinsert.hxx +include/scilab/listoperation.hxx include/scilab/localization.h +include/scilab/localization.hxx +include/scilab/location.hxx +include/scilab/logicalopexp.hxx include/scilab/machine.h +include/scilab/macro.hxx +include/scilab/macrofile.hxx +include/scilab/macrovarvisitor.hxx +include/scilab/mathexp.hxx +include/scilab/matrix_addition.h +include/scilab/matrix_division.h +include/scilab/matrix_finite.h +include/scilab/matrix_kronecker.h +include/scilab/matrix_left_division.h +include/scilab/matrix_multiplication.h +include/scilab/matrix_power.h +include/scilab/matrix_right_division.h +include/scilab/matrix_transpose.h +include/scilab/matrixexp.hxx +include/scilab/matrixiterator.hxx +include/scilab/matrixlineexp.hxx +include/scilab/men_Sutils.h include/scilab/mex.h -include/scilab/mode_exec.h +include/scilab/mlist.hxx +include/scilab/more.h +include/scilab/nilexp.hxx +include/scilab/notexp.hxx +include/scilab/operation_f.h +include/scilab/operations.hxx +include/scilab/operations_tools.h +include/scilab/opexp.hxx +include/scilab/optimizedexp.hxx +include/scilab/os_string.h +include/scilab/os_wcstod.h +include/scilab/os_wcstok.h +include/scilab/overload.hxx +include/scilab/parse.hxx +include/scilab/parser.hxx +include/scilab/parser_private.hxx +include/scilab/parsescilab.hxx +include/scilab/pcre_private.h +include/scilab/pointer.hxx +include/scilab/polynom.hxx +include/scilab/prettyprintvisitor.hxx +include/scilab/printvisitor.hxx *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***