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 | 9da9c064c2b989c06cce56e0cd4c95bd4ce08057 (patch) | |
| tree | 795cfcb9a925d99eba9a1549f57c34130b0b7046 /sci-chemistry/vmd | |
| parent | Allow to use pkcs11.h from dev-libs/pkcs11-helper. (diff) | |
| download | historical-9da9c064c2b989c06cce56e0cd4c95bd4ce08057.tar.gz historical-9da9c064c2b989c06cce56e0cd4c95bd4ce08057.tar.bz2 historical-9da9c064c2b989c06cce56e0cd4c95bd4ce08057.zip | |
Adding alexxy's patch :)
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/vmd')
| -rw-r--r-- | sci-chemistry/vmd/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/vmd/Manifest | 3 | ||||
| -rw-r--r-- | sci-chemistry/vmd/files/vmd-1.8.6-fix-crash-on-tcl8.5.patch | 49 |
3 files changed, 56 insertions, 2 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/Manifest b/sci-chemistry/vmd/Manifest index 5d4527238ca7..816d9dcfe434 100644 --- a/sci-chemistry/vmd/Manifest +++ b/sci-chemistry/vmd/Manifest @@ -1,9 +1,10 @@ AUX vmd-1.8.5-config-gentoo.patch 4714 RMD160 192224a4a05e249c357f08e13d0811dcfb60f7ea SHA1 9b008b3313c969517dacf1c721e894151d0771f7 SHA256 8e7ac5124de52dbef9469c8416b1f011ffe3420043c5a58c2183b67dd66a6be9 AUX vmd-1.8.6-config-gentoo.patch 4666 RMD160 1fb149ab58292f42abbe4d658aff0334d3fe73f9 SHA1 27a7ea51772e93e858ef23bf09d819e75d6418b5 SHA256 6dc232ee1c01a56bb94bdf193f024e868f957a22b6c1c8666d2d443801a36f03 +AUX vmd-1.8.6-fix-crash-on-tcl8.5.patch 1355 RMD160 19f86942aabda74eb5726346b84012b6509b67f1 SHA1 921c554d9a6e296251ce01e22f5bf03c7bcc8841 SHA256 98bcd0c524f0392a12149c5d6ab15cff489edf1092315a74110f655de482ca4e AUX vmd-1.8.6-python-2.5.patch 860 RMD160 4f9f83800e0f5083fcd32a016404c909da4042a6 SHA1 bb401cccbb18428cc0fdce5cf4b5fd3a910a9cea SHA256 652e5dbb44d2c14c13886e9e7bc2677287bfdd520e7489547cffc2331b39d7ec AUX vmd-1.8.6-tcltk8.5.patch 2348 RMD160 d1661e1effd1ab35def56cbd53601801427f96a0 SHA1 b7b7fd68cb6e9c8fea12c4544179daaada5dd36b SHA256 d1e39f5d67af22281ccf1bf56e1360778e03d1b1ea6c6c184a0d269f49edee2c DIST vmd-1.8.6.src.tar.gz 18045341 RMD160 66f8ee5a0313000ea8dd3cb79881fd26a2836a79 SHA1 62ceaab06c7fec7c2c8e9a2d7f08c83ba662679d SHA256 fe2bcf7ffea1ed6b3a7f2402d6e1cb1d6def588a8b09a5d0943c0a9f3426ead2 EBUILD vmd-1.8.6-r1.ebuild 4356 RMD160 7764856e43acaf975123d582811f9d6dca349cd7 SHA1 c5384f35ea85150dbee77c021365f0e38905b929 SHA256 a16e99b394bcebc3c62ecc6723fc3719d00f3e2527c1efd24cabc24de302a341 EBUILD vmd-1.8.6.ebuild 4299 RMD160 1e4bee161856b5996bbd1b61de1d5575c030804e SHA1 1a943a032e8699ea41b7aa135a2550e05fbfc77a SHA256 d5f4d08855fc4095bfd58099aae3a3e56c1db064e06bf9569f8ef71334f4734a -MISC ChangeLog 3858 RMD160 af881d40880bf62afbceab3ce5866c15ac497297 SHA1 f0584db61a21a523aab9bd4a4d0dd0d4e1d942cc SHA256 8e6232427198a6d50ef597363b594d19abc2367263e01d823f2dd9fee1485544 +MISC ChangeLog 3980 RMD160 e16aaa22bf70f5ba8e2dd90bfd4c4f2f8a7d6045 SHA1 16f51edfec091f76e44106db4a41fc513392cd4e SHA256 0968b37db37bb12c12b4b15d7ace666af5de1036d066715d2a5f7c71523647ed MISC metadata.xml 282 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 SHA1 7f42dcea44641b8a77ab9644791344ec6ed6c327 SHA256 3c1785eb4ab63774ed3a6b1bddd602ef24cd6795f690bb3289d5a980bca06349 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(); + |