summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2018-06-03 23:53:02 +0000
committerdholland <dholland@pkgsrc.org>2018-06-03 23:53:02 +0000
commit96a045099e82b437689a907a6a32e89c67698c78 (patch)
treedf2a8155ceb1c950327fb776c0dccc4a4020aa19
parent372160341d277f8b05c3a163566a30d8afa818cc (diff)
downloadpkgsrc-96a045099e82b437689a907a6a32e89c67698c78.tar.gz
Work around name conflict with index(). Not sure why this suddenly
broke the build... is this 2018 or 1988?
-rw-r--r--graphics/gtkglext/distinfo3
-rw-r--r--graphics/gtkglext/patches/patch-gdk_gdkglshapes.c18
2 files changed, 20 insertions, 1 deletions
diff --git a/graphics/gtkglext/distinfo b/graphics/gtkglext/distinfo
index 994cad85864..3f709f7a4db 100644
--- a/graphics/gtkglext/distinfo
+++ b/graphics/gtkglext/distinfo
@@ -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 --git a/graphics/gtkglext/patches/patch-gdk_gdkglshapes.c b/graphics/gtkglext/patches/patch-gdk_gdkglshapes.c
new file mode 100644
index 00000000000..0b27f66c802
--- /dev/null
+++ b/graphics/gtkglext/patches/patch-gdk_gdkglshapes.c
@@ -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.
+ */