Include tkInt.h in the mercury Tk OpenGL widget.

Package-Manager: portage-2.1.2_rc1-r3

3 files changed, 39 insertions, 9 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/Manifest b/dev-lang/mercury-extras/Manifest
index 4ba2dd62ec36..d45878ae8673 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -66,10 +66,10 @@ AUX mercury-extras-0.13.0-mercury_glut.patch 758 RMD160 fc46c65ad4758d92d3c6bd29
 MD5 f694863b7c5e2946a4d0fa8983da2ab2 files/mercury-extras-0.13.0-mercury_glut.patch 758
 RMD160 fc46c65ad4758d92d3c6bd29980cc3798742f0d9 files/mercury-extras-0.13.0-mercury_glut.patch 758
 SHA256 0432122dd6d14cac2115c5df5988ff2719446456da387b2add8de3cd2107a99d files/mercury-extras-0.13.0-mercury_glut.patch 758
-AUX mercury-extras-0.13.0-mercury_opengl.patch 2599 RMD160 a250dd044af6abf068b310114e4b5801d7658f8f SHA1 2d6a00092f52ebf96be89e0f193f7cb39f42327a SHA256 f7d72114fe25078f7bd549cb0462994f677b450eb5c83482becefd39bec85eb0
-MD5 99144ef34122e1aacfa72c78996457c9 files/mercury-extras-0.13.0-mercury_opengl.patch 2599
-RMD160 a250dd044af6abf068b310114e4b5801d7658f8f files/mercury-extras-0.13.0-mercury_opengl.patch 2599
-SHA256 f7d72114fe25078f7bd549cb0462994f677b450eb5c83482becefd39bec85eb0 files/mercury-extras-0.13.0-mercury_opengl.patch 2599
+AUX mercury-extras-0.13.0-mercury_opengl.patch 3628 RMD160 e5ea3d3a4939f85f3011026bd75f8236bbdff720 SHA1 d2ba38e0f971d05c531bbdceef1ec82256462c34 SHA256 c82b4b47b5ad8afe3f7a1e838498b076ac17a7f59d103c99a251d38181b57c3d
+MD5 b36e4e46eb3cfdda5a76b409c2631ef4 files/mercury-extras-0.13.0-mercury_opengl.patch 3628
+RMD160 e5ea3d3a4939f85f3011026bd75f8236bbdff720 files/mercury-extras-0.13.0-mercury_opengl.patch 3628
+SHA256 c82b4b47b5ad8afe3f7a1e838498b076ac17a7f59d103c99a251d38181b57c3d files/mercury-extras-0.13.0-mercury_opengl.patch 3628
 AUX mercury-extras-0.13.0-mercury_tcltk.patch 514 RMD160 a882692f4961cb3cb10935adcc2532818a8294f5 SHA1 6ab94266a2b3e82cd02d20620612fa6292c64099 SHA256 e0eb2a07f63fd9fbc301c826a552226c1bf05bfd686cb58a6cc8ef02ee437993
 MD5 1aa72a6dbc6f1f2e7b6c5ace931e6234 files/mercury-extras-0.13.0-mercury_tcltk.patch 514
 RMD160 a882692f4961cb3cb10935adcc2532818a8294f5 files/mercury-extras-0.13.0-mercury_tcltk.patch 514
@@ -100,10 +100,10 @@ EBUILD mercury-extras-0.13.0.ebuild 3690 RMD160 4da76f68b272730e6ea5606137c083d4
 MD5 32d50ad63d719caf9a198d7e7cccf854 mercury-extras-0.13.0.ebuild 3690
 RMD160 4da76f68b272730e6ea5606137c083d43a80543c mercury-extras-0.13.0.ebuild 3690
 SHA256 e7adab6e16db34107e694497245b24276bfa7861783cbdea55973aa9ef63619d mercury-extras-0.13.0.ebuild 3690
-MISC ChangeLog 14840 RMD160 bfeb52c12ed0f70f2b635240421ac029a172a254 SHA1 bfeb4639bf111c4bb1767fb127dee57bfcef19b5 SHA256 afcd3f73d65777a96209e7034a9b159cc7ec35c47734794581d7d8610ce6744e
-MD5 22c28207f4f9f923db383954e39f8f4e ChangeLog 14840
-RMD160 bfeb52c12ed0f70f2b635240421ac029a172a254 ChangeLog 14840
-SHA256 afcd3f73d65777a96209e7034a9b159cc7ec35c47734794581d7d8610ce6744e ChangeLog 14840
+MISC ChangeLog 14982 RMD160 72bade46979cb582ba0f3a960f2d0b1333ab31d8 SHA1 645cb6e57c95609fb061f9f453aabb345ad5509b SHA256 bbb98ecda23217b00f3966ac869cae99d2c9c1756a3bcef3beeae3ac68bc67fd
+MD5 8438a71abce7582aa7b2c24cd30928bd ChangeLog 14982
+RMD160 72bade46979cb582ba0f3a960f2d0b1333ab31d8 ChangeLog 14982
+SHA256 bbb98ecda23217b00f3966ac869cae99d2c9c1756a3bcef3beeae3ac68bc67fd ChangeLog 14982
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
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.