diff options
| author | cvs2git | 2008-02-23 14:42:32 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 038863474c619284278ba1cd3e6dc4468f3110ac (patch) | |
| tree | ab05f84676d7210d48e922a5d687a9adf2a2c731 | |
| parent | c778a52e531225719e1afb8d690b1534f885802c (diff) | |
| download | grass-AC-branch.zip grass-AC-branch.tar.gz | |
This commit was manufactured by cvs2git to create branch 'AC-branch'.AC-branch
Sprout from master 2008-02-23 14:42:32 UTC wrobell <wrobell@pld-linux.org> '- added a note about upcoming 6.3.0'
Cherrypick from master 2005-10-20 19:52:38 UTC Jakub Bogusz <qboosh@pld-linux.org> '- fix build with tk 8.5':
grass-tk85.patch -> 1.1
| -rw-r--r-- | grass-tk85.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/grass-tk85.patch b/grass-tk85.patch new file mode 100644 index 0000000..90d05b3 --- /dev/null +++ b/grass-tk85.patch @@ -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 |