summaryrefslogtreecommitdiff
path: root/devel/doxygen
diff options
context:
space:
mode:
authorrillig <rillig>2005-08-29 08:26:35 +0000
committerrillig <rillig>2005-08-29 08:26:35 +0000
commit4087c3523e41f18aa275f09ad06b9a9ff1b69fce (patch)
tree69fb96e107cf8678e83d1159b13965df3a79c4d0 /devel/doxygen
parentc0053bde93bc903f93f605f8b6dd5ca511425dce (diff)
downloadpkgsrc-4087c3523e41f18aa275f09ad06b9a9ff1b69fce.tar.gz
Added a patch to resolve a type ambiguity in the ?: operator. Detected
by the bulk builds for NetBSD-1.6.2/i386.
Diffstat (limited to 'devel/doxygen')
-rw-r--r--devel/doxygen/distinfo3
-rw-r--r--devel/doxygen/patches/patch-ag17
2 files changed, 19 insertions, 1 deletions
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 6bde943bf30..74b9f9d5a77 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -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 @@ Size (doxygen-1.4.4.src.tar.gz) = 2854374 bytes
SHA1 (patch-aa) = dd970fa86865ee1eca0d41a86366a608e19b582a
SHA1 (patch-ab) = 099083824e1b6201e9562dc220a58b2dfd2f9f6c
SHA1 (patch-af) = b52845ca3d4d58a876538e8b4780a19419aabe75
+SHA1 (patch-ag) = 70be6474dc5c6cbb1dbed18be7723da461e7c76c
diff --git a/devel/doxygen/patches/patch-ag b/devel/doxygen/patches/patch-ag
new file mode 100644
index 00000000000..cad739ecd1f
--- /dev/null
+++ b/devel/doxygen/patches/patch-ag
@@ -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();
+ }
+