OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Feb-2008 20:42:58
Branch: HEAD Handle: 2008021319425701
Modified files:
openpkg-src/doxygen doxygen.patch doxygen.spec
Log:
upgrading package: doxygen 1.5.4 -> 1.5.5
Summary:
Revision Changes Path
1.8 +26 -39 openpkg-src/doxygen/doxygen.patch
1.63 +2 -2 openpkg-src/doxygen/doxygen.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/doxygen/doxygen.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 doxygen.patch
--- openpkg-src/doxygen/doxygen.patch 27 Oct 2007 12:35:05 -0000 1.7
+++ openpkg-src/doxygen/doxygen.patch 13 Feb 2008 19:42:57 -0000 1.8
@@ -1,39 +1,26 @@
-Index: qtools/qxml.cpp
---- qtools/qxml.cpp.orig 2003-12-14 23:00:57.000000000 +0100
-+++ qtools/qxml.cpp 2005-02-18 12:31:22.005743375 +0100
-@@ -4772,7 +4772,7 @@
- {
- const signed char Init = 0;
- const signed char Ws1 = 1; // eat whitespace
-- const signed char CS = 2; // choice or set
-+ const signed char xCS = 2; // choice or set
- const signed char Ws2 = 3; // eat whitespace
- const signed char More = 4; // more cp to read
- const signed char Name = 5; // read name
-@@ -4792,7 +4792,7 @@
- static signed char table[6][9] = {
- /* InpWs InpOp InpCp InpQm InpAst InpPlus InpPipe InpComm
InpUnknown */
- { -1, Ws1, -1, -1, -1, -1, -1, -1, Name
}, // Init
-- { -1, CS, -1, -1, -1, -1, -1, -1, CS
}, // Ws1
-+ { -1, xCS, -1, -1, -1, -1, -1, -1, xCS
}, // Ws1
- { Ws2, -1, Done, Ws2, Ws2, Ws2, More, More, -1
}, // CS
- { -1, -1, Done, -1, -1, -1, More, More, -1
}, // Ws2
- { -1, Ws1, -1, -1, -1, -1, -1, -1, Name
}, // More (same as Init)
-@@ -4837,7 +4837,7 @@
- case Ws1:
- next_eat_ws();
- break;
-- case CS:
-+ case xCS:
- parseOk = parseChoiceSeq();
- break;
- case Ws2:
-@@ -4855,7 +4855,7 @@
- }
- // no input is read after this
- switch ( state ) {
-- case CS:
-+ case xCS:
- if ( !parseOk ) {
- d->error = XMLERR_ERRORPARSINGCHOICE;
- goto parseError;
+Index: src/portable.cpp
+--- src/portable.cpp.orig 2008-01-01 11:41:08 +0100
++++ src/portable.cpp 2008-02-13 20:36:16 +0100
+@@ -14,7 +14,7 @@
+
+ #include <qglobal.h>
+ #include <qdatetime.h>
+-#include <iconv.h>
++#include "iconv.h"
+
+ #if defined(_MSC_VER) || defined(__BORLANDC__)
+ #define popen _popen
+@@ -380,13 +380,7 @@
+ // libiconv is a mess. For some platforms/version the prototype of inbuf is
+ // "const char **", for others it is "char **". C++ requires the proper
cast to
+ // avoid a compile error, that is were the CASTNEEDED is for.
+-#if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109) && \
+- !((defined(_OS_MAC_) || defined(Q_OS_MACX) )&&
(_LIBICONV_VERSION==0x010B))) \
+- || defined(_OS_SOLARIS_))
+-#define CASTNEEDED(x) (x)
+-#else
+ #define CASTNEEDED(x) (char **)(x)
+-#endif
+ return
iconv((iconv_t)cd,CASTNEEDED(inbuf),inbytesleft,outbuf,outbytesleft);
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/doxygen/doxygen.spec
============================================================================
$ cvs diff -u -r1.62 -r1.63 doxygen.spec
--- openpkg-src/doxygen/doxygen.spec 1 Jan 2008 14:53:10 -0000 1.62
+++ openpkg-src/doxygen/doxygen.spec 13 Feb 2008 19:42:58 -0000 1.63
@@ -31,8 +31,8 @@
Class: PLUS
Group: Development
License: GPL
-Version: 1.5.4
-Release: 20080101
+Version: 1.5.5
+Release: 20080213
# list of sources
Source0:
ftp://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
