pkg/32890: qt3-libs gcc Solaris10

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

>Number:         32890
>Category:       pkg
>Synopsis:       qt3-libs gcc Solaris10
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Feb 21 13:25:00 +0000 2006
>Originator:     Gilles Dauphin
>Release:        SunOS 5.10 i86pc
>Organization:
ENST 
>Environment:


System: SunOS bi.enst.fr 5.10 Generic_118844-20 i86pc


>Description:


 g++ -c -O -I/usr/pkgsrc/x11/qt3-libs/work/.buildlink/include 
-DGLX_GLXEXT_LEGACY 
-I/usr/pkgsrc/x11/qt3-libs/work/.buildlink/include/freetype2 
-DQ_TRAILING_DIR_SEP -fno-exceptions -D_REENTRANT -DQT_SHARED -DQT_NO_DEBUG 
-DQT_THREAD_SUPPORT -DQT_NO_CUPS -D_LARGEFILE_SOURCE -D_LARGE_FILES 
-D_FILE_OFFSET_BITS=64 -DQT_NO_XINERAMA -DQT_NO_XRENDER -DQT_NO_XFTFREETYPE 
-DQT_NO_IMAGEIO_MNG -DQT_NO_IMAGEIO_JPEG -DQT_BUILTIN_GIF_READER=1 
-DQT_NO_STYLE_MAC -DQT_NO_STYLE_AQUA -DQT_NO_STYLE_INTERLACE 
-DQT_NO_STYLE_WINDOWSXP -DQT_NO_STYLE_COMPACT -DQT_NO_STYLE_POCKETPC 
-I/usr/pkgsrc/x11/qt3-libs/work/qt-x11-free-3.3.5/mkspecs/solaris-g++ -I. 
-I../include -I/usr/pkgsrc/x11/qt3-libs/work/.x11-buildlink/share/include 
-I.moc/release-shared-mt/ xml/qxml.cpp  -fPIC -DPIC -o 
.obj/release-shared-mt/.libs/qxml.o
xml/qxml.cpp: In member function `bool QXmlSimpleReader::parseChoiceSeq()':
xml/qxml.cpp:6004: error: expected primary-expression before "const"
xml/qxml.cpp:6004: error: expected `;' before "const"
gmake[1]: *** [.obj/release-shared-mt/qxml.o] Error 1
gmake[1]: Leaving directory 
`/usr/pkgsrc/x11/qt3-libs/work/qt-x11-free-3.3.5/src'
gmake: *** [sub-src] Error 2
*** Error code 2

Stop.
bmake: stopped in /usr/pkgsrc/x11/qt3-libs
===> 



>How-To-Repeat:


bmake in qt3-libs


>Fix:


--- src/xml/qxml.cpp.orig       Fri Sep  2 14:42:52 2005
+++ src/xml/qxml.cpp    Tue Feb 21 14:16:41 2006
@@ -6001,7 +6001,7 @@
 {
     const signed char Init             = 0;
     const signed char Ws1              = 1; // eat whitespace
-    const signed char CS               = 2; // choice or set
+    const signed char ChoiceSet               = 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
@@ -6020,11 +6020,11 @@
     static const 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,     ChoiceSet,    -1,    -1,    -1,     -1,      -1,      -1,     
 ChoiceSet    }, // Ws1
+       { Ws2,    -1,    Done,  Ws2,   Ws2,    Ws2,     More,    More,    -1    
}, // ChoiceSet
        { -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 ChoiceSet)
     };
     signed char state;
     signed char input;
@@ -6093,7 +6093,7 @@
                    return FALSE;
                }
                break;
-           case CS:
+           case ChoiceSet:
                if ( !parseChoiceSeq() ) {
                    parseFailed( &QXmlSimpleReader::parseChoiceSeq, state );
                    return FALSE;