r35334 - in /packages/scilab/trunk/debian/patches: misctcl.diff series
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Wed Nov 19 11:21:18 UTC 2008
Author: sylvestre-guest
Date: Wed Nov 19 11:21:18 2008
New Revision: 35334
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35334
Log:
Disable the init of tk when building the doc
Added:
packages/scilab/trunk/debian/patches/misctcl.diff
Modified:
packages/scilab/trunk/debian/patches/series
Added: packages/scilab/trunk/debian/patches/misctcl.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/misctcl.diff?rev=35334&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/misctcl.diff (added)
+++ packages/scilab/trunk/debian/patches/misctcl.diff Wed Nov 19 11:21:18 2008
@@ -1,0 +1,89 @@
+--- scilab-5.0.3.orig/modules/tclsci/src/c/InitTclTk.c 2008-11-05 18:42:25.000000000 +0100
++++ scilab-5.0.3/modules/tclsci/src/c/InitTclTk.c 2008-11-19 20:42:20.000000000 +0100
+@@ -51,7 +51,7 @@
+ char *SciPath=NULL;
+ char TkScriptpath[PATH_MAX];
+ char MyCommand[2048];
+- BOOL tkStarted=TRUE;
++ BOOL tkStarted=FALSE;
+
+ #ifndef _MSC_VER
+ DIR *tmpdir=NULL;
+@@ -126,28 +126,26 @@
+
+ if ( Tcl_Init(getTclInterp()) == TCL_ERROR)
+ {
++ releaseTclInterp();
+ Scierror(999,_("Tcl Error: Error during the Tcl initialization (Tcl_Init): %s\n"),getTclInterp()->result);
+ }
+ releaseTclInterp();
+- if ( Tk_Init(getTclInterp()) == TCL_ERROR)
+- {
+- Scierror(999,_("Tcl Error: Error during the TK initialization (Tk_Init).\n"));
+- if (!IsFromJava()){
+- /* When we are calling this stuff from javasci in the binary,
+- * not finding TCL_LIBRARY is causing issue to display the
+- * actual error (infinity loop)
+- * See: http://bugzilla.scilab.org/show_bug.cgi?id=3605
+- */
+- Scierror(999,_("Reason: %s:\n"),getTclInterp()->result);
+- }
+- tkStarted=FALSE;
++ if (getenv("SCI_DISABLE_TK")==NULL) {
++ if ( Tk_Init(getTclInterp()) == TCL_ERROR)
++ {
++ releaseTclInterp();
++ Scierror(999,_("Tcl Error: Error during the TK initialization (Tk_Init): %s\n"),getTclInterp()->result);
++ releaseTclInterp();
++ }else{
++ tkStarted=TRUE;
++ }
+ }
+
+- releaseTclInterp();
+ sprintf(MyCommand, "set SciPath \"%s\";",SciPath);
+
+ if ( Tcl_Eval(getTclInterp(),MyCommand) == TCL_ERROR )
+ {
++ releaseTclInterp();
+ Scierror(999,_("Tcl Error: Error during the Scilab/Tcl init process. Could not set SciPath: %s\n"),getTclInterp()->result);
+ }
+
+@@ -163,6 +161,7 @@
+ Tk_GeometryRequest(TKmainWindow,2,2);
+ if ( Tcl_EvalFile(getTclInterp(),TkScriptpath) == TCL_ERROR )
+ {
++ releaseTclInterp();
+ Scierror(999,_("Tcl Error: Error during the Scilab/TK init process. Error while loading %s: %s\n"),TkScriptpath, getTclInterp()->result);
+ }
+ releaseTclInterp();
+--- scilab-5.0.3.orig/Makefile.am 2008-11-05 18:42:13.000000000 +0100
++++ scilab-5.0.3/Makefile.am 2008-11-19 20:40:54.000000000 +0100
+@@ -105,10 +105,10 @@
+ cd $(top_builddir);\
+ echo "-- Building documentation (English) --"; \
+ echo "$(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e \"xmltojar();exit;\"";\
+- DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "xmltojar();exit;";\
++ SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "xmltojar();exit;";\
+ echo "-- Building documentation (French) --"; \
+ echo "$(top_builddir)/bin/scilab -nb -l fr_FR -nouserstartup -nw -e \"xmltojar();exit;\""; \
+- DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l fr_FR -nouserstartup -nw -e "xmltojar();exit;"; \
++ SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l fr_FR -nouserstartup -nw -e "xmltojar();exit;"; \
+ else \
+ echo "Cannot find Scilab binary"; \
+ fi
+--- scilab-5.0.3.orig/Makefile.in 2008-11-05 18:42:13.000000000 +0100
++++ scilab-5.0.3/Makefile.in 2008-11-19 20:49:15.000000000 +0100
+@@ -1094,10 +1094,10 @@
+ @BUILD_HELP_TRUE@ cd $(top_builddir);\
+ @BUILD_HELP_TRUE@ echo "-- Building documentation (English) --"; \
+ @BUILD_HELP_TRUE@ echo "$(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e \"xmltojar();exit;\"";\
+- at BUILD_HELP_TRUE@ DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "xmltojar();exit;";\
++ at BUILD_HELP_TRUE@ SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "xmltojar();exit;";\
+ @BUILD_HELP_TRUE@ echo "-- Building documentation (French) --"; \
+ @BUILD_HELP_TRUE@ echo "$(top_builddir)/bin/scilab -nb -l fr_FR -nouserstartup -nw -e \"xmltojar();exit;\""; \
+- at BUILD_HELP_TRUE@ DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l fr_FR -nouserstartup -nw -e "xmltojar();exit;"; \
++ at BUILD_HELP_TRUE@ SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l fr_FR -nouserstartup -nw -e "xmltojar();exit;"; \
+ @BUILD_HELP_TRUE@ else \
+ @BUILD_HELP_TRUE@ echo "Cannot find Scilab binary"; \
+ @BUILD_HELP_TRUE@ fi
Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=35334&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Wed Nov 19 11:21:18 2008
@@ -4,3 +4,5 @@
adddemo.diff
docbook.diff
link.diff
+misctcl.diff
+
More information about the debian-science-commits
mailing list