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

[dmichelsen at users.sourceforge.net]

Revision: 19965
          http://gar.svn.sourceforge.net/gar/?rev=19965&view=rev
Author:   dmichelsen
Date:     2012-12-26 17:40:38 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
doxygen/trunk: Update to 1.8.3

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

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-12-26 16:08:51 UTC (rev 19964)
+++ csw/mgar/pkg/doxygen/trunk/Makefile	2012-12-26 17:40:38 UTC (rev 19965)
@@ -1,5 +1,5 @@
 NAME = doxygen
-VERSION = 1.8.2
+VERSION = 1.8.3
 GARTYPE = v2
 
 DESCRIPTION = A documentation system for programming languages
@@ -11,10 +11,6 @@
 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
-
 VENDOR_URL = http://www.stack.nl/~dimitri/doxygen/
 
 LICENSE = LICENSE

Modified: csw/mgar/pkg/doxygen/trunk/checksums
===================================================================
--- csw/mgar/pkg/doxygen/trunk/checksums	2012-12-26 16:08:51 UTC (rev 19964)
+++ csw/mgar/pkg/doxygen/trunk/checksums	2012-12-26 17:40:38 UTC (rev 19965)
@@ -1 +1 @@
-ac77157d7051e5f2b82c749c498a17ae  doxygen-1.8.2.src.tar.gz
+7004085a39217b4848e26ee726b3c9a7  doxygen-1.8.3.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-12-26 16:08:51 UTC (rev 19964)
+++ csw/mgar/pkg/doxygen/trunk/files/0001-Cannot-cast-0-to-QCString.patch	2012-12-26 17:40:38 UTC (rev 19965)
@@ -1,34 +0,0 @@
-From 628dfba31d353378e2a5ff90aaf10187dfe212a2 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sat, 11 Aug 2012 16:32:40 +0200
-Subject: [PATCH] Cannot cast 0 to QCString
-
----
- src/filedef.cpp |    4 ++--
- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
-
-diff --git a/src/filedef.cpp b/src/filedef.cpp
-index dd9f125..36efc27 100644
---- a/src/filedef.cpp
-+++ b/src/filedef.cpp
-@@ -807,7 +807,7 @@ void FileDef::writeSource(OutputList &ol)
-   {
-     startFile(ol,getSourceFileBase(),0,pageTitle,HLI_FileVisible,
-         !generateTreeView,
--        !isDocFile && genSourceFile ? 0 : getOutputFileBase());
-+        !isDocFile && genSourceFile ? QCString() : getOutputFileBase());
-     if (!generateTreeView)
-     {
-       getDirDef()->writeNavigationPath(ol);
-@@ -820,7 +820,7 @@ void FileDef::writeSource(OutputList &ol)
-   else
-   {
-     startFile(ol,getSourceFileBase(),0,pageTitle,HLI_FileVisible,FALSE,
--        !isDocFile && genSourceFile ? 0 : getOutputFileBase());
-+        !isDocFile && genSourceFile ? QCString() : getOutputFileBase());
-     startTitle(ol,getSourceFileBase());
-     ol.parseText(title);
-     endTitle(ol,getSourceFileBase(),0);
--- 
-1.7.10.3
-

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