r35494 - in /packages/scilab/trunk/debian/patches: displayStack.diff javaHeadLess.diff series

sylvestre-guest at users.alioth.debian.org sylvestre-guest at users.alioth.debian.org
Fri Feb 13 23:54:41 UTC 2009 

Author: sylvestre-guest
Date: Fri Feb 13 23:54:41 2009
New Revision: 35494

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35494
Log:
Enable the headless to be able to build in a pbuilder

Added:
    packages/scilab/trunk/debian/patches/displayStack.diff
    packages/scilab/trunk/debian/patches/javaHeadLess.diff
Modified:
    packages/scilab/trunk/debian/patches/series

Added: packages/scilab/trunk/debian/patches/displayStack.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/displayStack.diff?rev=35494&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/displayStack.diff (added)
+++ packages/scilab/trunk/debian/patches/displayStack.diff Fri Feb 13 23:54:41 2009
@@ -1,0 +1,12 @@
+diff --git a/scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp b/scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
+index 62b2adf..ec95215 100644
+--- a/scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
++++ b/scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
+@@ -175,6 +175,7 @@ static void __slashToAntislash(std::string *in)
+     catch(GiwsException::JniException ex)
+       {
+ 		  Scierror(999,_("%s: Error while building documentation: %s.\n"), fname, ex.getJavaDescription().c_str());
++		  Scierror(999,_("%s: Execution Java stack %s.\n"), fname, ex.getJavaStackTrace().c_str());
+ 		  return FALSE;
+       }
+ 

Added: packages/scilab/trunk/debian/patches/javaHeadLess.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/javaHeadLess.diff?rev=35494&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/javaHeadLess.diff (added)
+++ packages/scilab/trunk/debian/patches/javaHeadLess.diff Fri Feb 13 23:54:41 2009
@@ -1,0 +1,59 @@
+diff --git a/scilab/Makefile.am b/scilab/Makefile.am
+index a96af1b..1a5be7f 100644
+--- a/scilab/Makefile.am
++++ b/scilab/Makefile.am
+@@ -119,11 +119,11 @@ if BUILD_HELP
+ 	- at if test -x $(top_builddir)/scilab-bin; then \
+ 		cd $(top_builddir);\
+ 		echo "-- Building documentation (English) --"; \
+-		echo "LANG=C SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"xmltojar([],[],'en_US');exit;\"";\
+-		LANG=C SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "xmltojar([],[],'en_US');exit;";\
++		echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"xmltojar([],[],'en_US');exit;\"";\
++		LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "xmltojar([],[],'en_US');exit;";\
+ 		echo "-- Building documentation (French) --"; \
+-		echo "SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"xmltojar([],[],'fr_FR');exit;\""; \
+-		SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e "xmltojar([],[],'fr_FR');exit;"; \
++		echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"xmltojar([],[],'fr_FR');exit;\""; \
++		SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e "xmltojar([],[],'fr_FR');exit;"; \
+ 	else \
+ 		echo "Cannot find Scilab binary"; \
+ 	fi
+diff --git a/scilab/Makefile.in b/scilab/Makefile.in
+index f7dfbab..9636308 100644
+--- a/scilab/Makefile.in
++++ b/scilab/Makefile.in
+@@ -1111,11 +1111,11 @@ doc:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab
+ @BUILD_HELP_TRUE@	- at if test -x $(top_builddir)/scilab-bin; then \
+ @BUILD_HELP_TRUE@		cd $(top_builddir);\
+ @BUILD_HELP_TRUE@		echo "-- Building documentation (English) --"; \
+- at BUILD_HELP_TRUE@		echo "LANG=C SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"xmltojar([],[],'en_US');exit;\"";\
+- at BUILD_HELP_TRUE@		LANG=C SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "xmltojar([],[],'en_US');exit;";\
++ at BUILD_HELP_TRUE@		echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"xmltojar([],[],'en_US');exit;\"";\
++ at BUILD_HELP_TRUE@		LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "xmltojar([],[],'en_US');exit;";\
+ @BUILD_HELP_TRUE@		echo "-- Building documentation (French) --"; \
+- at BUILD_HELP_TRUE@		echo "SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"xmltojar([],[],'fr_FR');exit;\""; \
+- at BUILD_HELP_TRUE@		SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e "xmltojar([],[],'fr_FR');exit;"; \
++ at BUILD_HELP_TRUE@		echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"xmltojar([],[],'fr_FR');exit;\""; \
++ at BUILD_HELP_TRUE@		SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e "xmltojar([],[],'fr_FR');exit;"; \
+ @BUILD_HELP_TRUE@	else \
+ @BUILD_HELP_TRUE@		echo "Cannot find Scilab binary"; \
+ @BUILD_HELP_TRUE@	fi
+diff --git a/scilab/modules/jvm/src/c/getJvmOptions.c b/scilab/modules/jvm/src/c/getJvmOptions.c
+index ad5467a..66075d8 100644
+--- a/scilab/modules/jvm/src/c/getJvmOptions.c
++++ b/scilab/modules/jvm/src/c/getJvmOptions.c
+@@ -130,6 +130,14 @@ JavaVMOption * getJvmOptions(char *SCI_PATH,char *filename_xml_conf,int *size_Ja
+ 			*/
+ 			xmlCleanupParser();
+ 
++			if (getenv("SCI_JAVA_ENABLE_HEADLESS")!=NULL) {
++				/* When Scilab is built from a virtual machine, it needs
++				   an X11 server / input */
++				jvm_options = (JavaVMOption *)REALLOC(jvm_options,sizeof(JavaVMOption)*(indice+1));
++				jvm_options[indice].optionString = "-Djava.awt.headless=true";
++				indice++;
++			}
++
+ 			*size_JavaVMOption = indice;
+ 			return jvm_options;
+ 		}

Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=35494&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Fri Feb 13 23:54:41 2009
@@ -1,12 +1,5 @@
-librarypath.diff
-jeuclid.diff
 addchapter.diff
 adddemo.diff
-docbook.diff
-link-doc.diff
-misctcl.diff
+displayStack.diff
+librarypath.diff
 malloc.diff
-unused-classpath.diff
-installicons.diff
-xmltoformat.diff
-xmltoformat-2.diff

More information about the debian-science-commits mailing list