[sci-mathematics/scilab] 5.3.3 version bump

13 files changed, 75 insertions, 226 deletions

diff --git a/sci-mathematics/scilab/files/addchapter.diff b/sci-mathematics/scilab/files/addchapter.diff
deleted file mode 100644
index b2d71acd9..000000000
--- a/sci-mathematics/scilab/files/addchapter.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur scilab-5.1.1.orig/modules/helptools/macros/add_module_help_chapter.sci scilab-5.1.1/modules/helptools/macros/add_module_help_chapter.sci
---- scilab-5.1.1.orig/modules/helptools/macros/add_module_help_chapter.sci	2009-04-14 09:30:56.000000000 +0200
-+++ scilab-5.1.1/modules/helptools/macros/add_module_help_chapter.sci	2009-04-14 18:07:23.000000000 +0200
-@@ -19,10 +19,8 @@
- 		path_addchapter = SCI+"/modules/"+modulename+"/help/"+getdefaultlanguage()+"/addchapter.sce";
- 	end
- 	
--	//try
-+	if ( fileinfo(path_addchapter) <> [] ) then
- 		exec(path_addchapter);
--	//catch
--	//    warning(gettext("Incorrect module path ")+path_addchapter);
--	//end
-+	end
- 	
- endfunction
\ No newline at end of file
diff --git a/sci-mathematics/scilab/files/adddemo.diff b/sci-mathematics/scilab/files/adddemo.diff
deleted file mode 100644
index e8e7f1c55..000000000
--- a/sci-mathematics/scilab/files/adddemo.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur scilab-5.1.1.orig/modules/core/macros/add_demo.sci scilab-5.1.1/modules/core/macros/add_demo.sci
---- scilab-5.1.1.orig/modules/core/macros/add_demo.sci	2009-04-14 09:30:44.000000000 +0200
-+++ scilab-5.1.1/modules/core/macros/add_demo.sci	2009-04-14 17:54:41.000000000 +0200
-@@ -17,9 +17,7 @@
-   
-   path=pathconvert(path,%f,%t);
-   
--  if fileinfo(path)==[] then
--    error(msprintf(gettext("%s: The file %s does not exist.\n"),"add_demo",path));
--  end
-+  if fileinfo(path) <> [] then
-   
-   if isdir(path) then 
-     error(msprintf(gettext("%s: Wrong input argument #%d: Path to a scilab script file expected.\n"),"add_demo",2));
-@@ -33,7 +31,7 @@
-     k1=find(demolist(k,2)==path)
-     if k1==[] then demolist=[demolist;demotitle+" ("+string(size(k,"*"))+")",path],end
-   end
--  
-+  end
-   clear demolist
-   
- endfunction
\ No newline at end of file
diff --git a/sci-mathematics/scilab/files/buildDocPT_BR.diff b/sci-mathematics/scilab/files/buildDocPT_BR.diff
deleted file mode 100644
index 411e9e54a..000000000
--- a/sci-mathematics/scilab/files/buildDocPT_BR.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: scilab-5.2.0/Makefile.am
-===================================================================
---- scilab-5.2.0.orig/Makefile.am	2010-02-03 16:08:18.000000000 +0100
-+++ scilab-5.2.0/Makefile.am	2010-02-03 16:09:33.000000000 +0100
-@@ -151,6 +151,9 @@
- 		echo "-- Building documentation (French) --"; \
- 		echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'fr_FR');exit;\""; \
- 		SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'fr_FR');exit;"; \
-+		echo "-- Building documentation (portugues do Brasil) --"; \
-+		echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'pt_BR');exit;\""; \
-+		SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'pt_BR');exit;"; \
- 	else \
- 		echo "Cannot find Scilab-adv-cli binary"; \
- 	fi
diff --git a/sci-mathematics/scilab/files/disablebuildhelp.patch b/sci-mathematics/scilab/files/disablebuildhelp.patch
new file mode 100644
index 000000000..4fbabd917
--- /dev/null
+++ b/sci-mathematics/scilab/files/disablebuildhelp.patch
@@ -0,0 +1,39 @@
+From f4c20c8fb5d9540e4972ae75dbd2a34aa2a3622b Mon Sep 17 00:00:00 2001
+From: Sylvestre Ledru <sylvestre.ledru@scilab.org>
+Date: Sat, 1 Oct 2011 00:15:59 +0200
+Subject: [PATCH] * bug 9883 fixed - Build with --disable-build-help was failing.
+
+Change-Id: I93da6b7312effb261fd95d90613f87e9988b35f9
+---
+ scilab/modules/scinotes/Makefile.am |    2 ++
+ scilab/modules/scinotes/Makefile.in |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/scilab/modules/scinotes/Makefile.am b/scilab/modules/scinotes/Makefile.am
+index 8ffad2d..ad5dbde 100644
+--- a/scilab/modules/scinotes/Makefile.am
++++ b/scilab/modules/scinotes/Makefile.am
+@@ -112,5 +112,7 @@ libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+ libsciscinotes_la_sci_gateway_DATA = sci_gateway/scinotes_gateway.xml
+ 
+ if GUI
++if BUILD_HELP
+     USEANT=1
+ endif
++endif
+diff --git a/scilab/modules/scinotes/Makefile.in b/scilab/modules/scinotes/Makefile.in
+index 95b6f57..673fa4c 100644
+--- a/scilab/modules/scinotes/Makefile.in
++++ b/scilab/modules/scinotes/Makefile.in
+@@ -565,7 +565,7 @@ libsciscinotes_la_LIBADD = libsciscinotes-algo.la
+ #### scinotes : gateway declaration ####
+ libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+ libsciscinotes_la_sci_gateway_DATA = sci_gateway/scinotes_gateway.xml
+-@GUI_TRUE@USEANT = 1
++@BUILD_HELP_TRUE@@GUI_TRUE@USEANT = 1
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+-- 
+1.7.2.3
+
diff --git a/sci-mathematics/scilab/files/full_support.diff b/sci-mathematics/scilab/files/full_support.diff
deleted file mode 100644
index 9d7554e8c..000000000
--- a/sci-mathematics/scilab/files/full_support.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 409faec413e7491450f51059af02b0469cbb01eb
-Author: Sylvestre Ledru <sylvestre.ledru@scilab.org>
-Date:   Fri Feb 19 23:42:38 2010 +0100
-
-    full support of sparc64
-
-diff --git a/scilab/bin/scilab b/scilab/bin/scilab
-index c4d6548..7ec4bbc 100755
---- a/scilab/bin/scilab
-+++ b/scilab/bin/scilab
-@@ -371,9 +371,12 @@ fi
- 					"ppc")
- 						proc="ppc"
- 						;;
--					"alpha")  
-+					"alpha")
- 						proc="alpha"
- 						;;
-+					"sparc64")
-+						proc="sparc"
-+						;;
- 					*)
- 						echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
- 						;;
diff --git a/sci-mathematics/scilab/files/java-heap-5.3.3.patch b/sci-mathematics/scilab/files/java-heap-5.3.3.patch
new file mode 100644
index 000000000..57d656b21
--- /dev/null
+++ b/sci-mathematics/scilab/files/java-heap-5.3.3.patch
@@ -0,0 +1,12 @@
+diff -urN scilab-5.3.2-orig//etc/jvm_options.xml scilab-5.3.2/etc/jvm_options.xml
+--- scilab-5.3.2-orig//etc/jvm_options.xml	2011-05-25 23:20:12.145833420 -0400
++++ scilab-5.3.2/etc/jvm_options.xml	2011-05-25 23:20:58.760833451 -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"/>
+   <option value="-Dapple.laf.useScreenMenuBar=true" os="macosx"/>
+   <!-- DISABLE Just In Time java compiler -->
+   <!--
diff --git a/sci-mathematics/scilab/files/missingaddchapter.diff b/sci-mathematics/scilab/files/missingaddchapter.diff
deleted file mode 100644
index 5b9635939..000000000
--- a/sci-mathematics/scilab/files/missingaddchapter.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-commit aad7b644ccc97638598c2831d550edb51bdb13f1
-Author: Sylvestre Ledru <sylvestre.ledru@scilab.org>
-Date:   Mon Apr 27 15:16:20 2009 +0200
-
-    Missing addchapter.sce
-
-diff --git a/scilab/modules/call_scilab/help/en_US/addchapter.sce b/scilab/modules/call_scilab/help/en_US/addchapter.sce
-new file mode 100644
-index 0000000..29d4a54
---- /dev/null
-+++ b/scilab/modules/call_scilab/help/en_US/addchapter.sce
-@@ -0,0 +1,13 @@
-+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-+// Copyright (C) 2007-2008 - INRIA - Allan CORNET
-+// Copyright (C) 2009 - DIGITEO
-+// 
-+// 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
-+
-+path = SCI+"/modules/call_scilab/help/en_US";
-+add_help_chapter("call_scilab API",path,%T);
-+clear path add_help_chapter;
diff --git a/sci-mathematics/scilab/files/modelicac-not-available.diff b/sci-mathematics/scilab/files/modelicac-not-available.diff
deleted file mode 100644
index 2e3bea788..000000000
--- a/sci-mathematics/scilab/files/modelicac-not-available.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/build_block.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/build_block.sci
---- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/build_block.sci	2009-04-14 09:31:05.000000000 +0200
-+++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/build_block.sci	2009-04-30 11:28:37.000000000 +0200
-@@ -72,7 +72,7 @@
-       //++ Check that modelica compiler is available
-       //++ Otherwise, give some feedback and quit
-       if ~with_modelica_compiler() then
--        messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable."), "build_block"),"modal","error");
-+        messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.")+" This is probably due to the non support of ocamlopt on your architecture.", "build_block"),"modal","error");
-         ok = %f
-       end
- 
-diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/MODCOM.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/MODCOM.sci
---- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/MODCOM.sci	2009-04-14 09:31:05.000000000 +0200
-+++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/MODCOM.sci	2009-04-30 11:28:37.000000000 +0200
-@@ -80,7 +80,7 @@
-       //++ Check that modelica compiler is available
-       //++ Otherwise, give some feedback and quit
-       if ~with_modelica_compiler() then
--        messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable."), "MODCOM"),"modal","error");
-+        messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.")+" This is probably due to the non support of ocamlopt on your architecture.", "MODCOM"),"modal","error");
-         ok = %f
-         break
-       end
-diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/genmoc.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/genmoc.sci
---- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/genmoc.sci	2009-11-09 15:53:03.000000000 +0100
-+++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/genmoc.sci	2009-11-09 15:53:37.000000000 +0100
-@@ -29,7 +29,7 @@
-   //++ Check that modelica compiler is available
-   //++ Otherwise, give some feedback and quit
-   if ~with_modelica_compiler() then
--    error(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable."), "genmoc"))
-+	error(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.\n")+" This is probably due to the non support of ocamlopt on your architecture.", "genmoc"))
-     return
-   end
- 
diff --git a/sci-mathematics/scilab/files/renesas-sh.diff b/sci-mathematics/scilab/files/renesas-sh.diff
deleted file mode 100644
index 7aa655fe6..000000000
--- a/sci-mathematics/scilab/files/renesas-sh.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 9586bf474819f11734927d5138056c0c837b9bdb
-Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-Date:   Fri Feb 19 23:44:51 2010 +0100
-
-    Support of Renesas SH(sh4)
-
-diff --git a/scilab/bin/scilab b/scilab/bin/scilab
-index 7ec4bbc..f453f9a 100755
---- a/scilab/bin/scilab
-+++ b/scilab/bin/scilab
-@@ -377,6 +377,9 @@ fi
- 					"sparc64")
- 						proc="sparc"
- 						;;
-+					sh*)
-+						proc="sh"
-+						;;
- 					*)
- 						echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
- 						;;
-diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
-index 469019b..918fbf7 100644
---- a/scilab/m4/java.m4
-+++ b/scilab/m4/java.m4
-@@ -446,6 +446,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
- 		  s390x) # s390 arch can also returns s390x
- 		  machine=s390
- 		  ;;
-+	    sh*)
-+	  	  machine=sh
-+		  ;;
-     esac
- 
- 	AC_MSG_LOG([Looking for JNI libs with $machine as machine hardware name])
diff --git a/sci-mathematics/scilab/files/s390javadetection.diff b/sci-mathematics/scilab/files/s390javadetection.diff
deleted file mode 100644
index 940f2299f..000000000
--- a/sci-mathematics/scilab/files/s390javadetection.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
-index 294de10..52c571f 100644
---- a/scilab/m4/java.m4
-+++ b/scilab/m4/java.m4
-@@ -425,6 +425,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
- 	    powerpc|ppc64)
- 	  	  machine=ppc
- 		  ;;
-+		  s390x) # s390 arch can also returns s390x
-+		  machine=s390
-+		  ;;
-     esac
- 
-     # Check for known JDK installation layouts
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch b/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch
new file mode 100644
index 000000000..868ec0996
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch
@@ -0,0 +1,13 @@
+Index: modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+===================================================================
+--- modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java.orig
++++ modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+@@ -61,7 +61,7 @@ public final class Xcos {
+ 	 * Dependencies version
+ 	 */
+ 	private static final List<String> MXGRAPH_VERSIONS = Arrays.asList("1.4.1.0");
+-	private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]");
++	private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]", "[1, 8, 7]");
+ 	private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7");
+ 	
+ 	private static final String UNABLE_TO_LOAD_JGRAPHX = 
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch b/sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch
new file mode 100644
index 000000000..6d3c2e1cb
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch
@@ -0,0 +1,11 @@
+--- bin/scilab.orig	2009-12-16 08:24:36.000000000 +0100
++++ bin/scilab	2010-02-11 01:14:14.718781674 +0100
+@@ -508,7 +508,7 @@
+ #fi
+ #export PVM_ARCH
+ 
+-SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
++SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab:/usr/lib/scilab
+ LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+ 
+ case $OS in
diff --git a/sci-mathematics/scilab/files/sparc64.diff b/sci-mathematics/scilab/files/sparc64.diff
deleted file mode 100644
index ab852d2ab..000000000
--- a/sci-mathematics/scilab/files/sparc64.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 82bc3daabc423d8fa472308ace64979587c80f92
-Author: Sylvestre Ledru <sylvestre.ledru@scilab.org>
-Date:   Fri Feb 19 12:08:35 2010 +0100
-
-    Support of Linux sparc64 (debian)
-
-diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
-index 9b75699..469019b 100644
---- a/scilab/m4/java.m4
-+++ b/scilab/m4/java.m4
-@@ -433,7 +433,7 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
- 		# Solaris 10 x86
-           machine=i386
-           ;;
--		sun*)
-+		sun*|sparc64)
-        # Sun
-           machine=sparc
-           ;;
---- a/scilab/bin/scilab	2010-02-19 23:59:34.000000000 +0100
-+++ b/scilab/bin/scilab	2010-02-20 00:00:23.000000000 +0100
-@@ -374,6 +374,9 @@
- 					"alpha")  
- 						proc="alpha"
- 						;;
-+					"sparc64")
-+						proc="sparc"
-+						;;
- 					*)
- 						echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
- 						;;
-@@ -392,7 +395,7 @@
- 						proc="i386"
- 						;;
- 				# check for the 64 bits syntax
--					"sparc")
-+					"sparc"|"sparc64")
- 						proc="sparc"
- 						;;
- 					*)