johu 14/04/29 11:32:54 Added: kdevelop-pg-qt-1.0.0-bison3.patch Log: Revision bump adds upstream patch which fixes build with bison3 spotted by Lars Wendler <polynomia...@gentoo.org>, bug #486416. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Revision Changes Path 1.1 dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch?rev=1.1&content-type=text/plain Index: kdevelop-pg-qt-1.0.0-bison3.patch =================================================================== commit ac587957cd0cabbc668604507e2cfebb6810ed09 Author: Milian Wolff <m...@milianw.de> Date: Thu Nov 29 15:56:40 2012 +0100 fix some warnings diff --git a/kdev-pg/kdev-pg-code-gen.cpp b/kdev-pg/kdev-pg-code-gen.cpp index e06c6be..badb461 100644 --- a/kdev-pg/kdev-pg-code-gen.cpp +++ b/kdev-pg/kdev-pg-code-gen.cpp @@ -51,7 +51,7 @@ namespace KDevPG void generateCondition(const World::NodeSet& s, QTextStream& out) { - if(s.size() == 0 || s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0) + if(s.size() == 0 || (s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0)) { out << "true /*epsilon*/"; return; diff --git a/kdev-pg/kdev-pg-lexer.ll b/kdev-pg/kdev-pg-lexer.ll index a0864af..9261d71 100644 --- a/kdev-pg/kdev-pg-lexer.ll +++ b/kdev-pg/kdev-pg-lexer.ll @@ -425,7 +425,7 @@ void appendLineBuffer() strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */ /* strcpy is faster than strcat */ - Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng); + Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng)); lastTextLeng = strlen(yytext); yymoreFlag = false; diff --git a/kdev-pg/kdev-pg-parser.yy b/kdev-pg/kdev-pg-parser.yy index d5a25f5..8f8d604 100644 --- a/kdev-pg/kdev-pg-parser.yy +++ b/kdev-pg/kdev-pg-parser.yy @@ -309,7 +309,7 @@ opt_lexer_action | T_CONTINUE { r = "\nlxCONTINUE;\n"; } - | /* empty */ { r = "\nlxSKIP\n" } + | /* empty */ { r = "\nlxSKIP\n"; } ; regexp
