OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-May-2005 15:25:54
Branch: HEAD Handle: 2005050314255400
Modified files:
openpkg-src/qt qt.patch qt.spec
Log:
rename conflicting identifiers in the global C++ namespace
Summary:
Revision Changes Path
1.11 +151 -0 openpkg-src/qt/qt.patch
1.119 +1 -1 openpkg-src/qt/qt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 qt.patch
--- openpkg-src/qt/qt.patch 1 Feb 2005 09:15:37 -0000 1.10
+++ openpkg-src/qt/qt.patch 3 May 2005 13:25:54 -0000 1.11
@@ -195,3 +195,154 @@
png_reset_crc(png_ptr);
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
if (png_memcmp(png_ptr->chunk_name, (png_bytep)png_IDAT, 4))
+Index: src/xml/qxml.cpp
+diff -Nau src/xml/qxml.cpp.orig src/xml/qxml.cpp
+--- src/xml/qxml.cpp.orig 2005-01-21 18:16:02.000000000 +0100
++++ src/xml/qxml.cpp 2005-05-03 14:48:42.080658900 +0200
+@@ -5999,38 +5999,38 @@
+ */
+ bool QXmlSimpleReader::parseChoiceSeq()
+ {
+- const signed char Init = 0;
+- const signed char Ws1 = 1; // eat whitespace
+- const signed char 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
+- const signed char Done = 6; //
+-
+- const signed char InpWs = 0; // S
+- const signed char InpOp = 1; // (
+- const signed char InpCp = 2; // )
+- const signed char InpQm = 3; // ?
+- const signed char InpAst = 4; // *
+- const signed char InpPlus = 5; // +
+- const signed char InpPipe = 6; // |
+- const signed char InpComm = 7; // ,
+- const signed char InpUnknown = 8;
++ const signed char Qt_Init = 0;
++ const signed char Qt_Ws1 = 1; // eat whitespace
++ const signed char Qt_CS = 2; // choice or set
++ const signed char Qt_Ws2 = 3; // eat whitespace
++ const signed char Qt_More = 4; // more cp to read
++ const signed char Qt_Name = 5; // read name
++ const signed char Qt_Done = 6; //
++
++ const signed char Qt_InpWs = 0; // S
++ const signed char Qt_InpOp = 1; // (
++ const signed char Qt_InpCp = 2; // )
++ const signed char Qt_InpQm = 3; // ?
++ const signed char Qt_InpAst = 4; // *
++ const signed char Qt_InpPlus = 5; // +
++ const signed char Qt_InpPipe = 6; // |
++ const signed char Qt_InpComm = 7; // ,
++ const signed char Qt_InpUnknown = 8;
+
+ 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, -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)
++ { -1, Qt_Ws1, -1, -1, -1, -1, -1, -1,
Qt_Name }, // Qt_Init
++ { -1, Qt_CS, -1, -1, -1, -1, -1, -1,
Qt_CS }, // Qt_Ws1
++ { Qt_Ws2, -1, Qt_Done, Qt_Ws2, Qt_Ws2, Qt_Ws2, Qt_More,
Qt_More, -1 }, // Qt_CS
++ { -1, -1, Qt_Done, -1, -1, -1, Qt_More, Qt_More,
-1 }, // Qt_Ws2
++ { -1, Qt_Ws1, -1, -1, -1, -1, -1, -1,
Qt_Name }, // More (same as Qt_Init)
++ { Qt_Ws2, -1, Qt_Done, Qt_Ws2, Qt_Ws2, Qt_Ws2, Qt_More,
Qt_More, -1 } // Name (same as Qt_CS)
+ };
+ signed char state;
+ signed char input;
+
+ if ( d->parseStack==0 || d->parseStack->isEmpty() ) {
+- state = Init;
++ state = Qt_Init;
+ } else {
+ state = d->parseStack->pop().state;
+ #if defined(QT_QXML_DEBUG)
+@@ -6053,7 +6053,7 @@
+
+ for (;;) {
+ switch ( state ) {
+- case Done:
++ case Qt_Done:
+ return TRUE;
+ case -1:
+ // Error
+@@ -6066,59 +6066,59 @@
+ return FALSE;
+ }
+ if ( is_S(c) ) {
+- input = InpWs;
++ input = Qt_InpWs;
+ } else if ( c.unicode() == '(' ) {
+- input = InpOp;
++ input = Qt_InpOp;
+ } else if ( c.unicode() == ')' ) {
+- input = InpCp;
++ input = Qt_InpCp;
+ } else if ( c.unicode() == '?' ) {
+- input = InpQm;
++ input = Qt_InpQm;
+ } else if ( c.unicode() == '*' ) {
+- input = InpAst;
++ input = Qt_InpAst;
+ } else if ( c.unicode() == '+' ) {
+- input = InpPlus;
++ input = Qt_InpPlus;
+ } else if ( c.unicode() == '|' ) {
+- input = InpPipe;
++ input = Qt_InpPipe;
+ } else if ( c.unicode() == ',' ) {
+- input = InpComm;
++ input = Qt_InpComm;
+ } else {
+- input = InpUnknown;
++ input = Qt_InpUnknown;
+ }
+ state = table[state][input];
+
+ switch ( state ) {
+- case Ws1:
++ case Qt_Ws1:
+ if ( !next_eat_ws() ) {
+ parseFailed( &QXmlSimpleReader::parseChoiceSeq, state );
+ return FALSE;
+ }
+ break;
+- case CS:
++ case Qt_CS:
+ if ( !parseChoiceSeq() ) {
+ parseFailed( &QXmlSimpleReader::parseChoiceSeq, state );
+ return FALSE;
+ }
+ break;
+- case Ws2:
++ case Qt_Ws2:
+ if ( !next_eat_ws() ) {
+ parseFailed( &QXmlSimpleReader::parseChoiceSeq, state );
+ return FALSE;
+ }
+ break;
+- case More:
++ case Qt_More:
+ if ( !next_eat_ws() ) {
+ parseFailed( &QXmlSimpleReader::parseChoiceSeq, state );
+ return FALSE;
+ }
+ break;
+- case Name:
++ case Qt_Name:
+ d->parseName_useRef = FALSE;
+ if ( !parseName() ) {
+ parseFailed( &QXmlSimpleReader::parseChoiceSeq, state );
+ return FALSE;
+ }
+ break;
+- case Done:
++ case Qt_Done:
+ next();
+ break;
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.118 -r1.119 qt.spec
--- openpkg-src/qt/qt.spec 24 Mar 2005 11:20:08 -0000 1.118
+++ openpkg-src/qt/qt.spec 3 May 2005 13:25:54 -0000 1.119
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 3.3.4
-Release: 20050323
+Release: 20050503
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
