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

Fri Nov 6 13:52:23 CET 2009

Revision: 7143
          http://gar.svn.sourceforge.net/gar/?rev=7143&view=rev
Author:   dmichelsen
Date:     2009-11-06 12:52:23 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
doxygen: Add patch for Solaris iconv

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

Added 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	2009-11-06 10:57:56 UTC (rev 7142)
+++ csw/mgar/pkg/doxygen/trunk/Makefile	2009-11-06 12:52:23 UTC (rev 7143)
@@ -1,31 +1,3 @@
-# Todo (feel free to take over):
-# - gmake docs segfaults, check why 
-#   (related to libiconv? Might change with libiconv 1.13+)
-# - platform makefile doesn't honor our CCFLAGS
-#   work/build-isa-i386/doxygen-1.5.9/tmake/lib/solaris-cc/tmake.conf
-#   results in: CC -c -O2 -I..
-#
-# Adding members to index pages...
-# Generating style sheet...
-# Generating index page...
-# Generating page index...
-# Segmentation Fault - core dumped
-# gmake[1]: *** [all] Error 139
-# gmake[1]: Leaving directory `/home/skayser/mgar/pkg/doxygen/trunk/work/build-isa-i386/doxygen-1.5.9/doc'
-# 
-# $ pstack work/build-isa-i386/doxygen-1.5.9/doc/core
-# core 'work/build-isa-i386/doxygen-1.5.9/doc/core' of 20317:     /home/skayser/mgar/pkg/doxygen/trunk/work/build-isa-i386/doxygen-1.5.9
-# df945898 iconv    (ffffffff, 80478d8, 80478d0, 80478dc, 80478d4) + 38
-# 083d2e52 portable_iconv (ffffffff, 80478d8, 80478d0, 80478dc, 80478d4) + 1a
-# 081c1ec2 __1cIHtmlHelpGrecode6MrknIQdDCString__1_ (804790c, 8da4210, 8047910) + 6a
-# 081c1fe6 __1cIHtmlHelpPaddContentsItem6Mbpkc222_v_ (8da4210, 0, 8de85a8, 0, 8de85c8, 0) + b2
-# 08198b75 __1cJIndexListHforeach4CbCpkcC2C2C2_6MmJIndexIntf_MTATBTCTDTE_v34567_v_ (85fa380, 81d2af4, 0, 0, 8de85a8, 0, 8de85c8, 0) + 99
-# 081ccec6 __1cOwritePageIndex6FrnKOutputList__v_ (8d97f50) + 372
-# 081920c3 __1cOgenerateOutput6F_v_ () + a27
-# 08169d11 main     (1, 8047ad8, 8047ae0) + 2d
-# 08169c56 _start   () + 7a
-#
-
 GARNAME = doxygen
 GARVERSION = 1.6.1
 CATEGORIES = utils
@@ -38,6 +10,19 @@
 
 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
+CATALOGNAME_CSWdoxygendoc = doxygen_doc
+
+SPKG_DESC_CSWdoxygen = A documentation system for programming languages
+SPKG_DESC_CSWdoxygendoc = doxygen documentation
+
 SPKG_SOURCEURL = http://www.stack.nl/~dimitri/doxygen/
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -46,21 +31,23 @@
 
 PREREQUISITE_PKGS = CSWgraphviz2
 
-CONFIGURE_ARGS = $(subst =, ,$(filter --prefix=% , $(DIRPATHS)))
-CONFIGURE_ARGS += --docdir $(docdir)
+CONFIGURE_ARGS = --prefix $(prefix)
+CONFIGURE_ARGS += --release
+CONFIGURE_ARGS += --docdir $(docdir)/doxygen
+CONFIGURE_ARGS += --dot /opt/csw/graphviz2/bin/dot
 CONFIGURE_ARGS += --platform solaris-cc
 
-TEST_SCRIPTS = 
+TEST_SCRIPTS =
 
+INSTALL_ARGS = install_docs
+
+PKGFILES_CSWdoxygendoc = $(PKGFILES_DOC)
+
 include gar/category.mk
 
 # For 'dot'
 PATH := $(PATH):/opt/csw/graphviz2/bin
 
 post-extract-modulated:
-	perl -pi -e 'if (/^TMAKE_CXXFLAGS_RELEASE/) { \
-			s|= .*|= $(filter-out -I/opt/csw/include, $(CXXFLAGS)) -norunpath|; }' \
-		$(WORKSRC)/tmake/lib/solaris-cc/tmake.conf
-	perl -pi -e 'if (/^TMAKE_CFLAGS_DEBUG/) { s|= .*|= $(filter-out -I/opt/csw/include,$(CFLAGS))|; }' \
-		$(WORKSRC)/tmake/lib/solaris-cc/tmake.conf
+	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
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/doxygen/trunk/checksums
===================================================================
--- csw/mgar/pkg/doxygen/trunk/checksums	2009-11-06 10:57:56 UTC (rev 7142)
+++ csw/mgar/pkg/doxygen/trunk/checksums	2009-11-06 12:52:23 UTC (rev 7143)
@@ -1 +1,2 @@
+699b5b642fe694d7f6f0d142e0394b4d  0001-Add-suggested-iconv-patch-from-bug-599128.patch
 2ec343643e134f0d3ce2069420bcb4f0  doxygen-1.6.1.src.tar.gz

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch	2009-11-06 12:52:23 UTC (rev 7143)
@@ -0,0 +1,25 @@
+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.

