diff options
| author |   Keri Harris <keri@gentoo.org> | 2006-11-10 07:42:06 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2006-11-10 07:42:06 +0000 |
| commit | 77138e88a98df728f98b30283aa35bb86e3101ce (patch) | |
| tree | 7c7fb3d3f0d5496c22685be69700f7223cdb7018 /dev-lang | |
| parent | Stable x86; about time we catch up *wink* (diff) | |
| download | gentoo-2-77138e88a98df728f98b30283aa35bb86e3101ce.tar.gz gentoo-2-77138e88a98df728f98b30283aa35bb86e3101ce.tar.bz2 gentoo-2-77138e88a98df728f98b30283aa35bb86e3101ce.zip | |
Include tkInt.h in the mercury Tk OpenGL widget.
(Portage version: 2.1.2_rc1-r3)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/mercury-extras/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_opengl.patch | 26 |
2 files changed, 31 insertions, 1 deletions
diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog index 3abf026176d6..12137726c205 100644 --- a/dev-lang/mercury-extras/ChangeLog +++ b/dev-lang/mercury-extras/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/mercury-extras # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.56 2006/10/24 06:53:21 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.57 2006/11/10 07:42:06 keri Exp $ + + 10 Nov 2006; keri <keri@gentoo.org> + files/mercury-extras-0.13.0-mercury_opengl.patch: + Include tkInt.h in the mercury Tk OpenGL widget. 24 Oct 2006; keri <keri@gentoo.org> -mercury-extras-0.12.2.ebuild, -mercury-extras-0.12.2-r1.ebuild: diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_opengl.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_opengl.patch index 59c49f9ee315..6f96053e61f8 100644 --- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_opengl.patch +++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_opengl.patch @@ -55,3 +55,29 @@ diff -ur mercury-extras-0.13.0.orig/graphics/mercury_opengl/Mmakefile.mtogl merc depend: mtogl.depend +--- mercury-extras-0.13.0.orig/graphics/mercury_opengl/togl.c 2003-08-13 17:49:46.000000000 +1200 ++++ mercury-extras-0.13.0/graphics/mercury_opengl/togl.c 2006-11-10 20:37:29.000000000 +1300 +@@ -274,22 +274,7 @@ + #include <tcl.h> + #include <tk.h> + #if defined(X11) +-#if TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==0 +-# include "tkInt4.0.h" +-# define NO_TK_CURSOR +-#elif TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==1 +-# include "tkInt4.1.h" +-#elif TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==2 +-# include "tkInt4.2.h" +-#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==0 +-# include "tkInt8.0.h" +-#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==2 +-# include "tkInt8.0p2.h" +-#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==5 +-# include "tkInt8.0p5.h" +-#else +- Sorry, you will have to edit togl.c to include the right tkInt.h file +-#endif ++#include <tkInt.h> + #elif defined(WIN32) + #if TK_MAJOR_VERSION<8 + Sorry Windows version requires Tcl/Tk ver 8.0 or higher. |