summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-12-27 16:15:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-31 09:43:26 +0000
commit4b5705c426743e812d6da25ff37c335e073bfb12 (patch)
tree49c6ffc4510c72febf58ce7626b56a0b78606696 /meta/recipes-sato
parent5c0e6603fd35028fec0a1fb65d94f89c4d19fbaf (diff)
downloadpoky-4b5705c426743e812d6da25ff37c335e073bfb12.tar.gz
webkit-gtk: fix build with bison-2.6+
* bison was upgraded to 2.7 in oe-core (From OE-Core rev: f116dc32240e2f2d3c6e9bc8bc3320862f5116d3) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/webkit/files/bison-2.6.patch558
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb3
2 files changed, 560 insertions, 1 deletions
diff --git a/meta/recipes-sato/webkit/files/bison-2.6.patch b/meta/recipes-sato/webkit/files/bison-2.6.patch
new file mode 100644
index 0000000000..d4aa674217
--- /dev/null
+++ b/meta/recipes-sato/webkit/files/bison-2.6.patch
@@ -0,0 +1,558 @@
1Upstream-Status: Backport
2http://trac.webkit.org/changeset/124099
3
4Subversion Revision: 123651
5diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y
6index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644
7--- a/Source/WebCore/css/CSSGrammar.y
8+++ b/Source/WebCore/css/CSSGrammar.y
9@@ -53,14 +53,13 @@ using namespace HTMLNames;
10 #define YYMAXDEPTH 10000
11 #define YYDEBUG 0
12
13-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
14-#define YYPARSE_PARAM parser
15-#define YYLEX_PARAM parser
16-
17 %}
18
19 %pure_parser
20
21+%parse-param { CSSParser* parser }
22+%lex-param { CSSParser* parser }
23+
24 %union {
25 bool boolean;
26 char character;
27@@ -89,7 +88,7 @@ using namespace HTMLNames;
28
29 %{
30
31-static inline int cssyyerror(const char*)
32+static inline int cssyyerror(void*, const char*)
33 {
34 return 1;
35 }
36diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
37index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644
38--- a/Source/WebCore/css/CSSParser.cpp
39+++ b/Source/WebCore/css/CSSParser.cpp
40@@ -114,7 +114,7 @@
41 extern int cssyydebug;
42 #endif
43
44-extern int cssyyparse(void* parser);
45+extern int cssyyparse(WebCore::CSSParser*);
46
47 using namespace std;
48 using namespace WTF;
49diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y
50index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644
51--- a/Source/WebCore/xml/XPathGrammar.y
52+++ b/Source/WebCore/xml/XPathGrammar.y
53@@ -34,6 +34,7 @@
54 #include "XPathParser.h"
55 #include "XPathPath.h"
56 #include "XPathPredicate.h"
57+#include "XPathStep.h"
58 #include "XPathVariableReference.h"
59 #include <wtf/FastMalloc.h>
60
61@@ -44,8 +45,6 @@
62 #define YYLTYPE_IS_TRIVIAL 1
63 #define YYDEBUG 0
64 #define YYMAXDEPTH 10000
65-#define YYPARSE_PARAM parserParameter
66-#define PARSER static_cast<Parser*>(parserParameter)
67
68 using namespace WebCore;
69 using namespace XPath;
70@@ -53,6 +52,7 @@ using namespace XPath;
71 %}
72
73 %pure_parser
74+%parse-param { WebCore::XPath::Parser* parser }
75
76 %union
77 {
78@@ -71,7 +71,7 @@ using namespace XPath;
79 %{
80
81 static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
82-static void xpathyyerror(const char*) { }
83+static void xpathyyerror(void*, const char*) { }
84
85 %}
86
87@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { }
88 Expr:
89 OrExpr
90 {
91- PARSER->m_topExpr = $1;
92+ parser->m_topExpr = $1;
93 }
94 ;
95
96@@ -138,7 +138,7 @@ AbsoluteLocationPath:
97 '/'
98 {
99 $$ = new LocationPath;
100- PARSER->registerParseNode($$);
101+ parser->registerParseNode($$);
102 }
103 |
104 '/' RelativeLocationPath
105@@ -150,7 +150,7 @@ AbsoluteLocationPath:
106 {
107 $$ = $2;
108 $$->insertFirstStep($1);
109- PARSER->unregisterParseNode($1);
110+ parser->unregisterParseNode($1);
111 }
112 ;
113
114@@ -159,22 +159,22 @@ RelativeLocationPath:
115 {
116 $$ = new LocationPath;
117 $$->appendStep($1);
118- PARSER->unregisterParseNode($1);
119- PARSER->registerParseNode($$);
120+ parser->unregisterParseNode($1);
121+ parser->registerParseNode($$);
122 }
123 |
124 RelativeLocationPath '/' Step
125 {
126 $$->appendStep($3);
127- PARSER->unregisterParseNode($3);
128+ parser->unregisterParseNode($3);
129 }
130 |
131 RelativeLocationPath DescendantOrSelf Step
132 {
133 $$->appendStep($2);
134 $$->appendStep($3);
135- PARSER->unregisterParseNode($2);
136- PARSER->unregisterParseNode($3);
137+ parser->unregisterParseNode($2);
138+ parser->unregisterParseNode($3);
139 }
140 ;
141
142@@ -183,58 +183,58 @@ Step:
143 {
144 if ($2) {
145 $$ = new Step(Step::ChildAxis, *$1, *$2);
146- PARSER->deletePredicateVector($2);
147+ parser->deletePredicateVector($2);
148 } else
149 $$ = new Step(Step::ChildAxis, *$1);
150- PARSER->deleteNodeTest($1);
151- PARSER->registerParseNode($$);
152+ parser->deleteNodeTest($1);
153+ parser->registerParseNode($$);
154 }
155 |
156 NAMETEST OptionalPredicateList
157 {
158 String localName;
159 String namespaceURI;
160- if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
161- PARSER->m_gotNamespaceError = true;
162+ if (!parser->expandQName(*$1, localName, namespaceURI)) {
163+ parser->m_gotNamespaceError = true;
164 YYABORT;
165 }
166
167 if ($2) {
168 $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
169- PARSER->deletePredicateVector($2);
170+ parser->deletePredicateVector($2);
171 } else
172 $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
173- PARSER->deleteString($1);
174- PARSER->registerParseNode($$);
175+ parser->deleteString($1);
176+ parser->registerParseNode($$);
177 }
178 |
179 AxisSpecifier NodeTest OptionalPredicateList
180 {
181 if ($3) {
182 $$ = new Step($1, *$2, *$3);
183- PARSER->deletePredicateVector($3);
184+ parser->deletePredicateVector($3);
185 } else
186 $$ = new Step($1, *$2);
187- PARSER->deleteNodeTest($2);
188- PARSER->registerParseNode($$);
189+ parser->deleteNodeTest($2);
190+ parser->registerParseNode($$);
191 }
192 |
193 AxisSpecifier NAMETEST OptionalPredicateList
194 {
195 String localName;
196 String namespaceURI;
197- if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
198- PARSER->m_gotNamespaceError = true;
199+ if (!parser->expandQName(*$2, localName, namespaceURI)) {
200+ parser->m_gotNamespaceError = true;
201 YYABORT;
202 }
203
204 if ($3) {
205 $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
206- PARSER->deletePredicateVector($3);
207+ parser->deletePredicateVector($3);
208 } else
209 $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
210- PARSER->deleteString($2);
211- PARSER->registerParseNode($$);
212+ parser->deleteString($2);
213+ parser->registerParseNode($$);
214 }
215 |
216 AbbreviatedStep
217@@ -259,23 +259,23 @@ NodeTest:
218 else if (*$1 == "comment")
219 $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
220
221- PARSER->deleteString($1);
222- PARSER->registerNodeTest($$);
223+ parser->deleteString($1);
224+ parser->registerNodeTest($$);
225 }
226 |
227 PI '(' ')'
228 {
229 $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
230- PARSER->deleteString($1);
231- PARSER->registerNodeTest($$);
232+ parser->deleteString($1);
233+ parser->registerNodeTest($$);
234 }
235 |
236 PI '(' LITERAL ')'
237 {
238 $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
239- PARSER->deleteString($1);
240- PARSER->deleteString($3);
241- PARSER->registerNodeTest($$);
242+ parser->deleteString($1);
243+ parser->deleteString($3);
244+ parser->registerNodeTest($$);
245 }
246 ;
247
248@@ -293,14 +293,14 @@ PredicateList:
249 {
250 $$ = new Vector<Predicate*>;
251 $$->append(new Predicate($1));
252- PARSER->unregisterParseNode($1);
253- PARSER->registerPredicateVector($$);
254+ parser->unregisterParseNode($1);
255+ parser->registerPredicateVector($$);
256 }
257 |
258 PredicateList Predicate
259 {
260 $$->append(new Predicate($2));
261- PARSER->unregisterParseNode($2);
262+ parser->unregisterParseNode($2);
263 }
264 ;
265
266@@ -315,7 +315,7 @@ DescendantOrSelf:
267 SLASHSLASH
268 {
269 $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
270- PARSER->registerParseNode($$);
271+ parser->registerParseNode($$);
272 }
273 ;
274
275@@ -323,13 +323,13 @@ AbbreviatedStep:
276 '.'
277 {
278 $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
279- PARSER->registerParseNode($$);
280+ parser->registerParseNode($$);
281 }
282 |
283 DOTDOT
284 {
285 $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
286- PARSER->registerParseNode($$);
287+ parser->registerParseNode($$);
288 }
289 ;
290
291@@ -337,8 +337,8 @@ PrimaryExpr:
292 VARIABLEREFERENCE
293 {
294 $$ = new VariableReference(*$1);
295- PARSER->deleteString($1);
296- PARSER->registerParseNode($$);
297+ parser->deleteString($1);
298+ parser->registerParseNode($$);
299 }
300 |
301 '(' Expr ')'
302@@ -349,15 +349,15 @@ PrimaryExpr:
303 LITERAL
304 {
305 $$ = new StringExpression(*$1);
306- PARSER->deleteString($1);
307- PARSER->registerParseNode($$);
308+ parser->deleteString($1);
309+ parser->registerParseNode($$);
310 }
311 |
312 NUMBER
313 {
314 $$ = new Number($1->toDouble());
315- PARSER->deleteString($1);
316- PARSER->registerParseNode($$);
317+ parser->deleteString($1);
318+ parser->registerParseNode($$);
319 }
320 |
321 FunctionCall
322@@ -369,8 +369,8 @@ FunctionCall:
323 $$ = createFunction(*$1);
324 if (!$$)
325 YYABORT;
326- PARSER->deleteString($1);
327- PARSER->registerParseNode($$);
328+ parser->deleteString($1);
329+ parser->registerParseNode($$);
330 }
331 |
332 FUNCTIONNAME '(' ArgumentList ')'
333@@ -378,9 +378,9 @@ FunctionCall:
334 $$ = createFunction(*$1, *$3);
335 if (!$$)
336 YYABORT;
337- PARSER->deleteString($1);
338- PARSER->deleteExpressionVector($3);
339- PARSER->registerParseNode($$);
340+ parser->deleteString($1);
341+ parser->deleteExpressionVector($3);
342+ parser->registerParseNode($$);
343 }
344 ;
345
346@@ -389,14 +389,14 @@ ArgumentList:
347 {
348 $$ = new Vector<Expression*>;
349 $$->append($1);
350- PARSER->unregisterParseNode($1);
351- PARSER->registerExpressionVector($$);
352+ parser->unregisterParseNode($1);
353+ parser->registerExpressionVector($$);
354 }
355 |
356 ArgumentList ',' Argument
357 {
358 $$->append($3);
359- PARSER->unregisterParseNode($3);
360+ parser->unregisterParseNode($3);
361 }
362 ;
363
364@@ -412,9 +412,9 @@ UnionExpr:
365 $$ = new Union;
366 $$->addSubExpression($1);
367 $$->addSubExpression($3);
368- PARSER->unregisterParseNode($1);
369- PARSER->unregisterParseNode($3);
370- PARSER->registerParseNode($$);
371+ parser->unregisterParseNode($1);
372+ parser->unregisterParseNode($3);
373+ parser->registerParseNode($$);
374 }
375 ;
376
377@@ -430,9 +430,9 @@ PathExpr:
378 {
379 $3->setAbsolute(true);
380 $$ = new Path(static_cast<Filter*>($1), $3);
381- PARSER->unregisterParseNode($1);
382- PARSER->unregisterParseNode($3);
383- PARSER->registerParseNode($$);
384+ parser->unregisterParseNode($1);
385+ parser->unregisterParseNode($3);
386+ parser->registerParseNode($$);
387 }
388 |
389 FilterExpr DescendantOrSelf RelativeLocationPath
390@@ -440,10 +440,10 @@ PathExpr:
391 $3->insertFirstStep($2);
392 $3->setAbsolute(true);
393 $$ = new Path(static_cast<Filter*>($1), $3);
394- PARSER->unregisterParseNode($1);
395- PARSER->unregisterParseNode($2);
396- PARSER->unregisterParseNode($3);
397- PARSER->registerParseNode($$);
398+ parser->unregisterParseNode($1);
399+ parser->unregisterParseNode($2);
400+ parser->unregisterParseNode($3);
401+ parser->registerParseNode($$);
402 }
403 ;
404
405@@ -453,9 +453,9 @@ FilterExpr:
406 PrimaryExpr PredicateList
407 {
408 $$ = new Filter($1, *$2);
409- PARSER->unregisterParseNode($1);
410- PARSER->deletePredicateVector($2);
411- PARSER->registerParseNode($$);
412+ parser->unregisterParseNode($1);
413+ parser->deletePredicateVector($2);
414+ parser->registerParseNode($$);
415 }
416 ;
417
418@@ -465,9 +465,9 @@ OrExpr:
419 OrExpr OR AndExpr
420 {
421 $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
422- PARSER->unregisterParseNode($1);
423- PARSER->unregisterParseNode($3);
424- PARSER->registerParseNode($$);
425+ parser->unregisterParseNode($1);
426+ parser->unregisterParseNode($3);
427+ parser->registerParseNode($$);
428 }
429 ;
430
431@@ -477,9 +477,9 @@ AndExpr:
432 AndExpr AND EqualityExpr
433 {
434 $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
435- PARSER->unregisterParseNode($1);
436- PARSER->unregisterParseNode($3);
437- PARSER->registerParseNode($$);
438+ parser->unregisterParseNode($1);
439+ parser->unregisterParseNode($3);
440+ parser->registerParseNode($$);
441 }
442 ;
443
444@@ -489,9 +489,9 @@ EqualityExpr:
445 EqualityExpr EQOP RelationalExpr
446 {
447 $$ = new EqTestOp($2, $1, $3);
448- PARSER->unregisterParseNode($1);
449- PARSER->unregisterParseNode($3);
450- PARSER->registerParseNode($$);
451+ parser->unregisterParseNode($1);
452+ parser->unregisterParseNode($3);
453+ parser->registerParseNode($$);
454 }
455 ;
456
457@@ -501,9 +501,9 @@ RelationalExpr:
458 RelationalExpr RELOP AdditiveExpr
459 {
460 $$ = new EqTestOp($2, $1, $3);
461- PARSER->unregisterParseNode($1);
462- PARSER->unregisterParseNode($3);
463- PARSER->registerParseNode($$);
464+ parser->unregisterParseNode($1);
465+ parser->unregisterParseNode($3);
466+ parser->registerParseNode($$);
467 }
468 ;
469
470@@ -513,17 +513,17 @@ AdditiveExpr:
471 AdditiveExpr PLUS MultiplicativeExpr
472 {
473 $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
474- PARSER->unregisterParseNode($1);
475- PARSER->unregisterParseNode($3);
476- PARSER->registerParseNode($$);
477+ parser->unregisterParseNode($1);
478+ parser->unregisterParseNode($3);
479+ parser->registerParseNode($$);
480 }
481 |
482 AdditiveExpr MINUS MultiplicativeExpr
483 {
484 $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
485- PARSER->unregisterParseNode($1);
486- PARSER->unregisterParseNode($3);
487- PARSER->registerParseNode($$);
488+ parser->unregisterParseNode($1);
489+ parser->unregisterParseNode($3);
490+ parser->registerParseNode($$);
491 }
492 ;
493
494@@ -533,9 +533,9 @@ MultiplicativeExpr:
495 MultiplicativeExpr MULOP UnaryExpr
496 {
497 $$ = new NumericOp($2, $1, $3);
498- PARSER->unregisterParseNode($1);
499- PARSER->unregisterParseNode($3);
500- PARSER->registerParseNode($$);
501+ parser->unregisterParseNode($1);
502+ parser->unregisterParseNode($3);
503+ parser->registerParseNode($$);
504 }
505 ;
506
507@@ -546,8 +546,8 @@ UnaryExpr:
508 {
509 $$ = new Negative;
510 $$->addSubExpression($2);
511- PARSER->unregisterParseNode($2);
512- PARSER->registerParseNode($$);
513+ parser->unregisterParseNode($2);
514+ parser->registerParseNode($$);
515 }
516 ;
517
518diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp
519index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644
520--- a/Source/WebCore/xml/XPathParser.cpp
521+++ b/Source/WebCore/xml/XPathParser.cpp
522@@ -32,24 +32,21 @@
523 #include "XPathEvaluator.h"
524 #include "XPathException.h"
525 #include "XPathNSResolver.h"
526+#include "XPathPath.h"
527 #include "XPathStep.h"
528 #include <wtf/StdLibExtras.h>
529 #include <wtf/text/StringHash.h>
530
531-int xpathyyparse(void*);
532-
533+using namespace WebCore;
534 using namespace WTF;
535 using namespace Unicode;
536+using namespace XPath;
537
538-namespace WebCore {
539-namespace XPath {
540-
541-class LocationPath;
542-
543-#include "XPathGrammar.h"
544+extern int xpathyyparse(WebCore::XPath::Parser*);
545+#include "XPathGrammar.h"
546
547 Parser* Parser::currentParser = 0;
548-
549+
550 enum XMLCat { NameStart, NameCont, NotPartOfName };
551
552 typedef HashMap<String, Step::Axis> AxisNamesMap;
553@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t)
554 delete t;
555 }
556
557-}
558-}
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
index bba9a80bad..1789d4d3e0 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
7 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ 7 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
8 file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" 8 file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
9 9
10PR = "r2" 10PR = "r3"
11 11
12# Choice of language backends - icu has issues on Big Endian machines so use pango 12# Choice of language backends - icu has issues on Big Endian machines so use pango
13ICU_LIB = "icu" 13ICU_LIB = "icu"
@@ -22,6 +22,7 @@ SRC_URI = "\
22 file://nodolt.patch \ 22 file://nodolt.patch \
23 file://no-gtkdoc.patch \ 23 file://no-gtkdoc.patch \
24 file://webgit-gtk_fix_build_with_automake_1.12.patch \ 24 file://webgit-gtk_fix_build_with_automake_1.12.patch \
25 file://bison-2.6.patch \
25 " 26 "
26 27
27SRC_URI[md5sum] = "f7bd0bd4f323039f15e19c82a9a8313c" 28SRC_URI[md5sum] = "f7bd0bd4f323039f15e19c82a9a8313c"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-04 10:10:53 +0000