| 1 |
johu 14/04/29 11:32:54 |
| 2 |
|
| 3 |
Added: kdevelop-pg-qt-1.0.0-bison3.patch |
| 4 |
Log: |
| 5 |
Revision bump adds upstream patch which fixes build with bison3 spotted by Lars Wendler <polynomial-c@g.o>, bug #486416. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: kdevelop-pg-qt-1.0.0-bison3.patch |
| 16 |
=================================================================== |
| 17 |
commit ac587957cd0cabbc668604507e2cfebb6810ed09 |
| 18 |
Author: Milian Wolff <mail@×××××××.de> |
| 19 |
Date: Thu Nov 29 15:56:40 2012 +0100 |
| 20 |
|
| 21 |
fix some warnings |
| 22 |
|
| 23 |
diff --git a/kdev-pg/kdev-pg-code-gen.cpp b/kdev-pg/kdev-pg-code-gen.cpp |
| 24 |
index e06c6be..badb461 100644 |
| 25 |
--- a/kdev-pg/kdev-pg-code-gen.cpp |
| 26 |
+++ b/kdev-pg/kdev-pg-code-gen.cpp |
| 27 |
@@ -51,7 +51,7 @@ namespace KDevPG |
| 28 |
|
| 29 |
void generateCondition(const World::NodeSet& s, QTextStream& out) |
| 30 |
{ |
| 31 |
- if(s.size() == 0 || s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0) |
| 32 |
+ if(s.size() == 0 || (s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0)) |
| 33 |
{ |
| 34 |
out << "true /*epsilon*/"; |
| 35 |
return; |
| 36 |
diff --git a/kdev-pg/kdev-pg-lexer.ll b/kdev-pg/kdev-pg-lexer.ll |
| 37 |
index a0864af..9261d71 100644 |
| 38 |
--- a/kdev-pg/kdev-pg-lexer.ll |
| 39 |
+++ b/kdev-pg/kdev-pg-lexer.ll |
| 40 |
@@ -425,7 +425,7 @@ void appendLineBuffer() |
| 41 |
strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */ |
| 42 |
/* strcpy is faster than strcat */ |
| 43 |
|
| 44 |
- Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng); |
| 45 |
+ Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng)); |
| 46 |
|
| 47 |
lastTextLeng = strlen(yytext); |
| 48 |
yymoreFlag = false; |
| 49 |
diff --git a/kdev-pg/kdev-pg-parser.yy b/kdev-pg/kdev-pg-parser.yy |
| 50 |
index d5a25f5..8f8d604 100644 |
| 51 |
--- a/kdev-pg/kdev-pg-parser.yy |
| 52 |
+++ b/kdev-pg/kdev-pg-parser.yy |
| 53 |
@@ -309,7 +309,7 @@ opt_lexer_action |
| 54 |
| T_CONTINUE { |
| 55 |
r = "\nlxCONTINUE;\n"; |
| 56 |
} |
| 57 |
- | /* empty */ { r = "\nlxSKIP\n" } |
| 58 |
+ | /* empty */ { r = "\nlxSKIP\n"; } |
| 59 |
; |
| 60 |
|
| 61 |
regexp |
Archives