Received: by mail.netbsd.org (Postfix, from userid 605) id 696C084FBD; Sun, 3 Jun 2018 23:53:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E864684FB8 for ; Sun, 3 Jun 2018 23:53:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id GIcRuJ3YRlIc for ; Sun, 3 Jun 2018 23:53:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4934484E86 for ; Sun, 3 Jun 2018 23:53:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3A7CDFBEC; Sun, 3 Jun 2018 23:53:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1528069983390" MIME-Version: 1.0 Date: Sun, 3 Jun 2018 23:53:03 +0000 From: "David A. Holland" Subject: CVS commit: pkgsrc/graphics/gtkglext To: pkgsrc-changes@NetBSD.org Reply-To: dholland@netbsd.org X-Mailer: log_accum Message-Id: <20180603235303.3A7CDFBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1528069983390 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1528069983390 Content-Disposition: inline Content-Length: 1709 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 + #include + ++/* workaround for namespace pollution */ ++#define index index_ ++ + /* + * The following code is imported from GLUT. + */ --_----------=_1528069983390--