r35514 - /packages/scilab/trunk/debian/patches/javaHeadLess.diff

[sylvestre-guest at users.alioth.debian.org]

Author: sylvestre-guest
Date: Wed Feb 18 09:45:27 2009
New Revision: 35514

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35514
Log:
Issue in the free fixed

Modified:
    packages/scilab/trunk/debian/patches/javaHeadLess.diff

Modified: packages/scilab/trunk/debian/patches/javaHeadLess.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/javaHeadLess.diff?rev=35514&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/javaHeadLess.diff (original)
+++ packages/scilab/trunk/debian/patches/javaHeadLess.diff Wed Feb 18 09:45:27 2009
@@ -42,16 +42,19 @@
 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
+@@ -130,6 +130,17 @@ 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 */
++				#define HEADLESS "-Djava.awt.headless=true"
 +				jvm_options = (JavaVMOption *)REALLOC(jvm_options,sizeof(JavaVMOption)*(indice+1));
-+				jvm_options[indice].optionString = "-Djava.awt.headless=true";
++				jvm_options[indice].optionString = MALLOC((strlen(HEADLESS)+1)*sizeof(char));
++				strcpy(jvm_options[indice].optionString,HEADLESS);
 +				indice++;
++				#undef HEADLESS
 +			}
 +
  			*size_JavaVMOption = indice;