CVS commit: pkgsrc/graphics/gtkglext

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Jun  3 23:53:03 UTC 2018

Modified Files:
        pkgsrc/graphics/gtkglext: distinfo
Added Files:
        pkgsrc/graphics/gtkglext/patches: patch-gdk_gdkglshapes.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/gtkglext/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/gtkglext/patches/patch-gdk_gdkglshapes.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gtkglext/distinfo
diff -u pkgsrc/graphics/gtkglext/distinfo:1.10 pkgsrc/graphics/gtkglext/distinfo:1.11
--- pkgsrc/graphics/gtkglext/distinfo:1.10      Tue Nov  3 21:34:02 2015
+++ pkgsrc/graphics/gtkglext/distinfo   Sun Jun  3 23:53:02 2018
@@ -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

Added files:

Index: pkgsrc/graphics/gtkglext/patches/patch-gdk_gdkglshapes.c
diff -u /dev/null pkgsrc/graphics/gtkglext/patches/patch-gdk_gdkglshapes.c:1.1
--- /dev/null   Sun Jun  3 23:53:03 2018
+++ pkgsrc/graphics/gtkglext/patches/patch-gdk_gdkglshapes.c    Sun Jun  3 23:53:03 2018
@@ -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.
+  */