[csw-devel] SF.net SVN: gar:[18057] csw/mgar/pkg/doxygen/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Sun May 20 08:18:55 CEST 2012
Revision: 18057
http://gar.svn.sourceforge.net/gar/?rev=18057&view=rev
Author: dmichelsen
Date: 2012-05-20 06:18:55 +0000 (Sun, 20 May 2012)
Log Message:
-----------
doxygen/trunk: Update to 1.8.1
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
Removed 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-05-19 21:31:58 UTC (rev 18056)
+++ csw/mgar/pkg/doxygen/trunk/Makefile 2012-05-20 06:18:55 UTC (rev 18057)
@@ -1,5 +1,5 @@
NAME = doxygen
-VERSION = 1.8.0
+VERSION = 1.8.1
CATEGORIES = utils
GARTYPE = v2
@@ -16,13 +16,17 @@
# https://bugzilla.gnome.org/show_bug.cgi?id=670853
PATCHFILES += 0001-Cannot-cast-0-to-QCString.patch
+VENDOR_URL = http://www.stack.nl/~dimitri/doxygen/
+
+LICENSE = LICENSE
+
+BUILD_DEP_PKGS = CSWgraphviz
+
PACKAGES += CSWdoxygen
-CATALOGNAME_CSWdoxygen = doxygen
SPKG_DESC_CSWdoxygen = A documentation system for programming languages
# PKGFILES is catchall
PACKAGES += CSWdoxygen-doc
-CATALOGNAME_CSWdoxygen-doc = doxygen_doc
SPKG_DESC_CSWdoxygen-doc = Documentation for doxygen
PKGFILES_CSWdoxygen-doc = $(PKGFILES_DOC)
ARCHALL_CSWdoxygen-doc = 1
@@ -35,12 +39,6 @@
CHECKPKG_OVERRIDES_CSWdoxygen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/doxygen/html/config.html
CHECKPKG_OVERRIDES_CSWdoxygen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/doxygen/html/install.html
-LICENSE = LICENSE
-
-VENDOR_URL = http://www.stack.nl/~dimitri/doxygen/
-
-BUILD_DEP_PKGS = CSWgraphviz
-
REINPLACEMENTS += cflags
REINPLACE_MATCH_cflags = (TMAKE_CFLAGS_RELEASE\s*=\s*).*
REINPLACE_WITH_cflags = \1$(CFLAGS)
Modified: csw/mgar/pkg/doxygen/trunk/checksums
===================================================================
--- csw/mgar/pkg/doxygen/trunk/checksums 2012-05-19 21:31:58 UTC (rev 18056)
+++ csw/mgar/pkg/doxygen/trunk/checksums 2012-05-20 06:18:55 UTC (rev 18057)
@@ -1 +1 @@
-5ff66c50ca9288d9a3d695a031f6950c doxygen-1.8.0.src.tar.gz
+d79e54453b313c3200d2c2bf677edd7d doxygen-1.8.1.src.tar.gz
Deleted: 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 2012-05-19 21:31:58 UTC (rev 18056)
+++ csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch 2012-05-20 06:18:55 UTC (rev 18057)
@@ -1,26 +0,0 @@
-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
-
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-05-20 06:18:55 UTC (rev 18057)
@@ -0,0 +1,52 @@
+From 25e25c8970ea31493aa247a4262a4e93319206bb Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da\xC2m at opencsw.org>
+Date: Sat, 19 May 2012 22:44:59 +0200
+Subject: [PATCH] Cannot cast 0 to QCString
+
+---
+ src/index.cpp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/index.cpp b/src/index.cpp
+index a5f4754..8f6a819 100644
+--- a/src/index.cpp
++++ b/src/index.cpp
+@@ -605,18 +605,18 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
+ if (doc || src)
+ {
+ ol.startIndexListItem();
+- ol.startIndexItem(doc ? fd->getReference() : 0,
+- doc ? fd->getOutputFileBase() : 0);
++ ol.startIndexItem(doc ? fd->getReference() : QCString(),
++ doc ? fd->getOutputFileBase() : QCString());
+ ol.parseText(fd->displayName());
+- ol.endIndexItem(doc ? fd->getReference() : 0,
+- doc ? fd->getOutputFileBase() : 0);
++ ol.endIndexItem(doc ? fd->getReference() : QCString(),
++ doc ? fd->getOutputFileBase() : QCString());
+ ol.endIndexListItem();
+ if (ftv)
+ {
+ ftv->addContentsItem(FALSE,
+ fd->displayName(),
+- doc ? fd->getReference() : 0,
+- doc ? fd->getOutputFileBase() : 0,0,
++ doc ? fd->getReference() : QCString(),
++ doc ? fd->getOutputFileBase() : QCString(),0,
+ FALSE,FALSE,fd);
+ }
+ }
+@@ -693,8 +693,8 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
+ if ((!fullPathNames || fd->getDirDef()==0) && (doc || src))
+ {
+ ftv->addContentsItem(FALSE,fd->displayName(),
+- doc ? fd->getReference() : 0,
+- doc ? fd->getOutputFileBase() : 0,
++ doc ? fd->getReference() : QCString(),
++ doc ? fd->getOutputFileBase() : QCString(),
+ 0,
+ FALSE,FALSE,fd);
+ if (addToIndex)
+--
+1.7.10
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list