[csw-devel] SF.net SVN: gar:[17225] csw/mgar/pkg/doxygen/trunk

[dmichelsen at users.sourceforge.net]

Revision: 17225
          http://gar.svn.sourceforge.net/gar/?rev=17225&view=rev
Author:   dmichelsen
Date:     2012-02-27 09:49:26 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
doxygen/trunk: Update to 1.8.0

Modified Paths:
--------------
    csw/mgar/pkg/doxygen/trunk/Makefile
    csw/mgar/pkg/doxygen/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch

Modified: csw/mgar/pkg/doxygen/trunk/Makefile
===================================================================
--- csw/mgar/pkg/doxygen/trunk/Makefile	2012-02-27 03:33:50 UTC (rev 17224)
+++ csw/mgar/pkg/doxygen/trunk/Makefile	2012-02-27 09:49:26 UTC (rev 17225)
@@ -1,5 +1,5 @@
 NAME = doxygen
-VERSION = 1.7.6.1
+VERSION = 1.8.0
 CATEGORIES = utils
 GARTYPE = v2
 
@@ -12,15 +12,15 @@
 MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/
 DISTFILES  = $(DISTNAME).src.tar.gz
 
+# Use patch until this is fixed:
+#   https://bugzilla.gnome.org/show_bug.cgi?id=670853
+PATCHFILES += 0001-Cannot-cast-0-to-QCString.patch
+
 PACKAGES += CSWdoxygen
 CATALOGNAME_CSWdoxygen = doxygen
 SPKG_DESC_CSWdoxygen = A documentation system for programming languages
 # PKGFILES is catchall
 
-# That is from the BibTeX-style:
-#   %%% Modification of BibTeX style file /usr/local/texlive/2008/texmf-dist/bibtex/bst/base/plain.bst
-CHECKPKG_OVERRIDES_CSWdoxygen += file-with-bad-content|/usr/local|root/opt/csw/bin/doxygen
-
 PACKAGES += CSWdoxygen-doc
 CATALOGNAME_CSWdoxygen-doc = doxygen_doc
 SPKG_DESC_CSWdoxygen-doc = Documentation for doxygen

Modified: csw/mgar/pkg/doxygen/trunk/checksums
===================================================================
--- csw/mgar/pkg/doxygen/trunk/checksums	2012-02-27 03:33:50 UTC (rev 17224)
+++ csw/mgar/pkg/doxygen/trunk/checksums	2012-02-27 09:49:26 UTC (rev 17225)
@@ -1 +1 @@
-084f1db244b77b3abff335550ef8eec5  doxygen-1.7.6.1.src.tar.gz
+5ff66c50ca9288d9a3d695a031f6950c  doxygen-1.8.0.src.tar.gz

Added: csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch
===================================================================
--- csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch	                        (rev 0)
+++ csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch	2012-02-27 09:49:26 UTC (rev 17225)
@@ -0,0 +1,26 @@
+From 8de9063649a747a8d0570043970ca1736b7e5007 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 26 Feb 2012 23:04:01 +0100
+Subject: [PATCH] Cannot cast 0 to QCString
+
+---
+ src/htmldocvisitor.cpp |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
+index 14be9d7..7d604f3 100644
+--- a/src/htmldocvisitor.cpp
++++ b/src/htmldocvisitor.cpp
+@@ -1376,7 +1376,8 @@ void HtmlDocVisitor::visitPre(DocRef *ref)
+   {
+     // when ref->isSubPage()==TRUE we use ref->file() for HTML and
+     // ref->anchor() for LaTeX/RTF
+-    startLink(ref->ref(),ref->file(),ref->relPath(),ref->isSubPage() ? 0 : ref->anchor());
++    QCString empty = "";
++    startLink(ref->ref(),ref->file(),ref->relPath(),ref->isSubPage() ? empty : ref->anchor());
+   }
+   if (!ref->hasLinkText()) filter(ref->targetTitle());
+ }
+-- 
+1.7.9
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.