diff options
| author |   Jeffrey Gardner <je_fro@gentoo.org> | 2009-05-18 03:57:38 +0000 |
|---|---|---|
| committer | Jeffrey Gardner <je_fro@gentoo.org> | 2009-05-18 03:57:38 +0000 |
| commit | 793c97e4af2f82f584a4e6b073df2d996cba651d (patch) | |
| tree | 746000ac6b1bcb9f04b252215e5ad0d975388afd /sci-chemistry | |
| parent | Allow to use pkcs11.h from dev-libs/pkcs11-helper. (diff) | |
| download | gentoo-2-793c97e4af2f82f584a4e6b073df2d996cba651d.tar.gz gentoo-2-793c97e4af2f82f584a4e6b073df2d996cba651d.tar.bz2 gentoo-2-793c97e4af2f82f584a4e6b073df2d996cba651d.zip | |
Adding alexxy's patch :)
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/vmd/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/vmd/files/vmd-1.8.6-fix-crash-on-tcl8.5.patch | 49 |
2 files changed, 54 insertions, 1 deletions
diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog index 3e5a97dad5d2..605875f2ac0f 100644 --- a/sci-chemistry/vmd/ChangeLog +++ b/sci-chemistry/vmd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/vmd # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.20 2009/05/17 20:15:13 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.21 2009/05/18 03:57:38 je_fro Exp $ + + 18 May 2009; Jeff Gardner <je_fro@gentoo.org> + +files/vmd-1.8.6-fix-crash-on-tcl8.5.patch: + adding alexxy's patch :) 17 May 2009; Jeff Gardner <je_fro@gentoo.org> +vmd-1.8.6-r1.ebuild: Fixed by alexxy to work with tcl8.5 diff --git a/sci-chemistry/vmd/files/vmd-1.8.6-fix-crash-on-tcl8.5.patch b/sci-chemistry/vmd/files/vmd-1.8.6-fix-crash-on-tcl8.5.patch new file mode 100644 index 000000000000..db83164ce710 --- /dev/null +++ b/sci-chemistry/vmd/files/vmd-1.8.6-fix-crash-on-tcl8.5.patch @@ -0,0 +1,49 @@ +--- vmd-1.8.6/src/TclTextInterp.C.orig 2009-02-02 23:24:27.000000000 +0300 ++++ vmd-1.8.6/src/TclTextInterp.C 2009-02-02 23:35:33.000000000 +0300 +@@ -100,7 +100,9 @@ + + TclTextInterp::TclTextInterp(VMDApp *vmdapp) + : app(vmdapp) { +- ++#if 0 ++ Tcl_InitMemory(interp); // enable Tcl memory debugging features when compiled with TCL_MEM_DEBUG ++#endif + interp = Tcl_CreateInterp(); + commandPtr = Tcl_NewObj(); + Tcl_IncrRefCount(commandPtr); +@@ -310,8 +312,16 @@ + callLevel++; + Tcl_RecordAndEvalObj(interp, commandPtr, 0); + callLevel--; +- ++#if TCL_MINOR_VERSION >= 5 ++ if (Tcl_IsShared(commandPtr)) { ++ Tcl_DecrRefCount(commandPtr); ++ commandPtr = Tcl_NewObj(); ++ Tcl_IncrRefCount(commandPtr); ++ } ++#else ++// XXX this crashes Tcl 8.5.[46] with an internal panic + Tcl_SetObjLength(commandPtr, 0); ++#endif + + // if ok, send to stdout; if not, send to stderr + Tcl_Obj *resultPtr = Tcl_GetObjResult(interp); +@@ -388,8 +398,16 @@ + if (app->exitFlag) break; + + Tcl_RecordAndEvalObj(interp, cmdPtr, 0); ++#if TCL_MINOR_VERSION >= 5 ++ if (Tcl_IsShared(cmdPtr)) { ++ Tcl_DecrRefCount(cmdPtr); ++ cmdPtr = Tcl_NewObj(); ++ Tcl_IncrRefCount(cmdPtr); ++ } ++#else ++ // XXX this crashes Tcl 8.5.[46] with an internal panic + Tcl_SetObjLength(cmdPtr, 0); +- ++#endif + // XXX what's this here for? + app->display_update(); + |