upgrading package: doxygen 1.5.1 -> 1.5.2

doxygen/doxygen.patch

@@ -478,3 +478,15 @@ Index: qtools/qxml.cpp
  		if ( !parseOk ) {
  		    d->error = XMLERR_ERRORPARSINGCHOICE;
  		    goto parseError;
+Index: src/portable.cpp
+--- src/portable.cpp.orig	2007-03-13 17:58:17 +0100
++++ src/portable.cpp	2007-06-08 09:16:58 +0200
+@@ -373,7 +373,7 @@
+ size_t portable_iconv (void *cd, const char** inbuf,  size_t *inbytesleft, 
+                                        char** outbuf, size_t *outbytesleft)
+ {
+-#if (defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION==0x0109))
++#if (defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109))
+ #define CASTNEEDED(x) (x)
+ #else
+ #define CASTNEEDED(x) (char **)(x)

doxygen/doxygen.spec

@@ -32,8 +32,8 @@ Distribution: OpenPKG Community
 Class:        PLUS
 Group:        Development
 License:      GPL
-Version:      1.5.1
-Release:      20061030
+Version:      1.5.2
+Release:      20070608
 
 #   list of sources
 Source0:      ftp://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
@@ -42,8 +42,10 @@ Patch0:       doxygen.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, make, flex, bison, perl, gcc
+BuildPreReq:  OpenPKG, openpkg >= 20040130, make, flex, bison, perl, gcc, gcc::with_cxx = yes
 PreReq:       OpenPKG, openpkg >= 20040130
+BuildPreReq:  libiconv
+PreReq:       libiconv
 AutoReq:      no
 AutoReqProv:  no
 
@@ -80,13 +82,15 @@ AutoReqProv:  no
         --release \
         --english-only \
         $opt
-
-    #   avoid optimization on some sources, it tends to eat all
-    #   available memory
+    ( cd src
+      %{l_make} %{l_mflags} Makefile.libdoxycfg Makefile.doxygen
+    ) || exit $?
     %{l_shtool} subst \
-        -e '/config.cpp/s/\$(CXXFLAGS)/-DENGLISH_ONLY -Wall -W/' \
+        -e 's;\(INCPATH[ 	]=.*\)$;\1 %{l_cppflags};' \
         src/Makefile.libdoxycfg
-
+    %{l_shtool} subst \
+        -e 's;\(LIBS[ 	]=.*\)$;\1 %{l_ldflags} -liconv;' \
+        src/Makefile.doxygen
     %{l_make} %{l_mflags -O}
 
 %install