[pkgsrc/trunk]: pkgsrc/devel/doxygen Added a patch to resolve a type ambiguit...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae029117a215
branches:  trunk
changeset: 498644:ae029117a215
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Aug 29 08:26:35 2005 +0000

description:
Added a patch to resolve a type ambiguity in the ?: operator. Detected
by the bulk builds for NetBSD-1.6.2/i386.

diffstat:

 devel/doxygen/distinfo         |   3 ++-
 devel/doxygen/patches/patch-ag |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r da36766713e3 -r ae029117a215 devel/doxygen/distinfo
--- a/devel/doxygen/distinfo    Sun Aug 28 17:59:24 2005 +0000
+++ b/devel/doxygen/distinfo    Mon Aug 29 08:26:35 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2005/08/03 21:41:30 recht Exp $
+$NetBSD: distinfo,v 1.20 2005/08/29 08:26:35 rillig Exp $
 
 SHA1 (doxygen-1.4.4.src.tar.gz) = 50e04f40b6b69b1897cad789f993a11df0368eb5
 RMD160 (doxygen-1.4.4.src.tar.gz) = 7999f196b8deb2137e9d411a1c0ea257db32ff3e
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = dd970fa86865ee1eca0d41a86366a608e19b582a
 SHA1 (patch-ab) = 099083824e1b6201e9562dc220a58b2dfd2f9f6c
 SHA1 (patch-af) = b52845ca3d4d58a876538e8b4780a19419aabe75
+SHA1 (patch-ag) = 70be6474dc5c6cbb1dbed18be7723da461e7c76c
diff -r da36766713e3 -r ae029117a215 devel/doxygen/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/doxygen/patches/patch-ag    Mon Aug 29 08:26:35 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.3 2005/08/29 08:26:35 rillig Exp $
+
+This patch resolves a type ambiguity in the ?: operator.
+
+--- src/outputlist.cpp.orig    Sun Jun 12 18:06:58 2005
++++ src/outputlist.cpp Mon Aug 29 10:19:47 2005
+@@ -166,7 +166,9 @@ void OutputList::parseDoc(const char *fi
+   {
+     //printf("og->printDoc(extension=%s)\n",
+     //    ctx?ctx->getDefFileExtension().data():"<null>");
+-    if (og->isEnabled()) og->printDoc(root,ctx?ctx->getDefFileExtension():0);
++    const char *ext = 0;
++    if (ctx) ext = ctx->getDefFileExtension();
++    if (og->isEnabled()) og->printDoc(root, ext);
+     og=outputs->next();
+   }
+