summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry/vmd/files/vmd-1.8.6-tcltk8.5.patch')
-rw-r--r--sci-chemistry/vmd/files/vmd-1.8.6-tcltk8.5.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/sci-chemistry/vmd/files/vmd-1.8.6-tcltk8.5.patch b/sci-chemistry/vmd/files/vmd-1.8.6-tcltk8.5.patch
new file mode 100644
index 000000000000..abb9be3e3431
--- /dev/null
+++ b/sci-chemistry/vmd/files/vmd-1.8.6-tcltk8.5.patch
@@ -0,0 +1,50 @@
+diff -Naur vmd-1.8.6/configure vmd-1.8.6.new/configure
+--- vmd-1.8.6/configure 2007-04-08 01:03:49.000000000 -0400
++++ vmd-1.8.6.new/configure 2008-03-11 09:53:43.000000000 -0400
+@@ -591,8 +591,8 @@
+ if ($config_tk) { $tcl_include .= " -I$stock_tk_include_dir"; }
+ $tcl_library = "-L$stock_tcl_library_dir";
+ if ($config_tk) { $tcl_library .= " -L$stock_tk_library_dir"; }
+-$tcl_libs = "-ltcl8.4";
+-if ($config_tk) { $tcl_libs = "-ltk8.4 -lX11 " . $tcl_libs; }
++$tcl_libs = "-ltcl";
++if ($config_tk) { $tcl_libs = "-ltk -lX11 " . $tcl_libs; }
+
+ @tcl_cc = ();
+ @tcl_cu = ();
+@@ -1843,8 +1843,8 @@
+ $fltk_libs = "-lfltk-x11 -lX11";
+ $opengl_include = $opengl_include . " -I/usr/X11R6/include";
+ $opengl_libs = "-L/usr/X11R6/lib -lGLU -lGL -framework Carbon -lXext -lX11";
+- $tcl_libs = "-ltcl8.4-x11";
+- if ($config_tk) { $tcl_libs = "-ltk8.4-x11 -lX11 " . $tcl_libs; }
++ $tcl_libs = "-ltcl-x11";
++ if ($config_tk) { $tcl_libs = "-ltk-x11 -lX11 " . $tcl_libs; }
+ $vmd_libs = "$tcl_libs";
+ } else {
+ ##
+@@ -1936,8 +1936,8 @@
+ $fltk_libs = "-lfltk-x11 -lX11";
+ $opengl_include = $opengl_include . " -I/usr/X11R6/include";
+ $opengl_libs = "-L/usr/X11R6/lib -lGLU -lGL -framework Carbon -lXext -lX11";
+- $tcl_libs = "-ltcl8.4-x11";
+- if ($config_tk) { $tcl_libs = "-ltk8.4-x11 -lX11 " . $tcl_libs; }
++ $tcl_libs = "-ltcl-x11";
++ if ($config_tk) { $tcl_libs = "-ltk-x11 -lX11 " . $tcl_libs; }
+ $vmd_libs = "$tcl_libs";
+ } else {
+ ##
+diff -Naur vmd-1.8.6/src/cmd_render.C vmd-1.8.6.new/src/cmd_render.C
+--- vmd-1.8.6/src/cmd_render.C 2007-04-08 01:04:03.000000000 -0400
++++ vmd-1.8.6.new/src/cmd_render.C 2008-03-11 09:53:12.000000000 -0400
+@@ -211,8 +211,8 @@
+ // likely to lead to memory leaks in various scripts. There's also currently
+ // no way to read out the size of the display in VMD (sad, I know), so
+ // it's just easier to set it here.
+- Tk_PhotoSetSize(handle, xs, ys);
+- Tk_PhotoPutBlock(handle, &blk, 0, 0, xs, ys, TK_PHOTO_COMPOSITE_SET);
++ Tk_PhotoSetSize(interp, handle, xs, ys);
++ Tk_PhotoPutBlock(interp, handle, &blk, 0, 0, xs, ys, TK_PHOTO_COMPOSITE_SET);
+ free(img);
+ return TCL_OK;
+ }