SOURCES: grass-tk85.patch (NEW) - fix build with tk 8.5

qboosh qboosh at pld-linux.org
Thu Oct 20 21:52:43 CEST 2005


Author: qboosh                       Date: Thu Oct 20 19:52:43 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix build with tk 8.5

---- Files affected:
SOURCES:
   grass-tk85.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/grass-tk85.patch
diff -u /dev/null SOURCES/grass-tk85.patch:1.1
--- /dev/null	Thu Oct 20 21:52:43 2005
+++ SOURCES/grass-tk85.patch	Thu Oct 20 21:52:38 2005
@@ -0,0 +1,22 @@
+--- grass-6.0.1/visualization/nviz/src/interface.h.orig	2004-10-18 18:57:24.000000000 +0200
++++ grass-6.0.1/visualization/nviz/src/interface.h	2005-10-20 08:06:43.877658992 +0200
+@@ -264,7 +264,7 @@
+ /* tkBind.c */
+ int TkCopyAndGlobalEval(Tcl_Interp *, char *);
+ /* tkSend.c */
+-#if TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4
++#if TK_MAJOR_VERSION==8 && TK_MINOR_VERSION>=4
+     CONST char *Tk_SetAppName(Tk_Window, CONST char *);
+ #else
+     char *Tk_SetAppName(Tk_Window, char *);
+--- grass-6.0.1/visualization/nviz/src/togl.c.orig	2004-11-09 15:22:41.000000000 +0100
++++ grass-6.0.1/visualization/nviz/src/togl.c	2005-10-20 08:09:29.795435656 +0200
+@@ -74,7 +74,7 @@
+ #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4
+ #  include "tkInt8.4.h"
+ #else /* X11 TK_VERSION */
+-   error Sorry, you will have to edit togl.c to include the right tkInt.h file
++#  include <tk-private/generic/tkInt.h>
+ #endif /* TK_VERSION */
+ #elif defined(WIN32)
+ #if TK_MAJOR_VERSION<8
================================================================



More information about the pld-cvs-commit mailing list