summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/files/bison-2.6.patch558
-rw-r--r--meta/recipes-sato/webkit/files/no-gtkdoc.patch20
-rw-r--r--meta/recipes-sato/webkit/files/nodolt.patch19
-rw-r--r--meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch62
-rw-r--r--meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch26
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch69
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch41
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb116
9 files changed, 0 insertions, 925 deletions
diff --git a/meta/recipes-sato/webkit/files/bison-2.6.patch b/meta/recipes-sato/webkit/files/bison-2.6.patch
deleted file mode 100644
index d4aa674217..0000000000
--- a/meta/recipes-sato/webkit/files/bison-2.6.patch
+++ /dev/null
@@ -1,558 +0,0 @@
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/files/no-gtkdoc.patch b/meta/recipes-sato/webkit/files/no-gtkdoc.patch
deleted file mode 100644
index 4eb09dc0e2..0000000000
--- a/meta/recipes-sato/webkit/files/no-gtkdoc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1make install invokes a gtk-doc tool without checking that we have gtk-doc.
2
3Signed-off-by: Ross Burton <ross.burton@intel.com>
4
5Upstream-Status: Pending (https://bugs.webkit.org/show_bug.cgi?id=91239)
6
7Index: webkit-1.8.1/Tools/GNUmakefile.am
8===================================================================
9--- webkit-1.8.1.orig/Tools/GNUmakefile.am
10+++ webkit-1.8.1/Tools/GNUmakefile.am
11@@ -330,7 +330,9 @@ if ENABLE_WEBKIT2
12 fi; \
13 fi
14 endif
15+if ENABLE_GTK_DOC
16 @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
17+endif
18
19 uninstall-local:
20 @DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
diff --git a/meta/recipes-sato/webkit/files/nodolt.patch b/meta/recipes-sato/webkit/files/nodolt.patch
deleted file mode 100644
index e713e8b5ec..0000000000
--- a/meta/recipes-sato/webkit/files/nodolt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Dolt cause build error on some platform, so disable it.
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4
5Upstream-Status: Inappropriate [configuration]
6
7Index: webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac
8===================================================================
9--- webkit-gtk-1.3.7+svnr72836-r72836-r0.orig/configure.ac 2011-01-21 11:11:07.000000000 +0800
10+++ webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac 2011-01-21 11:11:15.000000000 +0800
11@@ -82,8 +82,6 @@
12 AC_DISABLE_STATIC
13 AC_LIBTOOL_WIN32_DLL
14 AC_PROG_LIBTOOL
15-# use dolt to speedup the build
16-DOLT
17
18 AC_PATH_PROG(FLEX, flex)
19 if test -z "$FLEX"; then
diff --git a/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch b/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch
deleted file mode 100644
index ad7c55f264..0000000000
--- a/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1Upstream-Status: Pending
2
3automake 1.12 has deprecated use of mkdir_p, and it recommends
4use of MKDIR_P instead. Changed the code to avoid these kind
5of warning-errors.
6
7./.deps/DerivedSources
8make[1]: ./.deps/DerivedSources: Command not found
9make[1]: *** [all-local] Error 127
10
11Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
122012/07/10
13
14Index: webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am
15===================================================================
16--- webkit-gtk-1.7.2+svnr101488-r6.orig/GNUmakefile.am
17+++ webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am
18@@ -255,7 +255,7 @@ MAINTAINERCLEANFILES += \
19 # Older automake versions (1.7) place Plo files in a different place so we need
20 # to create the output directory manually.
21 all-local: stamp-po
22- $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
23+ $(MKDIR_P) $(top_builddir)/$(DEPDIR)/DerivedSources
24
25 # remove built sources and program directories
26 clean-local:
27Index: webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am
28===================================================================
29--- webkit-gtk-1.7.2+svnr101488-r6.orig/Source/WebKit/gtk/po/GNUmakefile.am
30+++ webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am
31@@ -132,13 +132,13 @@ DISTCLEANFILES += \
32 $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
33
34 po-install-data-local: all
35- $(mkdir_p) $(DESTDIR)$(datadir)
36+ $(MKDIR_P) $(DESTDIR)$(datadir)
37 @catalogs='$(MOFILES)'; \
38 for cat in $$catalogs; do \
39 cat=`basename $$cat`; \
40 lang=`echo $$cat | sed -e 's/\.mo$$//'`; \
41 dir=$(localedir)/$$lang/LC_MESSAGES; \
42- $(mkdir_p) $(DESTDIR)$$dir; \
43+ $(MKDIR_P) $(DESTDIR)$$dir; \
44 if test -r Source/WebKit/gtk/po/$$cat; then realcat=Source/WebKit/gtk/po/$$cat; else realcat=$(srcdir)/$$cat; fi; \
45 $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
46 echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
47@@ -173,13 +173,13 @@ po-install-data-local: all
48 done
49
50 po-installdirs-data-local:
51- $(mkdir_p) $(DESTDIR)$(datadir)
52+ $(MKDIR_P) $(DESTDIR)$(datadir)
53 @catalogs='$(MOFILES)'; \
54 for cat in $$catalogs; do \
55 cat=`basename $$cat`; \
56 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
57 dir=$(localedir)/$$lang/LC_MESSAGES; \
58- $(mkdir_p) $(DESTDIR)$$dir; \
59+ $(MKDIR_P) $(DESTDIR)$$dir; \
60 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
61 if test -n "$$lc"; then \
62 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff --git a/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch b/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch
deleted file mode 100644
index e7e908342a..0000000000
--- a/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1webkit-gtk: ANGLE doesn't build with bison 3
2
3Use %lex-param to set YYLEX_PARAM.
4
5Upstream-Status: Pending
6
7Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
8---
9 Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
13index ec1a85c..15723cc 100644
14--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
15+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
16@@ -32,6 +32,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
17 %expect 1 /* One shift reduce conflict because of if | else */
18 %pure-parser
19 %parse-param {TParseContext* context}
20+%lex-param {YYLEX_PARAM}
21
22 %union {
23 struct {
24--
251.9.1
26
diff --git a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch
deleted file mode 100644
index 5a42cd7c41..0000000000
--- a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From 4084d31d5b1fe3bf041881ad124873dbf3cd1868 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 17 May 2013 19:51:11 -0700
4Subject: [PATCH] Enable mips64 build
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Pending
8---
9 Source/JavaScriptCore/wtf/Platform.h | 2 +-
10 Source/JavaScriptCore/wtf/dtoa/utils.h | 2 +-
11 2 files changed, 2 insertions(+), 2 deletions(-)
12
13Index: webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h
14===================================================================
15--- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Platform.h 2012-08-20 09:30:25.000000000 -0700
16+++ webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:58:14.624055787 -0700
17@@ -76,14 +76,19 @@
18
19 /* CPU(MIPS) - MIPS 32-bit */
20 /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */
21-#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
22- && defined(_ABIO32)
23+#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \
24+ || defined(__mips64))
25+#if defined(__mips64)
26+#define WTF_CPU_MIPS64 1
27+#define WTF_MIPS_ARCH __mips64
28+#else
29 #define WTF_CPU_MIPS 1
30+#define WTF_MIPS_ARCH __mips
31+#endif
32 #if defined(__MIPSEB__)
33 #define WTF_CPU_BIG_ENDIAN 1
34 #endif
35 #define WTF_MIPS_PIC (defined __PIC__)
36-#define WTF_MIPS_ARCH __mips
37 #define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v)
38 #define WTF_MIPS_ISA_AT_LEAST(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH >= v)
39 #define WTF_MIPS_ARCH_REV __mips_isa_rev
40@@ -295,7 +300,7 @@
41
42 #endif /* ARM */
43
44-#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
45+#if CPU(ARM) || CPU(MIPS) || CPU(MIPS64) || CPU(SH4) || CPU(SPARC)
46 #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
47 #endif
48
49@@ -899,6 +904,7 @@
50 || CPU(ALPHA) \
51 || CPU(SPARC64) \
52 || CPU(S390X) \
53+ || CPU(MIPS64) \
54 || CPU(PPC64)
55 #define WTF_USE_JSVALUE64 1
56 #else
57Index: webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h
58===================================================================
59--- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2012-08-20 09:26:05.000000000 -0700
60+++ webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:57:22.424054793 -0700
61@@ -49,7 +49,7 @@
62 defined(__ARMEL__) || \
63 defined(_MIPS_ARCH_MIPS32R2)
64 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
65-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA)
66+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64)
67 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
68 #elif defined(_M_IX86) || defined(__i386__)
69 #if defined(_WIN32)
diff --git a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch
deleted file mode 100644
index a76b0ba2b6..0000000000
--- a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Upstream-Status: Pending
2Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
3Index: webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h
4===================================================================
5--- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:58:14.000000000 -0700
6+++ webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:59:18.764056782 -0700
7@@ -304,6 +304,11 @@
8 #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
9 #endif
10
11+/* CPU(AARCH64) - Aarch64 */
12+#if defined(__aarch64__)
13+#define WTF_CPU_AARCH64 1
14+#endif
15+
16 /* ==== OS() - underlying operating system; only to be used for mandated low-level services like
17 virtual memory, not to choose a GUI toolkit ==== */
18
19@@ -905,7 +910,8 @@
20 || CPU(SPARC64) \
21 || CPU(S390X) \
22 || CPU(MIPS64) \
23- || CPU(PPC64)
24+ || CPU(PPC64) \
25+ || CPU(AARCH64)
26 #define WTF_USE_JSVALUE64 1
27 #else
28 #define WTF_USE_JSVALUE32_64 1
29Index: webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h
30===================================================================
31--- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:57:22.000000000 -0700
32+++ webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:58:28.340056029 -0700
33@@ -49,7 +49,7 @@
34 defined(__ARMEL__) || \
35 defined(_MIPS_ARCH_MIPS32R2)
36 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
37-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64)
38+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(AARCH64)
39 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
40 #elif defined(_M_IX86) || defined(__i386__)
41 #if defined(_WIN32)
diff --git a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch
deleted file mode 100644
index d9e8444815..0000000000
--- a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Backport
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd webkit-1.8.3/configure.ac webkit-1.8.3/configure.ac
5--- webkit-1.8.3/configure.ac 2012-08-20 19:35:38.000000000 +0300
6+++ webkit-1.8.3/configure.ac 2013-02-08 11:55:28.403397789 +0200
7@@ -111,7 +111,6 @@
8
9 AC_PROG_CC
10 AC_PROG_CXX
11-AM_PROG_CC_STDC
12 AM_PROG_CC_C_O
13 AC_PROG_INSTALL
14 AC_SYS_LARGEFILE
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
deleted file mode 100644
index b9a9d7a002..0000000000
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
+++ /dev/null
@@ -1,116 +0,0 @@
1SUMMARY = "WebKit web rendering engine for the GTK+ platform"
2HOMEPAGE = "http://www.webkitgtk.org/"
3BUGTRACKER = "http://bugs.webkit.org/"
4
5LICENSE = "BSD & LGPLv2+"
6LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \
7 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
8 file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
9
10PR = "r1"
11
12# Choice of language backends - icu has issues on Big Endian machines so use pango
13ICU_LIB = "icu"
14ICU_LIB_powerpc = "pango"
15
16DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
17 gtk+ flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}"
18DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
19
20# The libxt requires x11 in DISTRO_FEATURES
21REQUIRED_DISTRO_FEATURES = "x11"
22
23SRC_URI = "\
24 http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \
25 file://nodolt.patch \
26 file://no-gtkdoc.patch \
27 file://webgit-gtk_fix_build_with_automake_1.12.patch \
28 file://bison-2.6.patch \
29 file://obsolete_automake_macros.patch \
30 file://0001-Enable-mips64-build.patch \
31 file://aarch64.patch \
32 file://webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch \
33 "
34
35SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6"
36SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7"
37
38# webkit-gtk can NOT be built on MIPS64 with n32 ABI
39COMPATIBLE_HOST_mips64n32 = "null"
40
41inherit autotools lib_package gtk-doc pkgconfig distro_features_check
42
43S = "${WORKDIR}/webkit-${PV}/"
44
45# Disabled by default because it pulls in obsolete gstreamer 0.10
46WEBKIT_AUDIOVIDEO ?= "--disable-video --disable-web-audio"
47
48EXTRA_OECONF = "\
49 --enable-debug=no \
50 --enable-svg \
51 --enable-icon-database=yes \
52 --enable-fullscreen-api \
53 --enable-image-resizer \
54 --enable-link-prefetch \
55 --with-gtk=2.0 \
56 --disable-geolocation \
57 ${WEBKIT_AUDIOVIDEO} \
58 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \
59 UNICODE_CFLAGS=-D_REENTRANT \
60 "
61EXTRA_OECONF_append_armv5 = " --disable-jit"
62EXTRA_OECONF_append_armv6 = " --disable-jit"
63
64#default unicode backend icu breaks in cross-compile when target and host are different endian type
65EXTRA_OECONF_append_powerpc = " --with-unicode-backend=glib"
66
67CPPFLAGS_append_powerpc = " -I${STAGING_INCDIR}/pango-1.0 \
68 -I${STAGING_LIBDIR}/glib-2.0/include \
69 -I${STAGING_INCDIR}/glib-2.0"
70
71# ld can run out of memory linking libwebkitgtk!
72#
73LDFLAGS += "-Wl,--no-keep-memory"
74
75EXTRA_AUTORECONF = " -I Source/autotools "
76
77
78#| ./Source/JavaScriptCore/heap/HandleTypes.h: In static member function 'static T* JSC::HandleTypes<T>::getFromSlot(JSC::HandleSlot) [with T = JSC::Structure, JSC::HandleTypes<T>::ExternalType = JSC::Structure*, JSC::HandleSlot = JSC::JSValue*]':
79#| ./Source/JavaScriptCore/heap/Handle.h:141:79: instantiated from 'JSC::Handle<T>::ExternalType JSC::Handle<T>::get() const [with T = JSC::Structure, JSC::Handle<T>::ExternalType = JSC::Structure*]'
80#| ./Source/JavaScriptCore/runtime/ScopeChain.h:39:75: instantiated from here
81#| ./Source/JavaScriptCore/heap/HandleTypes.h:38:130: warning: cast from 'JSC::JSCell*' to 'JSC::HandleTypes<JSC::Structure>::ExternalType {aka JSC::Structure*}' increases required alignment of target type [-Wcast-align]
82#| {standard input}: Assembler messages:
83#| {standard input}:28873: Error: invalid immediate: 983040 is out of range
84#| {standard input}:28873: Error: value of 983040 too large for field of 2 bytes at 15110
85#| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819
86#| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as)
87#| Please submit a full bug report,
88#| with preprocessed source if appropriate.
89#| See <http://gcc.gnu.org/bugs.html> for instructions.
90#| make[1]: *** [Source/JavaScriptCore/jit/libjavascriptcoregtk_1_0_la-JIT.lo] Error 1
91#| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0'
92ARM_INSTRUCTION_SET = "arm"
93
94CONFIGUREOPT_DEPTRACK = ""
95
96do_configure_append() {
97 # somethings wrong with icu, fix it up manually
98 for makefile in $(find ${B} -name "GNUmakefile") ; do
99 sed -i s:-I/usr/include::g $makefile
100 done
101}
102
103do_install_append() {
104 rmdir ${D}${libexecdir}
105}
106
107PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
108FILES_${PN}launcher = "${bindir}/GtkLauncher"
109FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
110FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*"
111FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/"
112FILES_${PN} += "${datadir}/webkitgtk-*/resources/error.html \
113 ${datadir}/webkitgtk-*/images \
114 ${datadir}/glib-2.0/schemas"
115
116
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 23:36:04 +0000