sci-mathematics/scilab forgot to bump the patches

7 files changed, 14 insertions, 387 deletions

diff --git a/sci-mathematics/scilab/files/scilab-5.4.0-builddocs.patch b/sci-mathematics/scilab/files/scilab-5.4.0-builddocs.patch
deleted file mode 100644
index 981bc9ba1..000000000
--- a/sci-mathematics/scilab/files/scilab-5.4.0-builddocs.patch
+++ /dev/null
@@ -1,353 +0,0 @@
-diff --git a/scilab/modules/core/src/c/callDynamicGateway.c b/scilab/modules/core/src/c/callDynamicGateway.c
-index 91439a9..7485f4c 100644
---- a/scilab/modules/core/src/c/callDynamicGateway.c
-+++ b/scilab/modules/core/src/c/callDynamicGateway.c
-@@ -3,11 +3,11 @@
-  * Copyright (C) 2008 - INRIA - Allan CORNET
-  * Copyright (C) 2008 - INRIA - Sylvestre LEDRU
-  * Copyright (C) 2010 - DIGITEO - Allan CORNET
-- * 
-+ *
-  * 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    
-+ * are also available at
-  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-  *
-  */
-@@ -26,19 +26,18 @@
- #include "charEncoding.h"
- /*--------------------------------------------------------------------------*/
- dynamic_gateway_error_code callDynamicGateway(char *moduleName,
--                                              char *dynLibName,
--                                              char *gw_name,
--                                              DynLibHandle *hlib,
--                                              PROC_GATEWAY *ptrGateway)
-+        char *dynLibName,
-+        char *gw_name,
-+        DynLibHandle *hlib,
-+        PROC_GATEWAY *ptrGateway)
- {
-     if (*hlib == NULL)
-     {
--        /* Under Linux/Unix, load thanks to dlopen */
- #ifdef _MSC_VER
-         wchar_t *wcdynLibName = to_wide_string(dynLibName);
-         if (wcdynLibName)
-         {
--            *hlib = LoadDynLibraryW(wcdynLibName); 
-+            *hlib = LoadDynLibraryW(wcdynLibName);
-             FREE(wcdynLibName);
-             wcdynLibName = NULL;
-         }
-@@ -47,52 +46,73 @@ dynamic_gateway_error_code callDynamicGateway(char *moduleName,
-             return DYN_GW_LOAD_LIBRARY_ERROR;
-         }
- #else
--        *hlib = LoadDynLibrary(dynLibName); 
- 
--        if (*hlib == NULL) 
--        {
--            char *previousError = GetLastDynLibError();
--
--            /* Haven't been able to find the lib with dlopen... 
--            * This can happen for two reasons:
--            * - the lib must be dynamically linked
--            * - Some silly issues under Suse (see bug #2875)
--            * Note that we are handling only the "source tree build"
--            * because libraries are split (they are in the same directory 
--            * in the binary)
--            */
--            char *SciPath = getSCIpath();
-+        /* First step, we are considering that we are in the source tree.
-+         * Therefor, the lib should be in modules/xxx/.libs/
-+         *
-+         * Otherwise, dlopen will search in various places (for example, the install specified
-+         * by --prefix).
-+         * This leads to serious and unexpected bugs like #8883
-+         * The original bug report for this issue was the bug #2875
-+         */
-+        char *SciPath = getSCIpath();
- #define PATHTOMODULE "/modules/"
- #ifndef LT_OBJDIR
- #define LT_OBJDIR ".libs/"
- #endif
- 
--            /* Build the full path to the library */
--            char *pathToLib=(char*) MALLOC((strlen(SciPath)+strlen(PATHTOMODULE)+strlen(moduleName)+strlen("/")+strlen(LT_OBJDIR)+strlen(dynLibName)+1)*sizeof(char));
--            sprintf(pathToLib,"%s%s%s/%s%s",SciPath,PATHTOMODULE,moduleName,LT_OBJDIR,dynLibName);
-+        /* Build the full path to the library */
-+        char *pathToLib = (char*) MALLOC((strlen(SciPath) + strlen(PATHTOMODULE) + strlen(moduleName) + strlen("/") + strlen(LT_OBJDIR) + strlen(dynLibName) + 1) * sizeof(char));
-+        sprintf(pathToLib, "%s%s%s/%s%s", SciPath, PATHTOMODULE, moduleName, LT_OBJDIR, dynLibName);
- 
--            *hlib = LoadDynLibrary(pathToLib);
-+        /* Load the library with the Scilab source-tree paths */
-+        *hlib = LoadDynLibrary(pathToLib);
-+
-+        if (*hlib == NULL) /* Load of the hardcoded path to the lib failed */
-+        {
- 
--            if (*hlib == NULL) 
-+            /* Under Linux/Unix, load thanks to dlopen on the system.
-+             * In the binary, the LD_LIBRARY_PATH is declared in the startup script (ie bin/scilab*)
-+             * Note that it is not possible to update the LD_LIBRARY_PATH at run time.
-+             */
-+            *hlib = LoadDynLibrary(dynLibName);
-+            if (*hlib == NULL)
-             {
-+                char *previousError = GetLastDynLibError();
-                 if (previousError != NULL)
-                 {
--                    sciprint("A previous error has been detected while loading %s: %s\n",dynLibName, previousError);
-+                    sciprint("A previous error has been detected while loading %s: %s\n", dynLibName, previousError);
-+                }
-+                if (SciPath)
-+                {
-+                    FREE(SciPath);
-+                    SciPath = NULL;
-+                }
-+                if (pathToLib)
-+                {
-+                    FREE(pathToLib);
-+                    pathToLib = NULL;
-                 }
--                if (SciPath) {FREE(SciPath); SciPath = NULL;}
--                if (pathToLib) {FREE(pathToLib); pathToLib = NULL;}
-                 return DYN_GW_LOAD_LIBRARY_ERROR;
-             }
--            if (SciPath) {FREE(SciPath); SciPath = NULL;}
--            if (pathToLib) {FREE(pathToLib); pathToLib = NULL;}
-+        }
-+        if (SciPath)
-+        {
-+            FREE(SciPath);
-+            SciPath = NULL;
-+        }
-+        if (pathToLib)
-+        {
-+            FREE(pathToLib);
-+            pathToLib = NULL;
-         }
- #endif
-     }
- 
-     if (*ptrGateway == NULL)
-     {
--        *ptrGateway = (PROC_GATEWAY) GetDynLibFuncPtr(*hlib,gw_name);
--        if (*ptrGateway == NULL) 
-+        *ptrGateway = (PROC_GATEWAY) GetDynLibFuncPtr(*hlib, gw_name);
-+        if (*ptrGateway == NULL)
-         {
-             return DYN_GW_PTR_FUNCTION_ERROR ;
-         }
-@@ -110,49 +130,50 @@ dynamic_gateway_error_code callDynamicGateway(char *moduleName,
- char *buildModuleDynLibraryName(char *modulename, dynlib_name_format iType)
- {
-     char *dynlibname = NULL;
--    int lenName = (int)(strlen(modulename)+strlen(SHARED_LIB_EXT));
-+    int lenName = (int)(strlen(modulename) + strlen(SHARED_LIB_EXT));
-     switch (iType)
-     {
--    case DYNLIB_NAME_FORMAT_AUTO: default:
-+        case DYNLIB_NAME_FORMAT_AUTO:
-+        default:
- #ifdef _MSC_VER
--        lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_1);
-+            lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_1);
- #else
--        lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_3);
-+            lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_3);
- #endif
--        dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
--        if (dynlibname)
--        {
-+            dynlibname = (char*)MALLOC(sizeof(char) * (lenName + 1));
-+            if (dynlibname)
-+            {
- #ifdef _MSC_VER
--            sprintf(dynlibname,FORMATGATEWAYLIBNAME_1,modulename,SHARED_LIB_EXT);
-+                sprintf(dynlibname, FORMATGATEWAYLIBNAME_1, modulename, SHARED_LIB_EXT);
- #else
--            sprintf(dynlibname,FORMATGATEWAYLIBNAME_3,modulename,SHARED_LIB_EXT);
-+                sprintf(dynlibname, FORMATGATEWAYLIBNAME_3, modulename, SHARED_LIB_EXT);
- #endif
--        }
--        break;
--    case DYNLIB_NAME_FORMAT_1:
--        lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_1);
--        dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
--        if (dynlibname)
--        {
--            sprintf(dynlibname,FORMATGATEWAYLIBNAME_1,modulename,SHARED_LIB_EXT);
--        }
--        break;
--    case DYNLIB_NAME_FORMAT_2:
--        lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_2);
--        dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
--        if (dynlibname)
--        {
--            sprintf(dynlibname,FORMATGATEWAYLIBNAME_2,modulename,SHARED_LIB_EXT);
--        }
--        break;
--    case DYNLIB_NAME_FORMAT_3:
--        lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_3);
--        dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
--        if (dynlibname)
--        {
--            sprintf(dynlibname,FORMATGATEWAYLIBNAME_3,modulename,SHARED_LIB_EXT);
--        }
--        break;
-+            }
-+            break;
-+        case DYNLIB_NAME_FORMAT_1:
-+            lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_1);
-+            dynlibname = (char*)MALLOC(sizeof(char) * (lenName + 1));
-+            if (dynlibname)
-+            {
-+                sprintf(dynlibname, FORMATGATEWAYLIBNAME_1, modulename, SHARED_LIB_EXT);
-+            }
-+            break;
-+        case DYNLIB_NAME_FORMAT_2:
-+            lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_2);
-+            dynlibname = (char*)MALLOC(sizeof(char) * (lenName + 1));
-+            if (dynlibname)
-+            {
-+                sprintf(dynlibname, FORMATGATEWAYLIBNAME_2, modulename, SHARED_LIB_EXT);
-+            }
-+            break;
-+        case DYNLIB_NAME_FORMAT_3:
-+            lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_3);
-+            dynlibname = (char*)MALLOC(sizeof(char) * (lenName + 1));
-+            if (dynlibname)
-+            {
-+                sprintf(dynlibname, FORMATGATEWAYLIBNAME_3, modulename, SHARED_LIB_EXT);
-+            }
-+            break;
-     }
-     return dynlibname;
- }
-@@ -160,36 +181,36 @@ char *buildModuleDynLibraryName(char *modulename, dynlib_name_format iType)
- char *buildGatewayName(char *modulename)
- {
-     /* example gw_scicos */
--#define FORMATGATEWAYNAME "gw_%s" 
-+#define FORMATGATEWAYNAME "gw_%s"
- 
-     char *gatewayname = NULL;
--    int lenName = (int)(strlen(modulename)+strlen(FORMATGATEWAYNAME));
--    gatewayname = (char*)MALLOC(sizeof(char)*(lenName+1));
-+    int lenName = (int)(strlen(modulename) + strlen(FORMATGATEWAYNAME));
-+    gatewayname = (char*)MALLOC(sizeof(char) * (lenName + 1));
- 
-     if (gatewayname)
-     {
--        sprintf(gatewayname,FORMATGATEWAYNAME,modulename);
-+        sprintf(gatewayname, FORMATGATEWAYNAME, modulename);
-     }
- 
-     return gatewayname;
- }
- /*--------------------------------------------------------------------------*/
--void displayErrorGateway(dynamic_gateway_error_code err,char *libraryname,char *functionname)
-+void displayErrorGateway(dynamic_gateway_error_code err, char *libraryname, char *functionname)
- {
-     switch (err)
-     {
--    case DYN_GW_NO_ERROR :
--        /* NO ERROR */
--        break;
--    case DYN_GW_LOAD_LIBRARY_ERROR :
--        Scierror(999,_("Impossible to load %s library: %s\n"),libraryname,GetLastDynLibError());
--        break;
--    case DYN_GW_PTR_FUNCTION_ERROR :
--        Scierror(999,_("Impossible to load %s function in %s library: %s\n"),functionname,libraryname, GetLastDynLibError());
--        break;
--    case DYN_GW_CALL_FUNCTION_ERROR :
--        Scierror(999,_("Impossible to call %s in %s library: %s\n"),functionname,libraryname,GetLastDynLibError());
--        break;
-+        case DYN_GW_NO_ERROR :
-+            /* NO ERROR */
-+            break;
-+        case DYN_GW_LOAD_LIBRARY_ERROR :
-+            Scierror(999, _("Impossible to load %s library: %s\n"), libraryname, GetLastDynLibError());
-+            break;
-+        case DYN_GW_PTR_FUNCTION_ERROR :
-+            Scierror(999, _("Impossible to load %s function in %s library: %s\n"), functionname, libraryname, GetLastDynLibError());
-+            break;
-+        case DYN_GW_CALL_FUNCTION_ERROR :
-+            Scierror(999, _("Impossible to call %s in %s library: %s\n"), functionname, libraryname, GetLastDynLibError());
-+            break;
-     }
- }
- /*--------------------------------------------------------------------------*/
-diff --git a/scilab/modules/core/src/c/gw_dynamic_generic.c b/scilab/modules/core/src/c/gw_dynamic_generic.c
-index e146235..09eb88d 100644
---- a/scilab/modules/core/src/c/gw_dynamic_generic.c
-+++ b/scilab/modules/core/src/c/gw_dynamic_generic.c
-@@ -1,11 +1,11 @@
- /*
-  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-  * Copyright (C) 2008 - INRIA - Allan CORNET
-- * 
-+ *
-  * 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    
-+ * are also available at
-  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-  *
-  */
-@@ -15,28 +15,28 @@
- #include "gw_dynamic_generic.h"
- /*--------------------------------------------------------------------------*/
- int gw_dynamic_generic(char *moduleName,
--					   char **dynlibName,
--					   char **gatewayName,
--					   DynLibHandle *hModuleLib,
--					   PROC_GATEWAY *ptrGatewayFunction)
-+                       char **dynlibName,
-+                       char **gatewayName,
-+                       DynLibHandle *hModuleLib,
-+                       PROC_GATEWAY *ptrGatewayFunction)
- {
--	dynamic_gateway_error_code err;
--	if (*dynlibName == NULL)
--	{
--		*dynlibName = buildModuleDynLibraryName(moduleName, DYNLIB_NAME_FORMAT_AUTO);
--	}
-+    dynamic_gateway_error_code err;
-+    if (*dynlibName == NULL)
-+    {
-+        *dynlibName = buildModuleDynLibraryName(moduleName, DYNLIB_NAME_FORMAT_AUTO);
-+    }
-+
-+    if (*gatewayName == NULL)
-+    {
-+        *gatewayName = buildGatewayName(moduleName);
-+    }
- 
--	if (*gatewayName == NULL)
--	{
--		*gatewayName = buildGatewayName(moduleName);
--	}
-+    err = callDynamicGateway(moduleName, *dynlibName,
-+                             *gatewayName,
-+                             hModuleLib,
-+                             ptrGatewayFunction);
-+    displayErrorGateway(err, *dynlibName, *gatewayName);
- 
--	err = callDynamicGateway(moduleName,*dynlibName,
--							*gatewayName,
--							hModuleLib,
--							ptrGatewayFunction);
--	displayErrorGateway(err,*dynlibName,*gatewayName);
--	
--	return 0;
-+    return 0;
- }
- /*--------------------------------------------------------------------------*/
--- 
-1.7.9.5
-
diff --git a/sci-mathematics/scilab/files/scilab-5.4.0-fortran-link.patch b/sci-mathematics/scilab/files/scilab-5.4.0-fortran-link.patch
deleted file mode 100644
index 53277783c..000000000
--- a/sci-mathematics/scilab/files/scilab-5.4.0-fortran-link.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN scilab-orig/configure.ac scilab/configure.ac
---- scilab-orig/configure.ac	2012-06-14 22:30:33.438115959 -0400
-+++ scilab/configure.ac	2012-06-14 22:37:57.229102963 -0400
-@@ -200,16 +200,14 @@
-    if test -z "$F77"; then
-      AC_MSG_ERROR([You asked me to use gfortran but i haven't been able to find it])
-     fi
--fi
- 
--if test "$with_intelcompilers" = yes; then
-+elif test "$with_intelcompilers" = yes; then
-    AC_PROG_F77(ifc ifort)
-    if test -z "$F77"; then
-      AC_MSG_ERROR([You asked me to use ifc (intel fortran compiler) but i haven't been able to find it])
-     fi
--fi
- 
--if test -z "$F77"; then
-+elif test -z "$F77"; then
- ## No Fortran compiler specified... Prefer gfortran and intel compilers
-    AC_PROG_F77([gfortran ifc ifort])
-    if test -z "$F77"; then
diff --git a/sci-mathematics/scilab/files/scilab-5.4.0-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.4.0-java-heap.patch
deleted file mode 100644
index 66aadc0a7..000000000
--- a/sci-mathematics/scilab/files/scilab-5.4.0-java-heap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN scilab-orig/etc/jvm_options.xml scilab/etc/jvm_options.xml
---- scilab-orig/etc/jvm_options.xml	2012-09-26 23:04:51.301102957 -0400
-+++ scilab/etc/jvm_options.xml	2012-09-26 23:07:24.822118228 -0400
-@@ -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"/>
- 
-     <!-- Set Java space for direct buffer allocation -->
- <!--
diff --git a/sci-mathematics/scilab/files/scilab-5.4.0-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.4.1-fix-random-runtime-failure.patch
index 92ac45339..92ac45339 100644
--- a/sci-mathematics/scilab/files/scilab-5.4.0-fix-random-runtime-failure.patch
+++ b/sci-mathematics/scilab/files/scilab-5.4.1-fix-random-runtime-failure.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.4.0-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.4.1-followlinks.patch
index 118df3b1a..118df3b1a 100644
--- a/sci-mathematics/scilab/files/scilab-5.4.0-followlinks.patch
+++ b/sci-mathematics/scilab/files/scilab-5.4.1-followlinks.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.4.0-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.4.1-gluegen.patch
index 64717a75a..64717a75a 100644
--- a/sci-mathematics/scilab/files/scilab-5.4.0-gluegen.patch
+++ b/sci-mathematics/scilab/files/scilab-5.4.1-gluegen.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.4.1-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.4.1-java-heap.patch
new file mode 100644
index 000000000..ae9ec1a62
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.4.1-java-heap.patch
@@ -0,0 +1,14 @@
+diff -urN scilab-5.4.1-orig/etc/jvm_options.xml scilab-5.4.1/etc/jvm_options.xml
+--- scilab-5.4.1-orig/etc/jvm_options.xml	2013-04-09 04:48:25.468385699 -0400
++++ scilab-5.4.1/etc/jvm_options.xml	2013-04-09 04:49:17.608390887 -0400
+@@ -21,8 +21,8 @@
+     <option value="-Djava.util.logging.config.file=$SCILAB/etc/logging.properties"/>
+     <!-- ENABLE Just In Time java compiler -->
+     <option value="-Djava.compiler=JIT"/>
+-    <!-- Set Java Heap space to 256mb -->
+-    <option value="-Xmx256m"/>
++    <!-- Set Java Heap space to 512mb -->
++    <option value="-Xmx512m"/>
+ 
+     <!-- Set Java space for direct buffer allocation -->
+ <!--