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

[dmichelsen at users.sourceforge.net]

Revision: 10267
          http://gar.svn.sourceforge.net/gar/?rev=10267&view=rev
Author:   dmichelsen
Date:     2010-06-19 21:18:48 +0000 (Sat, 19 Jun 2010)

Log Message:
-----------
doxygen: Update to 1.7.0

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

Added Paths:
-----------
    csw/mgar/pkg/doxygen/trunk/files/0001-Work-around-duplicate-definition-of-time-as-in-bug-6.patch

Modified: csw/mgar/pkg/doxygen/trunk/Makefile
===================================================================
--- csw/mgar/pkg/doxygen/trunk/Makefile	2010-06-19 21:18:03 UTC (rev 10266)
+++ csw/mgar/pkg/doxygen/trunk/Makefile	2010-06-19 21:18:48 UTC (rev 10267)
@@ -1,5 +1,5 @@
 GARNAME = doxygen
-GARVERSION = 1.6.3
+GARVERSION = 1.7.0
 CATEGORIES = utils
 
 DESCRIPTION = A documentation system for programming languages
@@ -11,13 +11,17 @@
 MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/
 DISTFILES  = $(GARNAME)-$(GARVERSION).src.tar.gz
 
+# This is needed until this is fixed:
+#   http://bugzilla.gnome.org/show_bug.cgi?id=621653
+PATCHFILES = 0001-Work-around-duplicate-definition-of-time-as-in-bug-6.patch
+
 PACKAGES = CSWdoxygen CSWdoxygendoc
 
 CATALOGNAME_CSWdoxygen = doxygen
 CATALOGNAME_CSWdoxygendoc = doxygen_doc
 
 SPKG_DESC_CSWdoxygen = A documentation system for programming languages
-SPKG_DESC_CSWdoxygendoc = doxygen documentation
+SPKG_DESC_CSWdoxygendoc = Documentation for doxygen
 
 LICENSE = LICENSE
 
@@ -54,5 +58,5 @@
 PATH := $(PATH):/opt/csw/graphviz2/bin
 
 post-extract-modulated:
-	perl -pi -e ' s,(TMAKE_CFLAGS_RELEASE\s*=\s*)(.*),\1$(filter-out -I/opt/csw/include,$(CFLAGS)),; s,(TMAKE_CXXFLAGS_RELEASE\s*=\s*)(.*),\1$(filter-out -I/opt/csw/include,$(CXXFLAGS)) -norunpath,; ' $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf
+	perl -pi -e ' s,(TMAKE_CFLAGS_RELEASE\s*=\s*)(.*),\1$(CFLAGS),; s,(TMAKE_CXXFLAGS_RELEASE\s*=\s*)(.*),\1$(CXXFLAGS),; s,(TMAKE_LFLAGS_RELEASE\s*=)(.*),\1$(LDFLAGS),; ' $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/doxygen/trunk/checksums
===================================================================
--- csw/mgar/pkg/doxygen/trunk/checksums	2010-06-19 21:18:03 UTC (rev 10266)
+++ csw/mgar/pkg/doxygen/trunk/checksums	2010-06-19 21:18:48 UTC (rev 10267)
@@ -1 +1,2 @@
-2d6ea20a9d850d94321cee78bab7bb87  doxygen-1.6.3.src.tar.gz
+bc5cec86a7b209a5157a4a1bd8cc6d80  0001-Work-around-duplicate-definition-of-time-as-in-bug-6.patch
+5b678b08e96b51eb9b63307a9fac6e96  doxygen-1.7.0.src.tar.gz

Added: csw/mgar/pkg/doxygen/trunk/files/0001-Work-around-duplicate-definition-of-time-as-in-bug-6.patch
===================================================================
--- csw/mgar/pkg/doxygen/trunk/files/0001-Work-around-duplicate-definition-of-time-as-in-bug-6.patch	                        (rev 0)
+++ csw/mgar/pkg/doxygen/trunk/files/0001-Work-around-duplicate-definition-of-time-as-in-bug-6.patch	2010-06-19 21:18:48 UTC (rev 10267)
@@ -0,0 +1,40 @@
+From 8c163f7a4234e4d2b961f7ea0b553a23016e9bbd Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 19 Jun 2010 22:29:53 +0200
+Subject: [PATCH] Work around duplicate definition of time as in bug #621653
+
+---
+ src/portable.cpp |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/portable.cpp b/src/portable.cpp
+index ff9b803..3060449 100644
+--- a/src/portable.cpp
++++ b/src/portable.cpp
+@@ -27,7 +27,7 @@ extern char **environ;
+ //#include "doxygen.h"
+ 
+ static double  sysElapsedTime;
+-static QTime   time;
++static QTime   qtime;
+ 
+ int  portable_system(const char *command,const char *args,bool commandHasConsole)
+ {
+@@ -378,12 +378,12 @@ int portable_pclose(FILE *stream)
+ 
+ void portable_sysTimerStart()
+ {
+-  time.start();
++  qtime.start();
+ }
+ 
+ void portable_sysTimerStop()
+ {
+-  sysElapsedTime+=((double)time.elapsed())/1000.0;
++  sysElapsedTime+=((double)qtime.elapsed())/1000.0;
+ }
+ 
+ double portable_getSysElapsedTime()
+-- 
+1.7.1
+


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