diff options
Diffstat (limited to 'sci-mathematics/scilab/files')
21 files changed, 0 insertions, 877 deletions
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch deleted file mode 100644 index a7e5c6d5f..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab ---- a/bin/scilab 2014-07-12 15:24:17.105686656 -0400 -+++ b/bin/scilab 2014-07-12 15:25:29.307725409 -0400 -@@ -647,17 +647,6 @@ - GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g) - export GTK_MODULES - --# libEGL may be partially supported by the closed-source NVIDIA driver. --# Until they release an EGL driver, we force the egl_glx driver. --# http://bugzilla.scilab.org/show_bug.cgi?id=12940 --if test -x /usr/bin/glxinfo; then -- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation") -- if test ! -z "$NVIDIA_GLX_VENDOR"; then -- EGL_DRIVER=egl_glx -- export EGL_DRIVER -- fi --fi -- - if test $SCIVERBOSE -ne 0; then - echo "SCI : $SCI" - echo "SCIBIN : $SCIBIN" diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch deleted file mode 100644 index ce0cebbf3..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch +++ /dev/null @@ -1,104 +0,0 @@ -Updates Scilab to build against (and require) Batik >=1.9, this has been -adapted from Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456 - ---- a/configure -+++ b/configure -@@ -16600,8 +16600,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used - fi - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5 --$as_echo_n "checking minimal version (1.7) of batik... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.9) of batik" >&5 -+$as_echo_n "checking minimal version (1.9) of batik... " >&6; } - saved_ac_java_classpath=$ac_java_classpath - export ac_java_classpath="$BATIK:$ac_java_classpath" - if test "x" == "x"; then -@@ -16614,7 +16614,7 @@ import org.apache.batik.Version; - - public class conftest { - public static void main(String[] argv) { -- String minVersion="1.7"; -+ String minVersion="1.9"; - - System.out.println(Version.getVersion()); - if (compare(minVersion, Version.getVersion()) > 0) { -@@ -16663,7 +16663,7 @@ EOF - STDOUT=`cat conftest.java.output` - fi - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected at least 1.9. Found $STDOUT" "$LINENO" 5 - fi - fi - if test -f conftest.java.output; then -@@ -16673,7 +16673,7 @@ EOF - echo "configure: failed program was:" >&5 - cat conftest.java >&5 - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected at least 1.9. Found $STDOUT" "$LINENO" 5 - fi - - else -@@ -16686,7 +16686,7 @@ import org.apache.batik.Version; - - public class conftest { - public static void main(String[] argv) { -- String minVersion="1.7"; -+ String minVersion="1.9"; - - System.out.println(Version.getVersion()); - if (compare(minVersion, Version.getVersion()) != 0) { -@@ -16735,7 +16735,7 @@ EOF - STDOUT=`cat conftest.java.output` - fi - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected exact version 1.9. Found $STDOUT" "$LINENO" 5 - fi - fi - if test -f conftest.java.output; then -@@ -16745,7 +16745,7 @@ EOF - echo "configure: failed program was:" >&5 - cat conftest.java >&5 - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected exact version 1.9. Found $STDOUT" "$LINENO" 5 - fi - - fi ---- a/configure.ac -+++ b/configure.ac -@@ -1038,7 +1038,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version - BATIK=$PACKAGE_JAR_FILE - fi - AC_SUBST(BATIK) -- AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.7],[Version.getVersion()]) -+ AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.9],[Version.getVersion()]) - - # Commons I/O library - AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library]) ---- a/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java -+++ b/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java -@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader; - import org.apache.batik.bridge.GVTBuilder; - import org.apache.batik.bridge.UserAgent; - import org.apache.batik.bridge.UserAgentAdapter; --import org.apache.batik.dom.svg.SAXSVGDocumentFactory; -+import org.apache.batik.anim.dom.SAXSVGDocumentFactory; - import org.apache.batik.gvt.GraphicsNode; - import org.apache.batik.util.XMLResourceDescriptor; - import org.scilab.forge.jlatexmath.ParseException; ---- ./modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java 2021-01-24 16:26:14.686473112 +0100 -+++ ./modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java.new 2021-01-24 16:34:25.486426923 +0100 -@@ -100,7 +100,7 @@ - * Dependencies version - */ - private static final List<String> MXGRAPH_VERSIONS = null; -- private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7", "1.8pre", "1.8"); -+ private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7", "1.8pre", "1.8", "1.9"); - - private static final String UNABLE_TO_LOAD_JGRAPHX = Messages.gettext("Unable to load the jgraphx library.\nExpecting version %s ; Getting version %s ."); - private static final String UNABLE_TO_LOAD_BATIK = Messages.gettext("Unable to load the Batik library. \nExpecting version %s ; Getting version %s ."); - diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch b/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch deleted file mode 100644 index 6e58dd540..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp 2015-03-31 11:31:43.000000000 +0200 -+++ ./modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp.new 2021-01-10 15:47:49.011858918 +0100 -@@ -54,7 +54,7 @@ - { - // FIXME #7266 workaround - // check category emptyness -- if (category == NULL || (lenCategory == 1 && *category == '\0')) -+ if (category == NULL || (lenCategory == 1 && **category == 0)) - { - Palette::loadPal(getScilabJavaVM(), name); - } diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch deleted file mode 100644 index da7b6e485..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp scilab/modules/api_scilab/src/cpp/api_double.cpp ---- a/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400 -+++ b/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400 -@@ -497,7 +497,7 @@ - /*--------------------------------------------------------------------------*/ - int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal) - { -- return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL); -+ return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0); - } - /*--------------------------------------------------------------------------*/ - int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg) diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch deleted file mode 100644 index a3f60bee7..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/m4/java.m4 2014-02-11 23:43:03.030430258 -0500 -+++ b/m4/java.m4 2014-02-11 23:43:54.008428766 -0500 -@@ -839,7 +839,7 @@ - for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do - - # TODO check the behaviour when spaces -- jars_resolved=`ls $jar 2>/dev/null` -+ jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null) - for jar_resolved in $jars_resolved; do # If several jars matches - if test -e "$jar_resolved"; then - export ac_java_classpath="$jar_resolved:$ac_java_classpath" diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch deleted file mode 100644 index 18bdaac1d..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Bryan Gardiner <bog@khumba.net> -Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=14009 -Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456 - -Updates Scilab to build against FOP >=2.0. This is not tested, as I'm not sure -of a test case, and it's awaiting upstream review. - ---- a/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java -+++ b/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java -@@ -43,10 +43,10 @@ public class FopConverter extends ContainerConverter { - String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase(); - - try { -- FopFactory fopFactory = FopFactory.newInstance(); -+ FopFactory fopFactory = -+ FopFactory.newInstance(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml")); - fopFactory.addElementMapping(new JLaTeXMathElementMapping()); - fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler()); -- fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml")); - - // Step 3: Construct fop with desired output format - OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName)); ---- a/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java -+++ b/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java -@@ -114,11 +114,11 @@ public class CodeExporter extends FOCodeConverter { - * @param format the page format - */ - public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) { -- FopFactory fopFactory = FopFactory.newInstance(); - OutputStream out = null; - - try { -- fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); -+ FopFactory fopFactory = -+ FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - userAgent.setProducer(CREATOR); - userAgent.setTitle(title); diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch deleted file mode 100644 index 31dcf52e7..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f49b185c678c07526ef59c1531d41575f9266bdc Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Cl=C3=A9ment=20DAVID?= <clement.david@esi-group.com> -Date: Mon, 26 Feb 2018 23:43:14 +0100 -Subject: [PATCH] Fortran: fix errors with gfortran 8 - -Change-Id: Ib890c6ea2dcba2f70d3c22dc86bbe38e4f22b061 ---- a/modules/differential_equations/src/fortran/ddaskr.f -+++ b/modules/differential_equations/src/fortran/ddaskr.f -@@ -1409,6 +1409,7 @@ C - DIMENSION RWORK(LRW),IWORK(LIW) - DIMENSION RTOL(*),ATOL(*) - DIMENSION RPAR(*),IPAR(*) -+ DIMENSION JROOT(NRT) - CHARACTER MSG*80 - EXTERNAL RES, JAC, PSOL, RT, DDASID, DDASIK, DNEDD, DNEDK - C -@@ -2530,7 +2531,8 @@ C Pointers into RWORK: - DOUBLE PRECISION TN, TOUT, Y, YP, PHI, PSI, R0, R1, RX, UROUND, - * RWORK, RPAR - DIMENSION Y(*), YP(*), PHI(NEQ,*), PSI(*), -- * R0(*), R1(*), RX(*), JROOT(*), RWORK(*), IWORK(*) -+ * R0(*), R1(*), RX(*), JROOT(NRT), RWORK(*), IWORK(*), -+ * RPAR(*), IPAR(*) - INTEGER I, JFLAG - DOUBLE PRECISION H - DOUBLE PRECISION HMINR, T1, TEMP1, TEMP2, X, ZERO ---- a/modules/differential_equations/src/fortran/ddasrt.f -+++ b/modules/differential_equations/src/fortran/ddasrt.f -@@ -870,6 +870,7 @@ C - DIMENSION RWORK(*),IWORK(*) - DIMENSION RTOL(*),ATOL(*) - DIMENSION RPAR(*),IPAR(*) -+ DIMENSION JROOT(NG) - CHARACTER MSG*80 - C - C SET POINTERS INTO IWORK -@@ -1594,7 +1595,8 @@ C - DOUBLE PRECISION TN, TOUT, Y, YP, PHI, PSI, G0, G1, GX, UROUND, - * RWORK, RPAR - DIMENSION Y(*), YP(*), PHI(NEQ,*), PSI(*), -- 1 G0(*), G1(*), GX(*), JROOT(*), RWORK(*), IWORK(*) -+ 1 G0(*), G1(*), GX(*), JROOT(NG), RWORK(*), IWORK(*), RPAR(*), -+ 1 IPAR(*) - INTEGER I, JFLAG - DOUBLE PRECISION H - DOUBLE PRECISION HMING, T1, TEMP1, TEMP2, X ---- a/modules/differential_equations/src/fortran/twodq.f -+++ b/modules/differential_equations/src/fortran/twodq.f -@@ -900,7 +900,7 @@ C - END - - subroutine tridv(node,node1,node2,coef,rank) -- double precision node(10),node1(10),node2(10),coef -+ double precision node(9),node1(9),node2(9),coef - integer rank - double precision s(3),coef1,temp - integer t(3) diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch deleted file mode 100644 index 46825cb29..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr scilab-5.5.2-orig/configure.ac scilab-5.5.2/configure.ac ---- a/configure.ac 2016-06-05 12:30:06.582735449 -0400 -+++ b/configure.ac 2016-06-05 12:31:29.706708157 -0400 -@@ -1024,7 +1024,7 @@ - AC_SUBST(FREEHEP_IO) - - # Freehep Util -- AC_JAVA_CHECK_PACKAGE([freehep-util],[org.freehep.util.StringUtilities],[Freehep Util]) -+ AC_JAVA_CHECK_PACKAGE([freehep-graphicsbase],[org.freehep.graphicsbase.util.UserProperties],[Freehep Util]) - FREEHEP_UTIL=$PACKAGE_JAR_FILE - AC_SUBST(FREEHEP_UTIL) - fi diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch deleted file mode 100644 index d75c31e9a..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:38:00.928934500 -0400 -+++ b/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:37:33.947567043 -0400 -@@ -157,7 +157,7 @@ - - static { - try { -- System.loadLibrary("gluegen2-rt"); -+ System.loadLibrary("gluegen-rt"); - } catch (Exception e) { - System.err.println(e); - } diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-hdf5-1.8.10.patch b/sci-mathematics/scilab/files/scilab-5.5.2-hdf5-1.8.10.patch deleted file mode 100644 index 07e497939..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-hdf5-1.8.10.patch +++ /dev/null @@ -1,278 +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) - { diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch deleted file mode 100644 index ca17e52a6..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/etc/jvm_options.xml 2014-02-12 00:05:34.323390688 -0500 -+++ b/etc/jvm_options.xml 2014-02-12 00:05:53.977390112 -0500 -@@ -22,7 +22,7 @@ - <!-- ENABLE Just In Time java compiler --> - <option value="-Djava.compiler=JIT"/> - <!-- Set Java Heap space to 256mb --> -- <option value="-Xmx256m"/> -+ <option value="-Xmx512m"/> - <!-- Avoid jvm to handle sigint (& other signals) --> - <option value="-Xrs"/> - diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-libxml-icu64.patch b/sci-mathematics/scilab/files/scilab-5.5.2-libxml-icu64.patch deleted file mode 100644 index 1dc4fd079..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-libxml-icu64.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ./modules/xml/src/cpp/XMLDocument.hxx 2015-03-31 11:31:45.000000000 +0200 -+++ ./modules/xml/src/cpp/XMLDocument.hxx.new 2021-01-10 15:18:51.172022465 +0100 -@@ -20,13 +20,10 @@ - - #include "dynlib_xml_scilab.h" - --extern "C" --{ - #include "xml.h" - #ifndef XML_XPATH_CHECKNS - #define XML_XPATH_CHECKNS - #endif --} - - #include "XMLObject.hxx" - diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch b/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch deleted file mode 100644 index 25b281820..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN scilab-5.5.1-orig/Makefile.am scilab-5.5.1/Makefile.am ---- a/Makefile.am 2014-10-09 18:22:21.994610695 -0400 -+++ b/Makefile.am 2014-10-09 18:24:28.208333575 -0400 -@@ -74,6 +74,7 @@ - if NEED_JAVA - scilab_bin_LDADD += \ - $(top_builddir)/modules/console/libsciconsole.la \ -+ $(top_builddir)/modules/console/libsciconsole-minimal.la \ - $(top_builddir)/modules/jvm/libscijvm.la \ - $(top_builddir)/modules/commons/libscicommons.la - else diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-ocaml-4.0.4.patch b/sci-mathematics/scilab/files/scilab-5.5.2-ocaml-4.0.4.patch deleted file mode 100644 index dc8941ff0..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-ocaml-4.0.4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./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/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch deleted file mode 100644 index 4d90f30c7..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch +++ /dev/null @@ -1,91 +0,0 @@ -From: Bryan Gardiner <bog@khumba.net> -Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=13724 -Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456 - -Updates Scilab 5.5.2 to build against xmlgraphics-common >=2.0. This is not -tested, as I'm not sure of a test case, and a similar patch (where the -super.processShape calls are passed cached=true) is already awaiting upstream -review. - ---- a/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java -+++ b/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java -@@ -857,7 +857,7 @@ public class Export { - } - - @Override -- public int processShape(Shape s) throws IOException { -+ public int processShape(Shape s, boolean cached) throws IOException { - if (s instanceof Ellipse2D.Double) { - Ellipse2D.Double ell = (Ellipse2D.Double) s; - if (ell.height == ell.width) { -@@ -880,10 +880,10 @@ public class Export { - buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - it.next(); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - for (; !it.isDone(); it.next()) { -@@ -891,7 +891,7 @@ public class Export { - if (type == PathIterator.SEG_LINETO) { - buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } - buffer.append("] DP"); -@@ -899,7 +899,7 @@ public class Export { - return PathIterator.WIND_NON_ZERO; - } - -- return super.processShape(s); -+ return super.processShape(s, cached); - } - }; - g2d.setGraphicContext(new GraphicContext()); -@@ -1029,7 +1029,7 @@ public class Export { - } - - @Override -- public int processShape(Shape s) throws IOException { -+ public int processShape(Shape s, boolean cached) throws IOException { - if (s instanceof Ellipse2D.Double) { - Ellipse2D.Double ell = (Ellipse2D.Double) s; - if (ell.height == ell.width) { -@@ -1052,10 +1052,10 @@ public class Export { - buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - it.next(); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - for (; !it.isDone(); it.next()) { -@@ -1063,7 +1063,7 @@ public class Export { - if (type == PathIterator.SEG_LINETO) { - buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } - buffer.append("] DP"); -@@ -1071,7 +1071,7 @@ public class Export { - return PathIterator.WIND_NON_ZERO; - } - -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - }; diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch b/sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch deleted file mode 100644 index 940440563..000000000 --- a/sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/bin/scilab b/bin/scilab -index 475457d6..d2b98cc0 100755 ---- a/bin/scilab -+++ b/bin/scilab -@@ -720,17 +720,6 @@ fi - GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g) - export GTK_MODULES - --# libEGL may be partially supported by the closed-source NVIDIA driver. --# Until they release an EGL driver, we force the egl_glx driver. --# http://bugzilla.scilab.org/show_bug.cgi?id=12940 --if test $SCILAB_MODE != "nwni" -a -x /usr/bin/glxinfo; then -- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation") -- if test ! -z "$NVIDIA_GLX_VENDOR"; then -- EGL_DRIVER=egl_glx -- export EGL_DRIVER -- fi --fi -- - if test $SCIVERBOSE -ne 0; then - echo "SCI : $SCI" - echo "SCIBIN : $SCIBIN" diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-freehep.patch b/sci-mathematics/scilab/files/scilab-6.1.0-freehep.patch deleted file mode 100644 index 6f9587780..000000000 --- a/sci-mathematics/scilab/files/scilab-6.1.0-freehep.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index f6018580..d783ca96 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1076,7 +1076,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version - AC_SUBST(FREEHEP_IO) - - # Freehep Util -- AC_JAVA_CHECK_JAR([freehep-util],[org.freehep.util.StringUtilities],[Freehep Util]) -+ AC_JAVA_CHECK_PACKAGE([freehep-graphicsbase],[org.freehep.graphicsbase.util.UserProperties],[Freehep Util]) - FREEHEP_UTIL=$PACKAGE_JAR_FILE - AC_SUBST(FREEHEP_UTIL) - fi diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch b/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch deleted file mode 100644 index 55d2e744a..000000000 --- a/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- 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/sci-mathematics/scilab/files/scilab-6.1.0-nogui.patch b/sci-mathematics/scilab/files/scilab-6.1.0-nogui.patch deleted file mode 100644 index f83fa31d0..000000000 --- a/sci-mathematics/scilab/files/scilab-6.1.0-nogui.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.in 2014-01-09 22:29:06.534469383 -0500 -+++ b/Makefile.in 2014-01-09 22:29:40.368471544 -0500 -@@ -2247,8 +2247,8 @@ - @BUILD_HELP_TRUE@ done; \ - @BUILD_HELP_TRUE@ fi - # Also install scirenderer.jar --@EXTERNAL_SCIRENDERER_FALSE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER) --@EXTERNAL_SCIRENDERER_FALSE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/ -+@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER) -+@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/ - - .PHONY: macros localization doc - diff --git a/sci-mathematics/scilab/files/scilab.bash_completion b/sci-mathematics/scilab/files/scilab.bash_completion deleted file mode 100644 index c289e8632..000000000 --- a/sci-mathematics/scilab/files/scilab.bash_completion +++ /dev/null @@ -1,54 +0,0 @@ -# Scilab completion -# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -# Copyright (C) DIGITEO - 2010 - Sylvestre Ledru -# This file must be used under the terms of the CeCILL. -# This source file is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - -_scilab() -{ - local cur prev options - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - prev=${COMP_WORDS[COMP_CWORD-1]} - - # List all options. Note that - options='-ns -nb -nw -nwni -nogui -debug -debug-kdbg -d -display -profiling -profiling-visu -l -mem -version -e -f -nouserstartup -args -mem -h --help' - - # Loop on the arguments to manage conflicting options - for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do - #exclude some mutually exclusive options - [[ ${COMP_WORDS[i]} == '-nwni' ]] && options=${options/-nw} - [[ ${COMP_WORDS[i]} == '-nw' ]] && options=${options/-nwni} - [[ ${COMP_WORDS[i]} == '-e' ]] && options=${options/-f} - done - - case "$1" in - *scilab-cli*) - # Option -nw is not available - options=${options/-nw} - ;; - esac - - case $prev in - -f) - _filedir '@(sci|sce|SCI|SCE|tst|TST)' - return 0 - ;; - -e|-l|-d|-display|-mem) - cur=${cur#[\"\']} - eqext='=' - ;; - - *) - COMPREPLY=( $( compgen -W "$options" | grep "^$cur" ) ) - ;; - esac - - return 0 -} -complete -F _scilab $filenames scilab scilab-cli scilab-adv-cli - - diff --git a/sci-mathematics/scilab/files/scilab.xml b/sci-mathematics/scilab/files/scilab.xml deleted file mode 100644 index 8594e7bdc..000000000 --- a/sci-mathematics/scilab/files/scilab.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="text/x-sci"> - <comment>Scilab Function</comment> - <sub-class-of type="text/plain"/> - <glob pattern="*.sci"/> - </mime-type> - <mime-type type="text/x-sce"> - <comment>Scilab Script</comment> - <sub-class-of type="text/plain"/> - <glob pattern="*.sce"/> - </mime-type> -</mime-info> |