pkg/34803: devel/doxygen Solaris

["Gilles Dauphin" <dauphin%enst.fr@localhost>]

>Number:         34803
>Category:       pkg
>Synopsis:       devel/doxygen Solaris
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Oct 13 09:40:00 +0000 2006
>Originator:     Gilles Dauphin
>Release:        SunOS 5.10 i86pc
>Organization:
ENST 
>Environment:


System: SunOS bi.enst.fr 5.10 Generic_Patch_118844-30 i86pc


>Description:


g++ -c -DQT_NO_CODECS -DQT_LITE_UNICODE -Wall -W -O2 -I. -o ../objects/qxml.o 
qxml.cpp
qxml.cpp: In member function `bool QXmlSimpleReader::parseChoiceSeq()':
qxml.cpp:4775: error: expected primary-expression before "const"
qxml.cpp:4775: error: expected `;' before "const"
gmake[2]: *** [../objects/qxml.o] Error 1
gmake[2]: Leaving directory `/pkg/obj/devel/doxygen/work/doxygen-1.4.7/qtools'



>How-To-Repeat:


bmake


>Fix:


CS is still defined by solaris for amd64 in regset.h

patch is "natural":
--- qtools/qxml.cpp.orig        Sun Dec 14 23:00:57 2003
+++ qtools/qxml.cpp     Fri Oct 13 11:33:29 2006
@@ -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 KDE_CS               = 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,11 +4792,11 @@
     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
-       { Ws2,    -1,    Done,  Ws2,   Ws2,    Ws2,     More,    More,    -1    
}, // CS
+       { -1,     KDE_CS,    -1,    -1,    -1,     -1,      -1,      -1,      
KDE_CS    }, // Ws1
+       { Ws2,    -1,    Done,  Ws2,   Ws2,    Ws2,     More,    More,    -1    
}, // KDE_CS
        { -1,     -1,    Done,  -1,    -1,     -1,      More,    More,    -1    
}, // Ws2
        { -1,     Ws1,   -1,    -1,    -1,     -1,      -1,      -1,      Name  
}, // More (same as Init)
-       { Ws2,    -1,    Done,  Ws2,   Ws2,    Ws2,     More,    More,    -1    
}  // Name (same as CS)
+       { Ws2,    -1,    Done,  Ws2,   Ws2,    Ws2,     More,    More,    -1    
}  // Name (same as KDE_CS)
     };
     signed char state = Init;
     signed char input;
@@ -4837,7 +4837,7 @@
            case Ws1:
                next_eat_ws();
                break;
-           case CS:
+           case KDE_CS:
                parseOk = parseChoiceSeq();
                break;
            case Ws2:
@@ -4855,7 +4855,7 @@
        }
        // no input is read after this
        switch ( state ) {
-           case CS:
+           case KDE_CS:
                if ( !parseOk ) {
                    d->error = XMLERR_ERRORPARSINGCHOICE;
                    goto parseError;