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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Feb 23 10:08:01 CET 2010


Revision: 8758
          http://gar.svn.sourceforge.net/gar/?rev=8758&view=rev
Author:   dmichelsen
Date:     2010-02-23 09:08:01 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
doxygen: Update to 1.6.3

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

Removed Paths:
-------------
    csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch

Modified: csw/mgar/pkg/doxygen/trunk/Makefile
===================================================================
--- csw/mgar/pkg/doxygen/trunk/Makefile	2010-02-23 09:00:43 UTC (rev 8757)
+++ csw/mgar/pkg/doxygen/trunk/Makefile	2010-02-23 09:08:01 UTC (rev 8758)
@@ -1,5 +1,5 @@
 GARNAME = doxygen
-GARVERSION = 1.6.1
+GARVERSION = 1.6.3
 CATEGORIES = utils
 
 DESCRIPTION = A documentation system for programming languages
@@ -11,10 +11,6 @@
 MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/
 DISTFILES  = $(GARNAME)-$(GARVERSION).src.tar.gz
 
-# Patch taken from
-#   https://bugzilla.gnome.org/show_bug.cgi?id=599128
-PATCHFILES = 0001-Add-suggested-iconv-patch-from-bug-599128.patch
-
 PACKAGES = CSWdoxygen CSWdoxygendoc
 
 CATALOGNAME_CSWdoxygen = doxygen
@@ -48,6 +44,10 @@
 ARCHALL_CSWdoxygendoc = 1
 PKGFILES_CSWdoxygendoc = $(PKGFILES_DOC)
 
+# There are some Python examples in there, but pulling in Python unconditionally
+# for these tiny examples seems overkill.
+CHECKPKG_OVERRIDES_CSWdoxygendoc = missing-dependency|CSWpython
+
 include gar/category.mk
 
 # For 'dot'

Modified: csw/mgar/pkg/doxygen/trunk/checksums
===================================================================
--- csw/mgar/pkg/doxygen/trunk/checksums	2010-02-23 09:00:43 UTC (rev 8757)
+++ csw/mgar/pkg/doxygen/trunk/checksums	2010-02-23 09:08:01 UTC (rev 8758)
@@ -1,2 +1 @@
-699b5b642fe694d7f6f0d142e0394b4d  0001-Add-suggested-iconv-patch-from-bug-599128.patch
-2ec343643e134f0d3ce2069420bcb4f0  doxygen-1.6.1.src.tar.gz
+2d6ea20a9d850d94321cee78bab7bb87  doxygen-1.6.3.src.tar.gz

Deleted: csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch
===================================================================
--- csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch	2010-02-23 09:00:43 UTC (rev 8757)
+++ csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch	2010-02-23 09:08:01 UTC (rev 8758)
@@ -1,25 +0,0 @@
-From af9b36d8e00b4db23c2d5dfb5657cf12c269d296 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 6 Nov 2009 10:57:44 +0100
-Subject: [PATCH] Add suggested iconv patch from bug #599128
-
----
- src/htmlhelp.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
-index f120a93..7283eb9 100644
---- a/src/htmlhelp.cpp
-+++ b/src/htmlhelp.cpp
-@@ -302,7 +302,7 @@ static QDict<QCString> s_languageDict;
- void HtmlHelp::initialize()
- {
-   const char *str = Config_getString("CHM_INDEX_ENCODING");
--  if(!str) str = "Windows-1250";
-+  if(!str) str = "CP1250";
-   m_fromUtf8 = portable_iconv_open(str,"UTF-8"); 
- 
-   /* open the contents file */
--- 
-1.6.5.1
-


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