diff options
| -rw-r--r-- | .SRCINFO | 56 | ||||
| -rw-r--r-- | .shellcheckrc | 7 | ||||
| -rw-r--r-- | .travis.yml | 93 | ||||
| -rw-r--r-- | PKGBUILD | 113 | ||||
| -rw-r--r-- | hdf5_18_api.patch | 81 | ||||
| -rw-r--r-- | libxml.patch | 66 | ||||
| -rw-r--r-- | scilab-0004-Fix-build-with-ocaml-4.0.4.patch | 12 | ||||
| -rw-r--r-- | scilab-LD_LIBRARY_PATH.patch | 17 | ||||
| -rw-r--r-- | scilab-git_java-default-dir.patch | 11 | ||||
| -rw-r--r-- | scilab-hdf5-1.8.10.patch | 308 | ||||
| -rw-r--r-- | scilab-hdf5-type.patch | 11 | ||||
| -rw-r--r-- | scilab-jogl-2.3.2.patch | 172 | ||||
| -rw-r--r-- | scilab-lucene-6.patch | 11 | ||||
| -rw-r--r-- | scilab-num.patch | 17 | ||||
| -rw-r--r-- | scilab-type.patch | 11 |
15 files changed, 459 insertions, 527 deletions
@@ -1,19 +1,20 @@ -# Generated by mksrcinfo v8 -# Mon Jul 3 09:29:54 UTC 2017 pkgbase = scilab-git - pkgdesc = A scientific software package for numerical computations - pkgver = 6.0.0.r101.gac588401314 + pkgdesc = A scientific software package for numerical computations. + pkgver = 6.2.0.r216.g81a9cc04933 pkgrel = 1 - url = https://www.scilab.org/ + url = https://www.scilab.org arch = i686 arch = x86_64 - license = custom:CeCILL license = BSD - makedepends = apache-ant - makedepends = git - makedepends = ocaml - makedepends = java-environment>=8 + license = custom:CeCILL + license = GPL2 + makedepends = java-environment=8 + makedepends = ant>=1.9.0 + makedepends = ocaml-findlib + makedepends = ocaml-num makedepends = gcc-fortran + makedepends = time + makedepends = git depends = suitesparse>=4.4.1 depends = arpack depends = fftw @@ -21,15 +22,16 @@ pkgbase = scilab-git depends = hdf5 depends = libmatio depends = tk + depends = bwidget depends = curl + depends = inetutils depends = java-runtime>=8 - depends = apache-lucene>=6 depends = beanshell depends = eclipse-ecj depends = java-flexdock>=1.2.4 depends = fop-hyph depends = jeuclid-core - depends = jgraphx>=2.0.0.1 + depends = jgraphx-jre8 depends = javahelp2 depends = saxon-he depends = jlatexmath-fop>=1.0.3 @@ -37,29 +39,29 @@ pkgbase = scilab-git depends = jgoodies-looks depends = java-qdox depends = java-skinlf - depends = java-testng depends = xalan-java depends = docbook-xsl depends = jogl>=2.3.2 + depends = apache-lucene>=7 depends = java-batik>=1.8 + depends = java-xmlgraphics-commons>=2.0.1 provides = scilab conflicts = scilab - source = git://git.scilab.org/scilab - source = scilab-jogl-2.3.2.patch - source = scilab-LD_LIBRARY_PATH.patch + source = git://git.scilab.org/scilab#branch=master + source = jogl-2.3.2.patch::http://gitweb.scilab.org/?p=scilab.git;a=patch;h=0c977dd8e334bf393e61f81f5fd19c48efc538c9 + source = ocaml-4.02.patch::http://gitweb.scilab.org/?p=scilab.git;a=patch;h=eb6b830cc812498a451f9d9b497b18bd4785eed5 source = scilab-strict-jar.patch - source = scilab-lucene-6.patch - source = scilab-hdf5-type.patch - source = scilab-hdf5-1.8.10.patch - source = scilab-type.patch + source = scilab-LD_LIBRARY_PATH.patch + source = scilab-num.patch + source = libxml.patch + source = hdf5_18_api.patch sha256sums = SKIP - sha256sums = f19f173e989f72bd55bda35e271b3c180ecef4e29da964df3f230fce8b1330fc - sha256sums = 37f649fea0196b255e5a8576dd1e8c5fd219c6e8c600b703b35303fb90b6a7e0 + sha256sums = 2348c8badad19974174eac99d18f4583c838dd406265d686fa46b6c8c4d04cce + sha256sums = 2aec92a3a12e7c776856edcacbce5115cac784f4a946151d96bcf46d64f10e40 sha256sums = 38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd - sha256sums = ba7969fff7f839562120534222fbb6421e204f6a382654d80bbab19e0c7a2c66 - sha256sums = c992a4f230dac60c3e217efee04b678c58d856f2aafa6173f742d4c5b050ab9d - sha256sums = 2dee1346c240d09ce7870bbbeb3318e0ac5d78f249d855df313e9cb7a2ef7fc0 - sha256sums = 93597034c6866c3a4aaa7ef92b4588d2753383545ed3366be6cdb404edf949bd + sha256sums = a39277cb8cfc3d7929c73ce6d707dc24e3df4b8d8f2d587f075efebda79ff4db + sha256sums = 79c5f32bc2142f9861491787e8ee86d0b75f148141b176bae394ea360b8944d7 + sha256sums = c04114c4ef63d76bf898808e90c892de093fcc400a2371c7aa287b76c0c5d041 + sha256sums = f781c2919a0c14be5deed3a8b8866addd8de1171a06aacb96ef1e19535d0988e pkgname = scilab-git - diff --git a/.shellcheckrc b/.shellcheckrc new file mode 100644 index 000000000000..586dc3ac8caf --- /dev/null +++ b/.shellcheckrc @@ -0,0 +1,7 @@ +# allow unsafe `cd ` +disable=SC2164 +# allow unused variable (pkgname,pkgver etc.) +disable=SC2034 +# allow uninitialized variable (srcdir,pkgdir) +disable=SC2154 + diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000000..a84bdea5005d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,93 @@ +sudo: required +language: c + +branches: + only: + - /.*/ + +cache: + directories: + - ~/.ccache + - ~/.pkg-cache + - ~/.cache/yay + - scilab + +services: +- docker + +archlinux: + mount: + - ~/.ccache:~/.ccache + - ~/.pkg-cache:/var/cache/pacman/pkg + - ~/.cache/yay:~/.cache/yay + repos: +# - bartus=https://github.com/bartoszek/AUR-repo/raw/master + packages: + - ccache + - moreutils + - bwidget + - java-flexdock + - aur/fop-hyph + - jeuclid-core + - jgraphx-jre8 + - javahelp2 + - saxon-he + - jlatexmath-fop + - jrosetta + - jgoodies-looks + - java-qdox + - java-skinlf + - jogl + - apache-lucene + before_install: +# 1.Override `package-cleanup.hook` to preserve cache for travis. +# 2.Enable ccache +# 3.Multithreaded build and compress +# 4.Suppress all gcc warnings + - | + echo "$ env:" + env + echo "$ declare -p" + declare -p + unset JAVA_HOME + sudo mkdir /etc/pacman.d/hooks/ + sudo ln -s /dev/null /etc/pacman.d/hooks/package-cleanup.hook + sudo sed -i '/^BUILDENV/s/\!ccache/ccache/' /etc/makepkg.conf + sudo sed -i '/#MAKEFLAGS=/c MAKEFLAGS="-j2"' /etc/makepkg.conf + sudo sed -i '/^COMPRESSXZ/s/\xz/xz -T 2/' /etc/makepkg.conf + sudo sed -i '$a CFLAGS="$CFLAGS -w"' /etc/makepkg.conf + sudo sed -i '$a CXXFLAGS="$CXXFLAGS -w"' /etc/makepkg.conf + script: +# - "( . PKGBUILD ; pacman -Q ${depends[@]} ${makedepends[@]} 2>&1 1>/dev/null|cut -d' ' -f3| xargs -n1 yay -S )" +# Normalize TRAVIS variable + - | + [ "$TRAVIS" == "true" ] && TRAVIS=1 || TRAVIS=0 + export NINJA_STATUS="[%p₋|₋%f<%r<%u₋|₋%obps₋]₋" +# Java-testng fail in check() +# - sudo archlinux-java se t java-8-openjdk +# - yay -S --noconfirm --needed --useask --mflags="--nocheck" java-testng +# Build + - 'echo "Travis initialization time: $travis_uptime seconds"' + - "arch_uptime=$(cut -d' ' -f1 /proc/uptime|cut -d'.' -f1)" + - 'echo "Arch-Travis initialization time: $((arch_uptime-travis_uptime)) seconds"' + - ccache -s + - ccache -z +# set timeout to 50m minus current uptime, minus travis cache in time, minus 60 second buffer for arch-travis cleanup. + - timeout $((50*60-arch_uptime-travis_uptime-60)) makepkg -s --noconfirm > >(ts -s '%.T'); _makepkg_return=$? + - sudo pacman -Sc --noconfirm + - ccache -s + - ccache -z + - exit $_makepkg_return +script: +- "export travis_uptime=$(cut -d' ' -f1 /proc/uptime|cut -d'.' -f1)" +- 'echo "Travis initialization time: $travis_uptime seconds"' +# assume caching out will take the same amount of time as caching in those making build time equal to 50 minutes minus two time current uptime. +- "curl -s https://raw.githubusercontent.com/bartoszek/arch-travis/master/arch-travis.sh| timeout $((50*60-2*travis_uptime)) bash" +- "echo pacman pkg cache size: $(du -h ~/.pkg-cache|cut -f1) in $(ls ~/.pkg-cache|wc -l) files" + +#deploy: +# provider: script +# script: bash .travis_deploy.sh +# on: +# branch: master +# skip_cleanup: true @@ -1,68 +1,77 @@ -# Maintainer: eolianoe <eolianoe [at] gmail [DoT] com> -# Contributor: Victor Dmitriyev <mrvvitek@gmail.com> +#!/hint/bash +# Maintainer : eolianoe <eolianoe [at] gmail [DoT] com> +# Contributor : Victor Dmitriyev <mrvvitek@gmail.com> +# Contributor : bartus <scilab-aur@bartus.33mail.com> _pkgname=scilab -pkgname=scilab-git -pkgver=6.0.0.r101.gac588401314 +_fragment="${FRAGMENT:-#branch=master}" +_ver_pop_commit="2797926fe5a3af91029ce4fc018ced0c286e6fe3" +pkgname=${_pkgname}-git +pkgver=6.2.0.r216.g81a9cc04933 pkgrel=1 -pkgdesc='A scientific software package for numerical computations' +pkgdesc='A scientific software package for numerical computations.' arch=('i686' 'x86_64') -url="https://www.scilab.org/" -license=('custom:CeCILL' 'BSD') -depends=('suitesparse>=4.4.1' 'arpack' 'fftw' 'eigen' - 'hdf5' - 'libmatio' 'tk' 'curl' +url='https://www.scilab.org' +license=('BSD' 'custom:CeCILL' 'GPL2') +depends=('suitesparse>=4.4.1' 'arpack' 'fftw' 'eigen' + 'hdf5' 'libmatio' + 'tk' 'bwidget' + 'curl' 'inetutils' 'java-runtime>=8' - 'apache-lucene>=6' 'beanshell' 'eclipse-ecj' 'java-flexdock>=1.2.4' 'fop-hyph' - 'jeuclid-core' 'jgraphx>=2.0.0.1' 'javahelp2' + 'jeuclid-core' 'jgraphx-jre8' 'javahelp2' 'saxon-he' 'jlatexmath-fop>=1.0.3' 'jrosetta>=1.0.4' 'jgoodies-looks' 'java-qdox' - 'java-skinlf' 'java-testng' 'xalan-java' 'docbook-xsl' - 'jogl>=2.3.2' 'java-batik>=1.8') -makedepends=('apache-ant' 'git' 'ocaml' 'java-environment>=8' 'gcc-fortran') + 'java-skinlf' 'xalan-java' 'docbook-xsl' + 'jogl>=2.3.2' 'apache-lucene>=7' + 'java-batik>=1.8' 'java-xmlgraphics-commons>=2.0.1') +makedepends=('java-environment=8' 'ant>=1.9.0' + 'ocaml-findlib' 'ocaml-num' 'gcc-fortran' + 'time' 'git') provides=('scilab') conflicts=('scilab') -source=("git://git.scilab.org/scilab" - "${_pkgname}-jogl-2.3.2.patch" - "${_pkgname}-LD_LIBRARY_PATH.patch" +source=("git://git.scilab.org/scilab${_fragment}" + "jogl-2.3.2.patch::http://gitweb.scilab.org/?p=scilab.git;a=patch;h=0c977dd8e334bf393e61f81f5fd19c48efc538c9" + "ocaml-4.02.patch::http://gitweb.scilab.org/?p=scilab.git;a=patch;h=eb6b830cc812498a451f9d9b497b18bd4785eed5" "${_pkgname}-strict-jar.patch" - "${_pkgname}-lucene-6.patch" - "${_pkgname}-hdf5-type.patch" - "${_pkgname}-hdf5-1.8.10.patch" - "${_pkgname}-type.patch") - + "${_pkgname}-LD_LIBRARY_PATH.patch" + "${_pkgname}-num.patch" + "libxml.patch" + "hdf5_18_api.patch" + ) sha256sums=('SKIP' - 'f19f173e989f72bd55bda35e271b3c180ecef4e29da964df3f230fce8b1330fc' - '37f649fea0196b255e5a8576dd1e8c5fd219c6e8c600b703b35303fb90b6a7e0' + '2348c8badad19974174eac99d18f4583c838dd406265d686fa46b6c8c4d04cce' + '2aec92a3a12e7c776856edcacbce5115cac784f4a946151d96bcf46d64f10e40' '38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd' - 'ba7969fff7f839562120534222fbb6421e204f6a382654d80bbab19e0c7a2c66' - 'c992a4f230dac60c3e217efee04b678c58d856f2aafa6173f742d4c5b050ab9d' - '2dee1346c240d09ce7870bbbeb3318e0ac5d78f249d855df313e9cb7a2ef7fc0' - '93597034c6866c3a4aaa7ef92b4588d2753383545ed3366be6cdb404edf949bd') + 'a39277cb8cfc3d7929c73ce6d707dc24e3df4b8d8f2d587f075efebda79ff4db' + '79c5f32bc2142f9861491787e8ee86d0b75f148141b176bae394ea360b8944d7' + 'c04114c4ef63d76bf898808e90c892de093fcc400a2371c7aa287b76c0c5d041' + 'f781c2919a0c14be5deed3a8b8866addd8de1171a06aacb96ef1e19535d0988e') pkgver() { cd "${srcdir}/${_pkgname}/${_pkgname}" - - git describe --long --tags --always | sed -r 's/([^-]*-g)/r\1/;s/-/./g' +# Tags are dragging behind +# git describe --long --tags --always | sed -r 's/([^-]*-g)/r\1/;s/-/./g' + scilab_ver=$(printf "%d.%d.%d" $(grep -Po '^SCILAB_VERSION_(MAJOR|MINOR|MAINTENANCE)=\K.*' configure.ac)) + printf "%s.r%s.g%s" "$scilab_ver" "$(git rev-list --count $_ver_pop_commit..HEAD)" "$(git rev-parse --short HEAD)" } prepare(){ cd "${srcdir}/${_pkgname}/${_pkgname}" - # http://bugzilla.scilab.org/show_bug.cgi?id=14539 - patch -p1 < "${srcdir}"/${_pkgname}-hdf5-1.8.10.patch # https://codereview.scilab.org/#/c/17530/ - patch -p2 < "${srcdir}"/${_pkgname}-jogl-2.3.2.patch - # Linked to: https://codereview.scilab.org/#/c/18089/ - patch < "${srcdir}"/${_pkgname}-strict-jar.patch - # Fix to build with lucene >= 6 - patch -p0 < "${srcdir}"/${_pkgname}-lucene-6.patch - # Fix hdf5 type - patch -p0 < "${srcdir}"/${_pkgname}-hdf5-type.patch - # Fix for LD_LIBRARY_PATH - patch bin/scilab "${srcdir}"/${_pkgname}-LD_LIBRARY_PATH.patch - # Fix type - patch -p0 < "${srcdir}"/${_pkgname}-type.patch + patch -p2 < "${srcdir}"/jogl-2.3.2.patch + # https://codereview.scilab.org/#/c/20161/ + patch -p2 < "${srcdir}"/ocaml-4.02.patch + # https://codereview.scilab.org/#/c/18089/ + patch -p0 < "${srcdir}"/${_pkgname}-strict-jar.patch + # Fix path, to avoid the following error: + # An error has been detected while loading /usr/share/scilab//modules/functions/.libs/libscifunctions.so: /usr/share/scilab//modules/functions/.libs/libscifunctions.so: cannot open shared object file: No such file or directory + patch -p0 < "${srcdir}"/${_pkgname}-LD_LIBRARY_PATH.patch + patch -p0 < "${srcdir}"/${_pkgname}-num.patch + # libxml + patch -p1 < "${srcdir}"/libxml.patch + # hdf5_18_api + patch -p1 < "${srcdir}"/hdf5_18_api.patch } build() { @@ -81,21 +90,25 @@ build() { --with-install-help-xml \ --enable-build-help \ --enable-build-localization \ - --disable-static-system-lib + --disable-static-system-lib \ + --enable-silent-rules \ + --with-jdk=/usr/lib/jvm/java-8-openjdk/ \ + FFLAGS="-fallow-argument-mismatch" \ + CFLAGS="$CFLAGS -fcommon" \ + CXXFLAGS="$CXXFLAGS -fcommon" \ make - make doc + ((TRAVIS)) || make doc } package() { cd "${srcdir}/${_pkgname}/${_pkgname}" make DESTDIR="${pkgdir}" install + ((TRAVIS)) || make DESTDIR="${pkgdir}" install-data install-html - install -Dm644 "${srcdir}/${_pkgname}/${_pkgname}/COPYING" \ - "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" - install -Dm644 "${srcdir}/${_pkgname}/${_pkgname}/COPYING-BSD" \ - "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-BSD" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + install -Dm644 COPYING-BSD "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-BSD" } # vim:set ts=2 sw=2 et: diff --git a/hdf5_18_api.patch b/hdf5_18_api.patch new file mode 100644 index 000000000000..a80e29f8a813 --- /dev/null +++ b/hdf5_18_api.patch @@ -0,0 +1,81 @@ +diff -Naur orig/scilab-6.1.0/modules/hdf5/Makefile.am scilab-6.1.0/modules/hdf5/Makefile.am +--- orig/scilab-6.1.0/modules/hdf5/Makefile.am 2020-02-25 10:59:56.000000000 +0100 ++++ scilab-6.1.0/modules/hdf5/Makefile.am 2020-06-16 17:11:11.934227935 +0200 +@@ -103,8 +103,7 @@ + -DH5Gopen_vers=2 \ + -DH5Tget_array_dims_vers=2 \ + -DH5Acreate_vers=2 \ +- -DH5Rdereference_vers=2 \ +- -DNO_DEPRECATED_SYMBOLS ++ -DH5Rdereference_vers=2 + + + libscihdf5_la_CPPFLAGS = \ +diff -Naur orig/scilab-6.1.0/modules/hdf5/Makefile.in scilab-6.1.0/modules/hdf5/Makefile.in +--- orig/scilab-6.1.0/modules/hdf5/Makefile.in 2020-02-25 10:59:56.000000000 +0100 ++++ scilab-6.1.0/modules/hdf5/Makefile.in 2020-06-16 17:11:23.374128670 +0200 +@@ -788,8 +788,7 @@ + -DH5Gopen_vers=2 \ + -DH5Tget_array_dims_vers=2 \ + -DH5Acreate_vers=2 \ +- -DH5Rdereference_vers=2 \ +- -DNO_DEPRECATED_SYMBOLS ++ -DH5Rdereference_vers=2 + + libscihdf5_la_CPPFLAGS = \ + -I$(srcdir)/includes/ \ +diff -Naur orig/scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h +--- orig/scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h 2020-02-25 10:59:56.000000000 +0100 ++++ scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h 2020-06-16 17:07:00.129746134 +0200 +@@ -16,14 +16,12 @@ + #ifndef __HDF5OBJECTS_H__ + #define __HDF5OBJECTS_H__ + +-#define H5_NO_DEPRECATED_SYMBOLS + #undef H5_USE_16_API ++#define H5_USE_18_API + +-#define H5Eset_auto_vers 2 + #include <hdf5.h> + #include <hdf5_hl.h> + +-#undef H5_NO_DEPRECATED_SYMBOLS + + //#define __HDF5OBJECTS_DEBUG__ + //#define __HDF5ERROR_PRINT__ +diff -Naur orig/scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp +--- orig/scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2020-02-25 10:59:56.000000000 +0100 ++++ scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2020-06-16 17:15:08.605507554 +0200 +@@ -13,6 +13,8 @@ + * + */ + ++#define H5_USE_18_API ++ + #include <vector> + #include "function.hxx" + #include "string.hxx" +diff -Naur orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c +--- orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c 2020-02-25 10:59:56.000000000 +0100 ++++ scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c 2020-06-16 17:13:05.759906899 +0200 +@@ -13,7 +13,7 @@ + * + */ + +-#define H5_NO_DEPRECATED_SYMBOLS ++#define H5_USE_18_API + + #ifndef _MSC_VER + #include <sys/time.h> +diff -Naur orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c +--- orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2020-02-25 10:59:56.000000000 +0100 ++++ scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2020-06-16 17:13:20.183115080 +0200 +@@ -13,7 +13,7 @@ + * + */ + +-#define H5_NO_DEPRECATED_SYMBOLS ++#define H5_USE_18_API + + #ifndef _MSC_VER + #include <sys/time.h> diff --git a/libxml.patch b/libxml.patch new file mode 100644 index 000000000000..55d2e744a2e8 --- /dev/null +++ b/libxml.patch @@ -0,0 +1,66 @@ +--- orig/scilab-6.1.0/modules/functions_manager/src/cpp/dynamic_modules.cpp 2020-02-25 10:59:51.000000000 +0100 ++++ scilab-6.1.0/modules/functions_manager/src/cpp/dynamic_modules.cpp 2020-06-13 17:52:19.258491176 +0200 +@@ -22,13 +22,13 @@ + { + #include "loadOnUseClassPath.h" + #include "Scierror.h" ++} + + //XML API + #include <libxml/xpath.h> + #include <libxml/xmlreader.h> + #include "sci_malloc.h" + #include "configvariable_interface.h" +-} + + vectGateway loadGatewaysName(const std::wstring& _wstModuleName) + { +--- orig/scilab-6.1.0/modules/io/src/cpp/loadlib.cpp 2020-02-25 10:59:59.000000000 +0100 ++++ scilab-6.1.0/modules/io/src/cpp/loadlib.cpp 2020-06-13 17:38:17.474133786 +0200 +@@ -17,6 +17,8 @@ + #include "context.hxx" + #include "loadlib.hxx" + #include "macrofile.hxx" ++#include <libxml/xpath.h> ++#include <libxml/xmlreader.h> + extern "C" + { + #include "FileExist.h" +@@ -26,8 +28,6 @@ + #include "fullpath.h" + #include "PATH_MAX.h" + #include "pathconvert.h" +-#include <libxml/xpath.h> +-#include <libxml/xmlreader.h> + } + + #define DEFAULT_ENCODING "UTF-8" +--- orig/scilab-6.1.0/modules/xml/src/cpp/XMLDocument.hxx 2020-02-25 11:00:18.000000000 +0100 ++++ scilab-6.1.0/modules/xml/src/cpp/XMLDocument.hxx 2020-06-13 17:45:02.443795087 +0200 +@@ -23,13 +23,10 @@ + + #include "dynlib_xml_scilab.h" + +-extern "C" +-{ + #include "xml.h" + #ifndef XML_XPATH_CHECKNS + #define XML_XPATH_CHECKNS + #endif +-} + + #include "XMLObject.hxx" + +--- orig/scilab-6.1.0/modules/scicos/includes/XMIResource.hxx 2020-02-25 11:00:08.000000000 +0100 ++++ scilab-6.1.0/modules/scicos/includes/XMIResource.hxx 2020-06-13 18:13:54.985717732 +0200 +@@ -22,10 +22,8 @@ + #include <string> + #include <vector> + +-extern "C" { + #include <libxml/xmlwriter.h> + #include <libxml/xmlreader.h> +-} + + namespace org_scilab_modules_scicos + { diff --git a/scilab-0004-Fix-build-with-ocaml-4.0.4.patch b/scilab-0004-Fix-build-with-ocaml-4.0.4.patch new file mode 100644 index 000000000000..8ee5196a1bbf --- /dev/null +++ b/scilab-0004-Fix-build-with-ocaml-4.0.4.patch @@ -0,0 +1,12 @@ +--- modules/scicos/src/modelica_compiler/optimization.ml.orig 2018-05-16 19:42:49.168681800 +0200 ++++ modules/scicos/src/modelica_compiler/optimization.ml 2018-05-16 19:44:53.999181477 +0200 +@@ -163,7 +163,8 @@ + let m, e = frexp f in + let sm = string_of_float m in + let s = String.make 16 '0' in +- String.blit sm 2 s 0 (String.length sm - 2); ++ let sss = Bytes.make 16 '0' in ++ String.blit sm 2 sss 0 (String.length sm - 2); + let e' = Num.power_num (Num.Int 2) (Num.num_of_int e) in + Num.div_num (Num.mult_num (Num.num_of_string s) e') scaling_factor + in diff --git a/scilab-LD_LIBRARY_PATH.patch b/scilab-LD_LIBRARY_PATH.patch index 222dff3b8806..b4a76f1c816f 100644 --- a/scilab-LD_LIBRARY_PATH.patch +++ b/scilab-LD_LIBRARY_PATH.patch @@ -1,11 +1,10 @@ ---- bin/scilab 2016-08-09 15:08:31.708445393 +0200 -+++ bin/scilab 2016-08-09 15:10:30.285575525 +0200 -@@ -808,7 +808,7 @@ - if test -d $SCI/lib/thirdparty; then - SCILIB=$SCI/lib/thirdparty:$SCILIB; +--- bin/scilab.orig 2018-05-16 23:48:44.501994437 +0200 ++++ bin/scilab 2018-05-16 23:50:46.261466741 +0200 +@@ -673,6 +673,7 @@ + export TCL_LIBRARY + export TK_LIBRARY + fi ++ LD_LIBRARY_PATH=/usr/lib/scilab${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} + PATH="$SCI:$SCI/bin:$PATH" fi --LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} -+LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}:/usr/lib/scilab - case $OS in - *darwin* | *Darwin*) # MacOS X diff --git a/scilab-git_java-default-dir.patch b/scilab-git_java-default-dir.patch deleted file mode 100644 index b4c1d12c3993..000000000000 --- a/scilab-git_java-default-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scilab/bin/scilab.old 2016-04-24 14:05:43.822800477 +0200 -+++ scilab/bin/scilab 2016-04-24 14:06:19.996236250 +0200 -@@ -438,7 +438,7 @@ - # Browse "default directory" (if it means anything under Unix/Linux) of Java - # to find where it could be ! - if test -z "$JAVA_HOME"; then -- JAVA_DEFAULT_DIR="/usr/java/jdk1.8.*/ /usr/lib/jvm/java-1.8.0-*/ /usr/lib/jvm/java-8-*/ /etc/alternatives/java_sdk /etc/alternatives/jre /usr/java/jdk*/ /usr/lib/jvm/java-*/" -+ JAVA_DEFAULT_DIR="/usr/lib/jvm/default/ /usr/java/jdk1.8.*/ /usr/lib/jvm/java-1.8.0-*/ /usr/lib/jvm/java-8-*/ /etc/alternatives/java_sdk /etc/alternatives/jre /usr/java/jdk*/ /usr/lib/jvm/java-*/" - for DIR in $JAVA_DEFAULT_DIR ; do - if test $SCIVERBOSE -ne 0; then - echo "Trying to find Java in $DIR " diff --git a/scilab-hdf5-1.8.10.patch b/scilab-hdf5-1.8.10.patch deleted file mode 100644 index 7fbb0339fe75..000000000000 --- a/scilab-hdf5-1.8.10.patch +++ /dev/null @@ -1,308 +0,0 @@ ---- scilab-6.0.0.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-15 20:08:00.761619371 +0100 -@@ -42,7 +42,11 @@ - for (int i = 0; i < totalSize; i++) - { - void * ref = &(((void **)cdata)[i]); -- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ hid_t obj = H5Rdereference(file, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - H5O_info_t info; - H5Oget_info(obj, &info); - H5Oclose(obj); -@@ -84,7 +88,11 @@ - - file = getFile().getH5Id(); - ref = &(((void **)cdata)[0]); -- obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ obj = H5Rdereference(file, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - if (obj < 0) - { - throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position.")); -@@ -126,7 +134,11 @@ - for (int i = 0; i < totalSize; i++) - { - void * ref = &(((void **)cdata)[i]); -- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ hid_t obj = H5Rdereference(file, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - objs[i] = &H5Object::getObject(getParent(), obj); - } - -@@ -181,7 +193,11 @@ - char * cdata = static_cast<char *>(data) + offset + pos * (stride ? stride : dataSize); - void ** ref = &(((void **)cdata)[0]); - hid_t file = getFile().getH5Id(); -- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ hid_t obj = H5Rdereference(file, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - if (obj < 0) - { - os << "NULL"; ---- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-15 20:08:00.758286029 +0100 -@@ -474,7 +474,11 @@ - } - - //Open the referenced object, get its name and type. -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &Ref); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &Ref); - readDouble_v1(obj, _iRows, _iCols, _pdblData); - } - -@@ -501,14 +505,22 @@ - } - - //Open the referenced object, get its name and type. -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readDouble_v1(obj, _iRows, _iCols, _pdblReal); - if (status < 0) - { - return -1; - } - -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readDouble_v1(obj, _iRows, _iCols, _pdblImg); - if (status < 0) - { -@@ -834,7 +846,11 @@ - /* - * Open the referenced object, get its name and type. - */ -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &pData[i]); - if (_iComplex) - { - status = readComplexPoly_v1(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]); -@@ -1069,7 +1085,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow); - if (status < 0) - { -@@ -1077,7 +1097,11 @@ - } - - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos); - if (status < 0) - { -@@ -1085,7 +1109,11 @@ - } - - //read sparse data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[2]); - - if (_iComplex) - { -@@ -1131,7 +1159,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow); - if (status < 0) - { -@@ -1139,7 +1171,11 @@ - } - - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos); - if (status < 0) - { -@@ -1234,7 +1270,11 @@ - { - hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos]; - -- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef); -+ *_piItemDataset = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &poRef); - - if (*_piItemDataset == 0) - { ---- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-15 20:08:00.758286029 +0100 -@@ -742,7 +742,11 @@ - /* - * Open the referenced object, get its name and type. - */ -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &pData[i]); - if (_iComplex) - { - status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]); -@@ -976,7 +980,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix(obj, _piNbItemRow); - if (status < 0) - { -@@ -984,7 +992,11 @@ - } - - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix(obj, _piColPos); - if (status < 0) - { -@@ -992,7 +1004,11 @@ - } - - //read sparse data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[2]); - - if (_iComplex) - { -@@ -1043,7 +1059,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix(obj, _piNbItemRow); - if (status < 0) - { -@@ -1053,7 +1073,11 @@ - if (_iNbItem != 0) - { - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix(obj, _piColPos); - if (status < 0) - { -@@ -1154,7 +1178,11 @@ - { - hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos]; - -- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef); -+ *_piItemDataset = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &poRef); - - if (*_piItemDataset == 0) - { ---- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp 2017-02-15 20:11:46.775525827 +0100 -@@ -648,7 +648,11 @@ - //import field - for (int j = 0; j < refcount; ++j) - { -- int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]); -+ int data = H5Rdereference(refs, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &vrefs[j]); - if (data < 0) - { - freeStringMatrix(dfield, fields.data()); ---- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2017-02-15 20:11:36.838833848 +0100 -@@ -735,7 +735,11 @@ - //import field - for (int j = 0; j < refcount; ++j) - { -- int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]); -+ int data = H5Rdereference(refs, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &vrefs[j]); - if (data < 0) - { - return false; diff --git a/scilab-hdf5-type.patch b/scilab-hdf5-type.patch deleted file mode 100644 index d2210b95ef0a..000000000000 --- a/scilab-hdf5-type.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/hdf5/src/c/h5_writeDataToFile.c 2017-02-15 19:49:05.972121123 +0100 -+++ modules/hdf5/src/c/h5_writeDataToFile.c.new 2017-02-15 19:42:50.787848227 +0100 -@@ -2166,7 +2166,7 @@ - return dset; - } - --hid_t writeDoubleComplexMatrix6(int parent, const char* name, int dims, int* pdims, double* real, double* img) -+int writeDoubleComplexMatrix6(int parent, const char* name, int dims, int* pdims, double* real, double* img) - { - hid_t space = 0; - hid_t dset = 0; diff --git a/scilab-jogl-2.3.2.patch b/scilab-jogl-2.3.2.patch index 822656ba342e..583e22a496b5 100644 --- a/scilab-jogl-2.3.2.patch +++ b/scilab-jogl-2.3.2.patch @@ -1,25 +1,57 @@ -commit db79126ed25fc254e83f8a96b164cb2dbf0d6204 -Author: Clément DAVID <clement.david@scilab-enterprises.com> -Date: Wed Dec 2 15:09:07 2015 +0100 +From 1364c083acb58a55fcf2c5ca8d244313dfe9bbcb Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Cl=C3=A9ment=20DAVID?= <clement.david@scilab-enterprises.com> +Date: Wed, 2 Dec 2015 15:09:07 +0100 +Subject: [PATCH] Update to JoGL 2.3.2 - Update to JoGL 2.3.2 - - Change-Id: Ic188bb392d1dd8441d1a4132004f77b63a3353df +Change-Id: Ic188bb392d1dd8441d1a4132004f77b63a3353df +--- + scilab/configure | 16 +++++++------- + scilab/configure.ac | 4 ++-- + .../src/java/org/scilab/modules/gui/SwingView.java | 8 +++---- + .../scilab/modules/gui/bridge/ScilabBridge.java | 2 +- + .../gui/bridge/canvas/SwingScilabCanvas.java | 4 ++-- + .../gui/bridge/canvas/SwingScilabCanvasImpl.java | 12 +++++------ + .../java/org/scilab/modules/gui/canvas/Canvas.java | 2 +- + .../scilab/modules/gui/canvas/ScilabCanvas.java | 2 +- + .../modules/gui/canvas/ScilabCanvasBridge.java | 2 +- + .../scilab/modules/gui/canvas/SimpleCanvas.java | 2 +- + .../scirenderer/scirenderer-libs.properties | 4 ++-- + .../implementation/jogl/JoGLCanvas.java | 22 ++++++++++---------- + .../implementation/jogl/JoGLCanvasFactory.java | 2 +- + .../implementation/jogl/JoGLCapacity.java | 2 +- + .../implementation/jogl/JoGLDrawingTools.java | 2 +- + .../implementation/jogl/JoGLParameters.java | 4 ++-- + .../jogl/buffers/JoGLBuffersManager.java | 2 +- + .../jogl/buffers/JoGLDataBuffer.java | 2 +- + .../jogl/buffers/JoGLElementsBuffer.java | 2 +- + .../jogl/buffers/JoGLIndicesBuffer.java | 2 +- + .../jogl/clipping/JoGLClippingManager.java | 2 +- + .../jogl/clipping/JoGLClippingPlane.java | 2 +- + .../jogl/drawer/JoGLShapeDrawer.java | 2 +- + .../implementation/jogl/lightning/JoGLLight.java | 2 +- + .../jogl/lightning/JoGLLightManager.java | 2 +- + .../jogl/picking/GLPickingManager.java | 2 +- + .../jogl/picking/JoGLPickingTools.java | 2 +- + .../implementation/jogl/renderer/JoGLRenderer.java | 2 +- + .../jogl/renderer/JoGLRendererManager.java | 2 +- + .../jogl/texture/JoGLTextureManager.java | 10 ++++----- + .../implementation/jogl/utils/GLShortCuts.java | 2 +- + 31 files changed, 64 insertions(+), 64 deletions(-) diff --git a/scilab/configure b/scilab/configure -index fd385a8..51e5ff2 100755 +index 192bb93..ef8699d 100755 --- a/scilab/configure +++ b/scilab/configure -@@ -15265,7 +15265,7 @@ EOF - +@@ -16245,7 +16245,7 @@ EOF CLASSPATH=$ac_java_classpath export CLASSPATH -- cmd="$JAVA conftestSharedChecker jogl2 javax.media.opengl.glu.GLUnurbs $jar_resolved " -+ cmd="$JAVA conftestSharedChecker jogl2 jogamp.opengl.x11.glx.GLX $jar_resolved " + echo "CLASSPATH="$CLASSPATH >&5 +- cmd="$JAVA conftestSharedChecker \"jogl2\" \"javax.media.opengl.glu.GLUnurbs\" \"$jar_resolved\" \"\" \"2.2\" \"\"" ++ cmd="$JAVA conftestSharedChecker \"jogl2\" \"jogamp.opengl.x11.glx.GLX\" \"$jar_resolved\" \"\" \"2.3\" \"\"" if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5); then - PACKAGE_JAR_FILE=$(tail -n 1 conftestSharedChecker.java.output); - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_JAR_FILE" >&5 -@@ -15277,10 +15277,10 @@ $as_echo "$PACKAGE_JAR_FILE" >&6; } + read PACKAGE_JAR_FILE PACKAGE_JAR_VERSION << EOF + $(tail -n 1 conftestSharedChecker.java.output) +@@ -16259,10 +16259,10 @@ $as_echo " $PACKAGE_JAR_FILE $PACKAGE_JAR_VERSION " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test "" = "yes"; then @@ -33,63 +65,16 @@ index fd385a8..51e5ff2 100755 fi fi if test -f conftestSharedChecker.java.output; then -@@ -15291,8 +15291,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (Specification-Version 2.2) of jogl2" >&5 --$as_echo_n "checking minimal version (Specification-Version 2.2) of jogl2... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (Specification-Version 2.3) of jogl2" >&5 -+$as_echo_n "checking minimal version (Specification-Version 2.3) of jogl2... " >&6; } - export JARFILE=$JOGL2; - if test "x" == "x"; then - -@@ -15305,7 +15305,7 @@ import java.util.jar.JarFile; - - public class conftest { - public static void main(String[] argv) { -- String minVersion="2.2"; -+ String minVersion="2.3"; - try { - String version = new JarFile(System.getenv("JARFILE")).getManifest().getMainAttributes().getValue("Specification-Version"); - System.out.println(version); -@@ -15358,7 +15358,7 @@ EOF - STDOUT=`cat conftest.java.output` - fi - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of jogl2. Expected at least 2.2. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of jogl2. Expected at least 2.3. Found $STDOUT" "$LINENO" 5 - fi - fi - if test -f conftest.java.output; then -@@ -15368,7 +15368,7 @@ EOF - echo "configure: failed program was:" >&5 - cat conftest.java >&5 - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of jogl2. Expected at least 2.2. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of jogl2. Expected at least 2.3. Found $STDOUT" "$LINENO" 5 - fi - - else -@@ -15382,7 +15382,7 @@ import java.util.jar.JarFile; - - public class conftest { - public static void main(String[] argv) { -- String minVersion="2.2"; -+ String minVersion="2.3"; - try { - String version = new JarFile(System.getenv("JARFILE")).getManifest().getMainAttributes().getValue("Specification-Version"); - System.out.println("Specification-Version" + ": " + version); -@@ -15752,7 +15752,7 @@ EOF - +@@ -16585,7 +16585,7 @@ EOF CLASSPATH=$ac_java_classpath export CLASSPATH -- cmd="$JAVA conftestSharedChecker gluegen2-rt jogamp.common.os.MachineDescriptionRuntime $jar_resolved " -+ cmd="$JAVA conftestSharedChecker gluegen2-rt com.jogamp.common.os.Platform $jar_resolved " + echo "CLASSPATH="$CLASSPATH >&5 +- cmd="$JAVA conftestSharedChecker \"gluegen2-rt\" \"jogamp.common.os.MachineDescriptionRuntime\" \"$jar_resolved\" \"\" \"\" \"\"" ++ cmd="$JAVA conftestSharedChecker \"gluegen2-rt\" \"com.jogamp.common.os.Platform\" \"$jar_resolved\" \"\" \"\" \"\"" if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5); then - PACKAGE_JAR_FILE=$(tail -n 1 conftestSharedChecker.java.output); - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_JAR_FILE" >&5 -@@ -15764,10 +15764,10 @@ $as_echo "$PACKAGE_JAR_FILE" >&6; } + read PACKAGE_JAR_FILE PACKAGE_JAR_VERSION << EOF + $(tail -n 1 conftestSharedChecker.java.output) +@@ -16599,10 +16599,10 @@ $as_echo " $PACKAGE_JAR_FILE $PACKAGE_JAR_VERSION " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test "" = "yes"; then @@ -104,24 +89,19 @@ index fd385a8..51e5ff2 100755 fi if test -f conftestSharedChecker.java.output; then diff --git a/scilab/configure.ac b/scilab/configure.ac -index 6404101..0a80deb 100644 +index 49d9281..eba2c3d 100644 --- a/scilab/configure.ac +++ b/scilab/configure.ac -@@ -940,11 +940,11 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no +@@ -951,7 +951,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no AC_SUBST(SKINLF) # JOGL 2 -- AC_JAVA_CHECK_JAR([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0]) -+ AC_JAVA_CHECK_JAR([jogl2],[jogamp.opengl.x11.glx.GLX],[Scilab 3D rendering - Version 2.3]) +- AC_JAVA_CHECK_JAR([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0], [], [], [2.2]) ++ AC_JAVA_CHECK_JAR([jogl2],[jogamp.opengl.x11.glx.GLX],[Scilab 3D rendering - Version 2.3], [], [], 2.3) JOGL2=$PACKAGE_JAR_FILE AC_SUBST(JOGL2) -- AC_JAVA_CHECK_VERSION_MANIFEST([jogl2],$JOGL2,[2.2],[Specification-Version]) -+ AC_JAVA_CHECK_VERSION_MANIFEST([jogl2],$JOGL2,[2.3],[Specification-Version]) - - if test "$MACOSX" = 1; then - echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X" -@@ -971,7 +971,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version +@@ -980,7 +980,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version fi # JoGL Native <=> Java connector @@ -131,10 +111,10 @@ index 6404101..0a80deb 100644 AC_SUBST(GLUEGEN2_RT) diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java -index 18593ca..892843a 100644 +index ea28e4c..50704af 100644 --- a/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java +++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java -@@ -87,10 +87,10 @@ import java.util.Map; +@@ -88,10 +88,10 @@ import java.util.Map; import java.util.Set; import java.util.UUID; @@ -178,7 +158,7 @@ index 477fa3f..9e969b4 100644 import org.scilab.forge.scirenderer.Canvas; diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java -index 76e976a..31bc493 100644 +index f27ea69..68b7613 100644 --- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java +++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java @@ -22,12 +22,12 @@ import java.awt.HeadlessException; @@ -267,16 +247,26 @@ index 4d1636d..0ea2197 100644 jlatexmath.jar = /usr/share/java/jlatexmath.jar jni.path = /usr/lib/jni diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java -index 011f09a..590ebf6 100644 +index a823629..8a776a0 100644 --- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java -@@ -19,16 +19,16 @@ import java.awt.image.BufferedImage; +@@ -1,7 +1,7 @@ + /* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2009-2011 - DIGITEO - Pierre Lando +- * Copyright (C) 2019 - Stéphane MOTTELET ++ * Copyright (C) 2019 - Stephane MOTTELET + * + * Copyright (C) 2012 - 2016 - Scilab Enterprises + * +@@ -20,17 +20,17 @@ import java.awt.image.BufferedImage; import java.lang.reflect.InvocationTargetException; import java.util.concurrent.Semaphore; -import javax.media.opengl.DebugGL2; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; +-import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLDrawableFactory; @@ -287,6 +277,7 @@ index 011f09a..590ebf6 100644 +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; @@ -324,10 +315,10 @@ index 4597be3..4ed3220 100644 /** * This class store current OpenGl context capacity. diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java -index 6a78491..ced3389 100644 +index 623cc1e..161f9ca 100644 --- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java +++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java -@@ -33,7 +33,7 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManagerImpl; +@@ -34,7 +34,7 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManagerImpl; import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener; import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -378,7 +369,7 @@ index 25d3a3e..b56c9d7 100644 /** diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java -index d5d53e3..2d96bec 100644 +index 5206566..5d01b87 100644 --- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java +++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java @@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.buffers; @@ -430,7 +421,7 @@ index cf3ed8b..a5a5770 100644 /** * @author Pierre Lando diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java -index 5008513..786fe41 100644 +index 2b1066c..c1549b4 100644 --- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java +++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java @@ -26,7 +26,7 @@ import org.scilab.forge.scirenderer.texture.Texture; @@ -469,7 +460,7 @@ index 0c8ae45..42d1e32 100644 /** * JoGL implementation of {@link LightManager} diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java -index 898d1ec..f74bcda 100644 +index 11c4b3f..6895a53 100644 --- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java +++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java @@ -14,7 +14,7 @@ @@ -521,7 +512,7 @@ index 4b4dd17..440750f 100644 import java.util.Set; import java.util.Stack; diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java -index ba3eb4f..14649cc 100644 +index 659f37f..25d3bc3 100644 --- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java +++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java @@ -32,11 +32,11 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManager; @@ -554,3 +545,6 @@ index 1d799e9..8a493fb 100644 /** * +-- +1.7.9.5 + diff --git a/scilab-lucene-6.patch b/scilab-lucene-6.patch deleted file mode 100644 index 7054a6876c91..000000000000 --- a/scilab-lucene-6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java 2017-02-15 19:48:09.065311738 +0100 -+++ modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java.new 2017-02-15 19:43:03.057878902 +0100 -@@ -52,7 +52,7 @@ - */ - public List<Document> search(String str) { - List<Document> found = new ArrayList<>(); -- try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter(), true)) { -+ try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter(), true, true)) { - IndexSearcher searcher = new IndexSearcher(reader); - - StandardQueryParser queryParserHelper = new StandardQueryParser(); diff --git a/scilab-num.patch b/scilab-num.patch new file mode 100644 index 000000000000..d02a2eb8c368 --- /dev/null +++ b/scilab-num.patch @@ -0,0 +1,17 @@ +--- modules/scicos/Makefile.in.orig 2018-02-22 20:48:50.382685100 +0100 ++++ modules/scicos/Makefile.in 2018-02-21 23:01:04.547956702 +0100 +@@ -794,12 +794,12 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OCAMLC = @OCAMLC@ ++OCAMLC = ocamlfind @OCAMLC@ -package num + OCAMLCFLAGS = @OCAMLCFLAGS@ + OCAMLDEP = @OCAMLDEP@ + OCAMLLEX = @OCAMLLEX@ +-OCAMLOPT = @OCAMLOPT@ ++OCAMLOPT = ocamlfind @OCAMLOPT@ -package num + OCAMLOPTFLAGS = @OCAMLOPTFLAGS@ + OCAMLYACC = @OCAMLYACC@ + OPENMPI_CC = @OPENMPI_CC@ + OPENMPI_CFLAGS = @OPENMPI_CFLAGS@ diff --git a/scilab-type.patch b/scilab-type.patch deleted file mode 100644 index 638269b590fd..000000000000 --- a/scilab-type.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/io/src/cpp/loadlib.cpp.orig 2017-04-25 12:11:39.191706462 +0200 -+++ modules/io/src/cpp/loadlib.cpp 2017-04-25 12:10:11.554798125 +0200 -@@ -38,7 +38,7 @@ - { - types::Library* lib = NULL; - -- wchar_t* pwstXML = pathconvertW(_wstXML.data(), FALSE, FALSE, AUTO_STYLE); -+ wchar_t* pwstXML = pathconvertW(_wstXML.data(), (BOOL) FALSE, (BOOL) FALSE, AUTO_STYLE); - wchar_t* pwstPathLib = expandPathVariableW(pwstXML); - - bool expanded = true; |