[pkgsrc/trunk]: pkgsrc/graphics/gtkglext Work around name conflict with index...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc55b69e4cdc
branches:  trunk
changeset: 381304:dc55b69e4cdc
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Jun 03 23:53:02 2018 +0000

description:
Work around name conflict with index(). Not sure why this suddenly
broke the build... is this 2018 or 1988?

diffstat:

 graphics/gtkglext/distinfo                        |   3 ++-
 graphics/gtkglext/patches/patch-gdk_gdkglshapes.c |  18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r 0f4939bb0a61 -r dc55b69e4cdc graphics/gtkglext/distinfo
--- a/graphics/gtkglext/distinfo        Sun Jun 03 22:32:48 2018 +0000
+++ b/graphics/gtkglext/distinfo        Sun Jun 03 23:53:02 2018 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 21:34:02 agc Exp $
+$NetBSD: distinfo,v 1.11 2018/06/03 23:53:02 dholland Exp $
 
 SHA1 (gtkglext-1.2.0.tar.bz2) = d84c9472af3438fbce84189613e5370b97d9d1e7
 RMD160 (gtkglext-1.2.0.tar.bz2) = c731df1b4f0bf2ccb213fe489d2c2d08910d4c77
 SHA512 (gtkglext-1.2.0.tar.bz2) = c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
 Size (gtkglext-1.2.0.tar.bz2) = 703821 bytes
 SHA1 (patch-aa) = 7d84aed4255f90877088024bd6e3c48657a618aa
+SHA1 (patch-gdk_gdkglshapes.c) = 44470b39c2cf9f7ab54298b71b0026040f06a482
diff -r 0f4939bb0a61 -r dc55b69e4cdc graphics/gtkglext/patches/patch-gdk_gdkglshapes.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gtkglext/patches/patch-gdk_gdkglshapes.c Sun Jun 03 23:53:02 2018 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-gdk_gdkglshapes.c,v 1.1 2018/06/03 23:53:03 dholland Exp $
+
+Work around namespace conflict with archaic index() in strings.h.
+No idea why this broke suddenly in 2018, as opposed to, say, twenty
+years ago.
+
+--- gdk/gdkglshapes.c~ 2004-02-20 09:38:12.000000000 +0000
++++ gdk/gdkglshapes.c
+@@ -31,6 +31,9 @@
+ #include <GL/gl.h>
+ #include <GL/glu.h>
+ 
++/* workaround for namespace pollution */
++#define index index_
++
+ /* 
+  * The following code is imported from GLUT.
+  */