wok-next rev 20360
libwebkit: add GtkClickCounter.patch
line diff
1.1 --- a/claws-mail/receipt Thu Nov 23 12:57:31 2017 +0200 1.2 +++ b/claws-mail/receipt Thu Nov 23 17:20:44 2017 +0100 1.3 @@ -16,7 +16,7 @@ 1.4 xorg-libXrandr-dev xorg-libXcursor-dev xorg-libXcomposite-dev \ 1.5 xorg-libXdamage-dev libxslt-dev xorg-libXt-dev util-linux-uuid-dev \ 1.6 python-dev pygtk-dev libarchive-dev attr-dev acl-dev liblzma-dev poppler-dev lcms-dev \ 1.7 -ghostscript-dev libgnome-keyring-dev dbus-dev" 1.8 +ghostscript-dev libgnome-keyring-dev dbus-dev lcms2-dev perl-dev" 1.9 SPLIT="claws-mail-acpinotifier claws-mail-addresskeeper claws-mail-archive \ 1.10 claws-mail-attachwarner claws-mail-attremover claws-mail-bsfilter \ 1.11 claws-mail-clamd claws-mail-dev claws-mail-fancy claws-mail-fetchinfo \
2.1 --- a/libwebkit-video/receipt Thu Nov 23 12:57:31 2017 +0200 2.2 +++ b/libwebkit-video/receipt Thu Nov 23 17:20:44 2017 +0100 2.3 @@ -25,12 +25,6 @@ 2.4 { 2.5 # libwebkit does not like parallel builds. 2.6 export MAKEFLAGS=$(echo $MAKEFLAGS | sed 's/-j[0-9]*/-j1/') 2.7 - # Build fix with newer bison 2.6 2.8 - for file_diff in $stuff/*.diff; do 2.9 - echo -n "Applying patch $(basename $file_diff)" 2.10 - patch -Np1 -i $file_diff > /dev/null 2.11 - status 2.12 - done 2.13 touch Documentation/webkitgtk/version.xml 2.14 # Build 2.15 ./configure \
3.1 --- a/libwebkit-video/stuff/README Thu Nov 23 12:57:31 2017 +0200 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,2 +0,0 @@ 3.4 -Upstream patches for building webkit gtk with newer bison 2.6, see: 3.5 -http://trac.webkit.org/changeset/124099 3.6 \ No newline at end of file
4.1 --- a/libwebkit-video/stuff/WebCore_ChangeLog_124099.diff Thu Nov 23 12:57:31 2017 +0200 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,32 +0,0 @@ 4.4 -Index: trunk/Source/WebCore/ChangeLog 4.5 -=================================================================== 4.6 ---- trunk/Source/WebCore/ChangeLog (revision 124098) 4.7 -+++ trunk/Source/WebCore/ChangeLog (revision 124099) 4.8 -@@ -1,2 +1,27 @@ 4.9 -+2012-07-30 Alexis Menard <alexis.menard@openbossa.org> 4.10 -+ 4.11 -+ Build fix with newer bison 2.6. 4.12 -+ https://bugs.webkit.org/show_bug.cgi?id=92264 4.13 -+ 4.14 -+ Reviewed by Adam Barth. 4.15 -+ 4.16 -+ As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html 4.17 -+ YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS 4.18 -+ version I had access to as well as recent Linux runs at least version 2.3 so it's safe 4.19 -+ to use the replacement of these deprecated macros in favor of %lex-param and %parse-param. 4.20 -+ As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release 4.21 -+ of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore. 4.22 -+ 4.23 -+ No new tests : build fix and the patch should not trigger any regressions 4.24 -+ 4.25 -+ * css/CSSGrammar.y: 4.26 -+ * css/CSSParser.cpp: 4.27 -+ * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define. 4.28 -+ * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h 4.29 -+ therefore including this file within the namespace {} declarations leads to xpathyyparse being 4.30 -+ defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp 4.31 -+ (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 4.32 -+ to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same. 4.33 -+ 4.34 - 2012-07-30 Sadrul Habib Chowdhury <sadrul@chromium.org> 4.35 -
5.1 --- a/libwebkit-video/stuff/WebCore_css_CSSGrammar.y_124099.diff Thu Nov 23 12:57:31 2017 +0200 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,26 +0,0 @@ 5.4 -Index: trunk/Source/WebCore/css/CSSGrammar.y 5.5 -=================================================================== 5.6 ---- trunk/Source/WebCore/css/CSSGrammar.y (revision 121874) 5.7 -+++ trunk/Source/WebCore/css/CSSGrammar.y (revision 124099) 5.8 -@@ -54,11 +54,10 @@ 5.9 - #define YYDEBUG 0 5.10 - 5.11 --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x 5.12 --#define YYPARSE_PARAM parser 5.13 --#define YYLEX_PARAM parser 5.14 -- 5.15 - %} 5.16 - 5.17 - %pure_parser 5.18 -+ 5.19 -+%parse-param { CSSParser* parser } 5.20 -+%lex-param { CSSParser* parser } 5.21 - 5.22 - %union { 5.23 -@@ -90,5 +89,5 @@ 5.24 - %{ 5.25 - 5.26 --static inline int cssyyerror(const char*) 5.27 -+static inline int cssyyerror(void*, const char*) 5.28 - { 5.29 - return 1;
6.1 --- a/libwebkit-video/stuff/WebCore_css_CSSParser.cpp_124099.diff Thu Nov 23 12:57:31 2017 +0200 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,11 +0,0 @@ 6.4 -Index: trunk/Source/WebCore/css/CSSParser.cpp 6.5 -=================================================================== 6.6 ---- trunk/Source/WebCore/css/CSSParser.cpp (revision 123746) 6.7 -+++ trunk/Source/WebCore/css/CSSParser.cpp (revision 124099) 6.8 -@@ -115,5 +115,5 @@ 6.9 - #endif 6.10 - 6.11 --extern int cssyyparse(void* parser); 6.12 -+extern int cssyyparse(WebCore::CSSParser*); 6.13 - 6.14 - using namespace std;
7.1 --- a/libwebkit-video/stuff/WebCore_xml_XPathGrammar.y_124099.diff Thu Nov 23 12:57:31 2017 +0200 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,407 +0,0 @@ 7.4 -Index: trunk/Source/WebCore/xml/XPathGrammar.y 7.5 -=================================================================== 7.6 ---- trunk/Source/WebCore/xml/XPathGrammar.y (revision 97771) 7.7 -+++ trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099) 7.8 -@@ -35,4 +35,5 @@ 7.9 - #include "XPathPath.h" 7.10 - #include "XPathPredicate.h" 7.11 -+#include "XPathStep.h" 7.12 - #include "XPathVariableReference.h" 7.13 - #include <wtf/FastMalloc.h> 7.14 -@@ -45,6 +46,4 @@ 7.15 - #define YYDEBUG 0 7.16 - #define YYMAXDEPTH 10000 7.17 --#define YYPARSE_PARAM parserParameter 7.18 --#define PARSER static_cast<Parser*>(parserParameter) 7.19 - 7.20 - using namespace WebCore; 7.21 -@@ -54,4 +53,5 @@ 7.22 - 7.23 - %pure_parser 7.24 -+%parse-param { WebCore::XPath::Parser* parser } 7.25 - 7.26 - %union 7.27 -@@ -72,5 +72,5 @@ 7.28 - 7.29 - static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } 7.30 --static void xpathyyerror(const char*) { } 7.31 -+static void xpathyyerror(void*, const char*) { } 7.32 - 7.33 - %} 7.34 -@@ -119,5 +119,5 @@ 7.35 - OrExpr 7.36 - { 7.37 -- PARSER->m_topExpr = $1; 7.38 -+ parser->m_topExpr = $1; 7.39 - } 7.40 - ; 7.41 -@@ -139,5 +139,5 @@ 7.42 - { 7.43 - $$ = new LocationPath; 7.44 -- PARSER->registerParseNode($$); 7.45 -+ parser->registerParseNode($$); 7.46 - } 7.47 - | 7.48 -@@ -151,5 +151,5 @@ 7.49 - $$ = $2; 7.50 - $$->insertFirstStep($1); 7.51 -- PARSER->unregisterParseNode($1); 7.52 -+ parser->unregisterParseNode($1); 7.53 - } 7.54 - ; 7.55 -@@ -160,6 +160,6 @@ 7.56 - $$ = new LocationPath; 7.57 - $$->appendStep($1); 7.58 -- PARSER->unregisterParseNode($1); 7.59 -- PARSER->registerParseNode($$); 7.60 -+ parser->unregisterParseNode($1); 7.61 -+ parser->registerParseNode($$); 7.62 - } 7.63 - | 7.64 -@@ -167,5 +167,5 @@ 7.65 - { 7.66 - $$->appendStep($3); 7.67 -- PARSER->unregisterParseNode($3); 7.68 -+ parser->unregisterParseNode($3); 7.69 - } 7.70 - | 7.71 -@@ -174,6 +174,6 @@ 7.72 - $$->appendStep($2); 7.73 - $$->appendStep($3); 7.74 -- PARSER->unregisterParseNode($2); 7.75 -- PARSER->unregisterParseNode($3); 7.76 -+ parser->unregisterParseNode($2); 7.77 -+ parser->unregisterParseNode($3); 7.78 - } 7.79 - ; 7.80 -@@ -184,9 +184,9 @@ 7.81 - if ($2) { 7.82 - $$ = new Step(Step::ChildAxis, *$1, *$2); 7.83 -- PARSER->deletePredicateVector($2); 7.84 -+ parser->deletePredicateVector($2); 7.85 - } else 7.86 - $$ = new Step(Step::ChildAxis, *$1); 7.87 -- PARSER->deleteNodeTest($1); 7.88 -- PARSER->registerParseNode($$); 7.89 -+ parser->deleteNodeTest($1); 7.90 -+ parser->registerParseNode($$); 7.91 - } 7.92 - | 7.93 -@@ -195,6 +195,6 @@ 7.94 - String localName; 7.95 - String namespaceURI; 7.96 -- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { 7.97 -- PARSER->m_gotNamespaceError = true; 7.98 -+ if (!parser->expandQName(*$1, localName, namespaceURI)) { 7.99 -+ parser->m_gotNamespaceError = true; 7.100 - YYABORT; 7.101 - } 7.102 -@@ -202,9 +202,9 @@ 7.103 - if ($2) { 7.104 - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); 7.105 -- PARSER->deletePredicateVector($2); 7.106 -+ parser->deletePredicateVector($2); 7.107 - } else 7.108 - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 7.109 -- PARSER->deleteString($1); 7.110 -- PARSER->registerParseNode($$); 7.111 -+ parser->deleteString($1); 7.112 -+ parser->registerParseNode($$); 7.113 - } 7.114 - | 7.115 -@@ -213,9 +213,9 @@ 7.116 - if ($3) { 7.117 - $$ = new Step($1, *$2, *$3); 7.118 -- PARSER->deletePredicateVector($3); 7.119 -+ parser->deletePredicateVector($3); 7.120 - } else 7.121 - $$ = new Step($1, *$2); 7.122 -- PARSER->deleteNodeTest($2); 7.123 -- PARSER->registerParseNode($$); 7.124 -+ parser->deleteNodeTest($2); 7.125 -+ parser->registerParseNode($$); 7.126 - } 7.127 - | 7.128 -@@ -224,6 +224,6 @@ 7.129 - String localName; 7.130 - String namespaceURI; 7.131 -- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { 7.132 -- PARSER->m_gotNamespaceError = true; 7.133 -+ if (!parser->expandQName(*$2, localName, namespaceURI)) { 7.134 -+ parser->m_gotNamespaceError = true; 7.135 - YYABORT; 7.136 - } 7.137 -@@ -231,9 +231,9 @@ 7.138 - if ($3) { 7.139 - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); 7.140 -- PARSER->deletePredicateVector($3); 7.141 -+ parser->deletePredicateVector($3); 7.142 - } else 7.143 - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 7.144 -- PARSER->deleteString($2); 7.145 -- PARSER->registerParseNode($$); 7.146 -+ parser->deleteString($2); 7.147 -+ parser->registerParseNode($$); 7.148 - } 7.149 - | 7.150 -@@ -260,6 +260,6 @@ 7.151 - $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); 7.152 - 7.153 -- PARSER->deleteString($1); 7.154 -- PARSER->registerNodeTest($$); 7.155 -+ parser->deleteString($1); 7.156 -+ parser->registerNodeTest($$); 7.157 - } 7.158 - | 7.159 -@@ -267,6 +267,6 @@ 7.160 - { 7.161 - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); 7.162 -- PARSER->deleteString($1); 7.163 -- PARSER->registerNodeTest($$); 7.164 -+ parser->deleteString($1); 7.165 -+ parser->registerNodeTest($$); 7.166 - } 7.167 - | 7.168 -@@ -274,7 +274,7 @@ 7.169 - { 7.170 - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); 7.171 -- PARSER->deleteString($1); 7.172 -- PARSER->deleteString($3); 7.173 -- PARSER->registerNodeTest($$); 7.174 -+ parser->deleteString($1); 7.175 -+ parser->deleteString($3); 7.176 -+ parser->registerNodeTest($$); 7.177 - } 7.178 - ; 7.179 -@@ -294,6 +294,6 @@ 7.180 - $$ = new Vector<Predicate*>; 7.181 - $$->append(new Predicate($1)); 7.182 -- PARSER->unregisterParseNode($1); 7.183 -- PARSER->registerPredicateVector($$); 7.184 -+ parser->unregisterParseNode($1); 7.185 -+ parser->registerPredicateVector($$); 7.186 - } 7.187 - | 7.188 -@@ -301,5 +301,5 @@ 7.189 - { 7.190 - $$->append(new Predicate($2)); 7.191 -- PARSER->unregisterParseNode($2); 7.192 -+ parser->unregisterParseNode($2); 7.193 - } 7.194 - ; 7.195 -@@ -316,5 +316,5 @@ 7.196 - { 7.197 - $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 7.198 -- PARSER->registerParseNode($$); 7.199 -+ parser->registerParseNode($$); 7.200 - } 7.201 - ; 7.202 -@@ -324,5 +324,5 @@ 7.203 - { 7.204 - $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 7.205 -- PARSER->registerParseNode($$); 7.206 -+ parser->registerParseNode($$); 7.207 - } 7.208 - | 7.209 -@@ -330,5 +330,5 @@ 7.210 - { 7.211 - $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 7.212 -- PARSER->registerParseNode($$); 7.213 -+ parser->registerParseNode($$); 7.214 - } 7.215 - ; 7.216 -@@ -338,6 +338,6 @@ 7.217 - { 7.218 - $$ = new VariableReference(*$1); 7.219 -- PARSER->deleteString($1); 7.220 -- PARSER->registerParseNode($$); 7.221 -+ parser->deleteString($1); 7.222 -+ parser->registerParseNode($$); 7.223 - } 7.224 - | 7.225 -@@ -350,6 +350,6 @@ 7.226 - { 7.227 - $$ = new StringExpression(*$1); 7.228 -- PARSER->deleteString($1); 7.229 -- PARSER->registerParseNode($$); 7.230 -+ parser->deleteString($1); 7.231 -+ parser->registerParseNode($$); 7.232 - } 7.233 - | 7.234 -@@ -357,6 +357,6 @@ 7.235 - { 7.236 - $$ = new Number($1->toDouble()); 7.237 -- PARSER->deleteString($1); 7.238 -- PARSER->registerParseNode($$); 7.239 -+ parser->deleteString($1); 7.240 -+ parser->registerParseNode($$); 7.241 - } 7.242 - | 7.243 -@@ -370,6 +370,6 @@ 7.244 - if (!$$) 7.245 - YYABORT; 7.246 -- PARSER->deleteString($1); 7.247 -- PARSER->registerParseNode($$); 7.248 -+ parser->deleteString($1); 7.249 -+ parser->registerParseNode($$); 7.250 - } 7.251 - | 7.252 -@@ -379,7 +379,7 @@ 7.253 - if (!$$) 7.254 - YYABORT; 7.255 -- PARSER->deleteString($1); 7.256 -- PARSER->deleteExpressionVector($3); 7.257 -- PARSER->registerParseNode($$); 7.258 -+ parser->deleteString($1); 7.259 -+ parser->deleteExpressionVector($3); 7.260 -+ parser->registerParseNode($$); 7.261 - } 7.262 - ; 7.263 -@@ -390,6 +390,6 @@ 7.264 - $$ = new Vector<Expression*>; 7.265 - $$->append($1); 7.266 -- PARSER->unregisterParseNode($1); 7.267 -- PARSER->registerExpressionVector($$); 7.268 -+ parser->unregisterParseNode($1); 7.269 -+ parser->registerExpressionVector($$); 7.270 - } 7.271 - | 7.272 -@@ -397,5 +397,5 @@ 7.273 - { 7.274 - $$->append($3); 7.275 -- PARSER->unregisterParseNode($3); 7.276 -+ parser->unregisterParseNode($3); 7.277 - } 7.278 - ; 7.279 -@@ -413,7 +413,7 @@ 7.280 - $$->addSubExpression($1); 7.281 - $$->addSubExpression($3); 7.282 -- PARSER->unregisterParseNode($1); 7.283 -- PARSER->unregisterParseNode($3); 7.284 -- PARSER->registerParseNode($$); 7.285 -+ parser->unregisterParseNode($1); 7.286 -+ parser->unregisterParseNode($3); 7.287 -+ parser->registerParseNode($$); 7.288 - } 7.289 - ; 7.290 -@@ -431,7 +431,7 @@ 7.291 - $3->setAbsolute(true); 7.292 - $$ = new Path(static_cast<Filter*>($1), $3); 7.293 -- PARSER->unregisterParseNode($1); 7.294 -- PARSER->unregisterParseNode($3); 7.295 -- PARSER->registerParseNode($$); 7.296 -+ parser->unregisterParseNode($1); 7.297 -+ parser->unregisterParseNode($3); 7.298 -+ parser->registerParseNode($$); 7.299 - } 7.300 - | 7.301 -@@ -441,8 +441,8 @@ 7.302 - $3->setAbsolute(true); 7.303 - $$ = new Path(static_cast<Filter*>($1), $3); 7.304 -- PARSER->unregisterParseNode($1); 7.305 -- PARSER->unregisterParseNode($2); 7.306 -- PARSER->unregisterParseNode($3); 7.307 -- PARSER->registerParseNode($$); 7.308 -+ parser->unregisterParseNode($1); 7.309 -+ parser->unregisterParseNode($2); 7.310 -+ parser->unregisterParseNode($3); 7.311 -+ parser->registerParseNode($$); 7.312 - } 7.313 - ; 7.314 -@@ -454,7 +454,7 @@ 7.315 - { 7.316 - $$ = new Filter($1, *$2); 7.317 -- PARSER->unregisterParseNode($1); 7.318 -- PARSER->deletePredicateVector($2); 7.319 -- PARSER->registerParseNode($$); 7.320 -+ parser->unregisterParseNode($1); 7.321 -+ parser->deletePredicateVector($2); 7.322 -+ parser->registerParseNode($$); 7.323 - } 7.324 - ; 7.325 -@@ -466,7 +466,7 @@ 7.326 - { 7.327 - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); 7.328 -- PARSER->unregisterParseNode($1); 7.329 -- PARSER->unregisterParseNode($3); 7.330 -- PARSER->registerParseNode($$); 7.331 -+ parser->unregisterParseNode($1); 7.332 -+ parser->unregisterParseNode($3); 7.333 -+ parser->registerParseNode($$); 7.334 - } 7.335 - ; 7.336 -@@ -478,7 +478,7 @@ 7.337 - { 7.338 - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); 7.339 -- PARSER->unregisterParseNode($1); 7.340 -- PARSER->unregisterParseNode($3); 7.341 -- PARSER->registerParseNode($$); 7.342 -+ parser->unregisterParseNode($1); 7.343 -+ parser->unregisterParseNode($3); 7.344 -+ parser->registerParseNode($$); 7.345 - } 7.346 - ; 7.347 -@@ -490,7 +490,7 @@ 7.348 - { 7.349 - $$ = new EqTestOp($2, $1, $3); 7.350 -- PARSER->unregisterParseNode($1); 7.351 -- PARSER->unregisterParseNode($3); 7.352 -- PARSER->registerParseNode($$); 7.353 -+ parser->unregisterParseNode($1); 7.354 -+ parser->unregisterParseNode($3); 7.355 -+ parser->registerParseNode($$); 7.356 - } 7.357 - ; 7.358 -@@ -502,7 +502,7 @@ 7.359 - { 7.360 - $$ = new EqTestOp($2, $1, $3); 7.361 -- PARSER->unregisterParseNode($1); 7.362 -- PARSER->unregisterParseNode($3); 7.363 -- PARSER->registerParseNode($$); 7.364 -+ parser->unregisterParseNode($1); 7.365 -+ parser->unregisterParseNode($3); 7.366 -+ parser->registerParseNode($$); 7.367 - } 7.368 - ; 7.369 -@@ -514,7 +514,7 @@ 7.370 - { 7.371 - $$ = new NumericOp(NumericOp::OP_Add, $1, $3); 7.372 -- PARSER->unregisterParseNode($1); 7.373 -- PARSER->unregisterParseNode($3); 7.374 -- PARSER->registerParseNode($$); 7.375 -+ parser->unregisterParseNode($1); 7.376 -+ parser->unregisterParseNode($3); 7.377 -+ parser->registerParseNode($$); 7.378 - } 7.379 - | 7.380 -@@ -522,7 +522,7 @@ 7.381 - { 7.382 - $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); 7.383 -- PARSER->unregisterParseNode($1); 7.384 -- PARSER->unregisterParseNode($3); 7.385 -- PARSER->registerParseNode($$); 7.386 -+ parser->unregisterParseNode($1); 7.387 -+ parser->unregisterParseNode($3); 7.388 -+ parser->registerParseNode($$); 7.389 - } 7.390 - ; 7.391 -@@ -534,7 +534,7 @@ 7.392 - { 7.393 - $$ = new NumericOp($2, $1, $3); 7.394 -- PARSER->unregisterParseNode($1); 7.395 -- PARSER->unregisterParseNode($3); 7.396 -- PARSER->registerParseNode($$); 7.397 -+ parser->unregisterParseNode($1); 7.398 -+ parser->unregisterParseNode($3); 7.399 -+ parser->registerParseNode($$); 7.400 - } 7.401 - ; 7.402 -@@ -547,6 +547,6 @@ 7.403 - $$ = new Negative; 7.404 - $$->addSubExpression($2); 7.405 -- PARSER->unregisterParseNode($2); 7.406 -- PARSER->registerParseNode($$); 7.407 -+ parser->unregisterParseNode($2); 7.408 -+ parser->registerParseNode($$); 7.409 - } 7.410 - ;
8.1 --- a/libwebkit-video/stuff/WebCore_xml_XPathParser.cpp_124099.diff Thu Nov 23 12:57:31 2017 +0200 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,39 +0,0 @@ 8.4 -Index: trunk/Source/WebCore/xml/XPathParser.cpp 8.5 -=================================================================== 8.6 ---- trunk/Source/WebCore/xml/XPathParser.cpp (revision 97771) 8.7 -+++ trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099) 8.8 -@@ -33,22 +33,19 @@ 8.9 - #include "XPathException.h" 8.10 - #include "XPathNSResolver.h" 8.11 -+#include "XPathPath.h" 8.12 - #include "XPathStep.h" 8.13 - #include <wtf/StdLibExtras.h> 8.14 - #include <wtf/text/StringHash.h> 8.15 - 8.16 --int xpathyyparse(void*); 8.17 -- 8.18 -+using namespace WebCore; 8.19 - using namespace WTF; 8.20 - using namespace Unicode; 8.21 -- 8.22 --namespace WebCore { 8.23 --namespace XPath { 8.24 -- 8.25 --class LocationPath; 8.26 -- 8.27 --#include "XPathGrammar.h" 8.28 -+using namespace XPath; 8.29 -+ 8.30 -+extern int xpathyyparse(WebCore::XPath::Parser*); 8.31 -+#include "XPathGrammar.h" 8.32 - 8.33 - Parser* Parser::currentParser = 0; 8.34 -- 8.35 -+ 8.36 - enum XMLCat { NameStart, NameCont, NotPartOfName }; 8.37 - 8.38 -@@ -631,4 +628,2 @@ 8.39 - } 8.40 - 8.41 --} 8.42 --}
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/libwebkit-video/stuff/patches/CodeGeneratorGObject-bug-84526.patch Thu Nov 23 17:20:44 2017 +0100 9.3 @@ -0,0 +1,14 @@ 9.4 +--- Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (revision 115562) 9.5 ++++ Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (working copy) 9.6 +@@ -1444,9 +1444,10 @@ 9.7 + print IMPL "namespace WebKit {\n\n"; 9.8 + print IMPL @cBodyPriv; 9.9 + print IMPL "} // namespace WebKit\n\n"; 9.10 ++ 9.11 ++ print IMPL @cBodyProperties; 9.12 + print IMPL "#endif // ${conditionalString}\n\n" if $conditionalString; 9.13 + 9.14 +- print IMPL @cBodyProperties; 9.15 + print IMPL @cBody; 9.16 + 9.17 + close(IMPL);
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/libwebkit-video/stuff/patches/GtkClickCounter.patch Thu Nov 23 17:20:44 2017 +0100 10.3 @@ -0,0 +1,13 @@ 10.4 +--- libwebkit-1.8.3/Source/WebCore/platform/gtk/GtkClickCounter.cpp 10.5 ++++ libwebkit-1.8.3/Source/WebCore/platform/gtk/GtkClickCounter.cpp 10.6 +@@ -85,8 +85,8 @@ 10.7 + guint32 eventTime = getEventTime(event); 10.8 + 10.9 + if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) 10.10 +- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) 10.11 +- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) 10.12 ++ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) 10.13 ++ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) 10.14 + && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime)) 10.15 + && (buttonEvent->button == m_previousClickButton))) 10.16 + m_currentClickCount++;
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/libwebkit-video/stuff/patches/README Thu Nov 23 17:20:44 2017 +0100 11.3 @@ -0,0 +1,2 @@ 11.4 +Upstream patches for building webkit gtk with newer bison 2.6, see: 11.5 +http://trac.webkit.org/changeset/124099 11.6 \ No newline at end of file
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/libwebkit-video/stuff/patches/WebCore_ChangeLog_124099.patch Thu Nov 23 17:20:44 2017 +0100 12.3 @@ -0,0 +1,32 @@ 12.4 +Index: trunk/Source/WebCore/ChangeLog 12.5 +=================================================================== 12.6 +--- trunk/Source/WebCore/ChangeLog (revision 124098) 12.7 ++++ trunk/Source/WebCore/ChangeLog (revision 124099) 12.8 +@@ -1,2 +1,27 @@ 12.9 ++2012-07-30 Alexis Menard <alexis.menard@openbossa.org> 12.10 ++ 12.11 ++ Build fix with newer bison 2.6. 12.12 ++ https://bugs.webkit.org/show_bug.cgi?id=92264 12.13 ++ 12.14 ++ Reviewed by Adam Barth. 12.15 ++ 12.16 ++ As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html 12.17 ++ YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS 12.18 ++ version I had access to as well as recent Linux runs at least version 2.3 so it's safe 12.19 ++ to use the replacement of these deprecated macros in favor of %lex-param and %parse-param. 12.20 ++ As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release 12.21 ++ of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore. 12.22 ++ 12.23 ++ No new tests : build fix and the patch should not trigger any regressions 12.24 ++ 12.25 ++ * css/CSSGrammar.y: 12.26 ++ * css/CSSParser.cpp: 12.27 ++ * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define. 12.28 ++ * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h 12.29 ++ therefore including this file within the namespace {} declarations leads to xpathyyparse being 12.30 ++ defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp 12.31 ++ (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 12.32 ++ to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same. 12.33 ++ 12.34 + 2012-07-30 Sadrul Habib Chowdhury <sadrul@chromium.org> 12.35 +
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/libwebkit-video/stuff/patches/WebCore_css_CSSGrammar.y_124099.patch Thu Nov 23 17:20:44 2017 +0100 13.3 @@ -0,0 +1,26 @@ 13.4 +Index: trunk/Source/WebCore/css/CSSGrammar.y 13.5 +=================================================================== 13.6 +--- trunk/Source/WebCore/css/CSSGrammar.y (revision 121874) 13.7 ++++ trunk/Source/WebCore/css/CSSGrammar.y (revision 124099) 13.8 +@@ -54,11 +54,10 @@ 13.9 + #define YYDEBUG 0 13.10 + 13.11 +-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x 13.12 +-#define YYPARSE_PARAM parser 13.13 +-#define YYLEX_PARAM parser 13.14 +- 13.15 + %} 13.16 + 13.17 + %pure_parser 13.18 ++ 13.19 ++%parse-param { CSSParser* parser } 13.20 ++%lex-param { CSSParser* parser } 13.21 + 13.22 + %union { 13.23 +@@ -90,5 +89,5 @@ 13.24 + %{ 13.25 + 13.26 +-static inline int cssyyerror(const char*) 13.27 ++static inline int cssyyerror(void*, const char*) 13.28 + { 13.29 + return 1;
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/libwebkit-video/stuff/patches/WebCore_css_CSSParser.cpp_124099.patch Thu Nov 23 17:20:44 2017 +0100 14.3 @@ -0,0 +1,11 @@ 14.4 +Index: trunk/Source/WebCore/css/CSSParser.cpp 14.5 +=================================================================== 14.6 +--- trunk/Source/WebCore/css/CSSParser.cpp (revision 123746) 14.7 ++++ trunk/Source/WebCore/css/CSSParser.cpp (revision 124099) 14.8 +@@ -115,5 +115,5 @@ 14.9 + #endif 14.10 + 14.11 +-extern int cssyyparse(void* parser); 14.12 ++extern int cssyyparse(WebCore::CSSParser*); 14.13 + 14.14 + using namespace std;
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/libwebkit-video/stuff/patches/WebCore_xml_XPathGrammar.y_124099.patch Thu Nov 23 17:20:44 2017 +0100 15.3 @@ -0,0 +1,407 @@ 15.4 +Index: trunk/Source/WebCore/xml/XPathGrammar.y 15.5 +=================================================================== 15.6 +--- trunk/Source/WebCore/xml/XPathGrammar.y (revision 97771) 15.7 ++++ trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099) 15.8 +@@ -35,4 +35,5 @@ 15.9 + #include "XPathPath.h" 15.10 + #include "XPathPredicate.h" 15.11 ++#include "XPathStep.h" 15.12 + #include "XPathVariableReference.h" 15.13 + #include <wtf/FastMalloc.h> 15.14 +@@ -45,6 +46,4 @@ 15.15 + #define YYDEBUG 0 15.16 + #define YYMAXDEPTH 10000 15.17 +-#define YYPARSE_PARAM parserParameter 15.18 +-#define PARSER static_cast<Parser*>(parserParameter) 15.19 + 15.20 + using namespace WebCore; 15.21 +@@ -54,4 +53,5 @@ 15.22 + 15.23 + %pure_parser 15.24 ++%parse-param { WebCore::XPath::Parser* parser } 15.25 + 15.26 + %union 15.27 +@@ -72,5 +72,5 @@ 15.28 + 15.29 + static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } 15.30 +-static void xpathyyerror(const char*) { } 15.31 ++static void xpathyyerror(void*, const char*) { } 15.32 + 15.33 + %} 15.34 +@@ -119,5 +119,5 @@ 15.35 + OrExpr 15.36 + { 15.37 +- PARSER->m_topExpr = $1; 15.38 ++ parser->m_topExpr = $1; 15.39 + } 15.40 + ; 15.41 +@@ -139,5 +139,5 @@ 15.42 + { 15.43 + $$ = new LocationPath; 15.44 +- PARSER->registerParseNode($$); 15.45 ++ parser->registerParseNode($$); 15.46 + } 15.47 + | 15.48 +@@ -151,5 +151,5 @@ 15.49 + $$ = $2; 15.50 + $$->insertFirstStep($1); 15.51 +- PARSER->unregisterParseNode($1); 15.52 ++ parser->unregisterParseNode($1); 15.53 + } 15.54 + ; 15.55 +@@ -160,6 +160,6 @@ 15.56 + $$ = new LocationPath; 15.57 + $$->appendStep($1); 15.58 +- PARSER->unregisterParseNode($1); 15.59 +- PARSER->registerParseNode($$); 15.60 ++ parser->unregisterParseNode($1); 15.61 ++ parser->registerParseNode($$); 15.62 + } 15.63 + | 15.64 +@@ -167,5 +167,5 @@ 15.65 + { 15.66 + $$->appendStep($3); 15.67 +- PARSER->unregisterParseNode($3); 15.68 ++ parser->unregisterParseNode($3); 15.69 + } 15.70 + | 15.71 +@@ -174,6 +174,6 @@ 15.72 + $$->appendStep($2); 15.73 + $$->appendStep($3); 15.74 +- PARSER->unregisterParseNode($2); 15.75 +- PARSER->unregisterParseNode($3); 15.76 ++ parser->unregisterParseNode($2); 15.77 ++ parser->unregisterParseNode($3); 15.78 + } 15.79 + ; 15.80 +@@ -184,9 +184,9 @@ 15.81 + if ($2) { 15.82 + $$ = new Step(Step::ChildAxis, *$1, *$2); 15.83 +- PARSER->deletePredicateVector($2); 15.84 ++ parser->deletePredicateVector($2); 15.85 + } else 15.86 + $$ = new Step(Step::ChildAxis, *$1); 15.87 +- PARSER->deleteNodeTest($1); 15.88 +- PARSER->registerParseNode($$); 15.89 ++ parser->deleteNodeTest($1); 15.90 ++ parser->registerParseNode($$); 15.91 + } 15.92 + | 15.93 +@@ -195,6 +195,6 @@ 15.94 + String localName; 15.95 + String namespaceURI; 15.96 +- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { 15.97 +- PARSER->m_gotNamespaceError = true; 15.98 ++ if (!parser->expandQName(*$1, localName, namespaceURI)) { 15.99 ++ parser->m_gotNamespaceError = true; 15.100 + YYABORT; 15.101 + } 15.102 +@@ -202,9 +202,9 @@ 15.103 + if ($2) { 15.104 + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); 15.105 +- PARSER->deletePredicateVector($2); 15.106 ++ parser->deletePredicateVector($2); 15.107 + } else 15.108 + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 15.109 +- PARSER->deleteString($1); 15.110 +- PARSER->registerParseNode($$); 15.111 ++ parser->deleteString($1); 15.112 ++ parser->registerParseNode($$); 15.113 + } 15.114 + | 15.115 +@@ -213,9 +213,9 @@ 15.116 + if ($3) { 15.117 + $$ = new Step($1, *$2, *$3); 15.118 +- PARSER->deletePredicateVector($3); 15.119 ++ parser->deletePredicateVector($3); 15.120 + } else 15.121 + $$ = new Step($1, *$2); 15.122 +- PARSER->deleteNodeTest($2); 15.123 +- PARSER->registerParseNode($$); 15.124 ++ parser->deleteNodeTest($2); 15.125 ++ parser->registerParseNode($$); 15.126 + } 15.127 + | 15.128 +@@ -224,6 +224,6 @@ 15.129 + String localName; 15.130 + String namespaceURI; 15.131 +- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { 15.132 +- PARSER->m_gotNamespaceError = true; 15.133 ++ if (!parser->expandQName(*$2, localName, namespaceURI)) { 15.134 ++ parser->m_gotNamespaceError = true; 15.135 + YYABORT; 15.136 + } 15.137 +@@ -231,9 +231,9 @@ 15.138 + if ($3) { 15.139 + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); 15.140 +- PARSER->deletePredicateVector($3); 15.141 ++ parser->deletePredicateVector($3); 15.142 + } else 15.143 + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 15.144 +- PARSER->deleteString($2); 15.145 +- PARSER->registerParseNode($$); 15.146 ++ parser->deleteString($2); 15.147 ++ parser->registerParseNode($$); 15.148 + } 15.149 + | 15.150 +@@ -260,6 +260,6 @@ 15.151 + $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); 15.152 + 15.153 +- PARSER->deleteString($1); 15.154 +- PARSER->registerNodeTest($$); 15.155 ++ parser->deleteString($1); 15.156 ++ parser->registerNodeTest($$); 15.157 + } 15.158 + | 15.159 +@@ -267,6 +267,6 @@ 15.160 + { 15.161 + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); 15.162 +- PARSER->deleteString($1); 15.163 +- PARSER->registerNodeTest($$); 15.164 ++ parser->deleteString($1); 15.165 ++ parser->registerNodeTest($$); 15.166 + } 15.167 + | 15.168 +@@ -274,7 +274,7 @@ 15.169 + { 15.170 + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); 15.171 +- PARSER->deleteString($1); 15.172 +- PARSER->deleteString($3); 15.173 +- PARSER->registerNodeTest($$); 15.174 ++ parser->deleteString($1); 15.175 ++ parser->deleteString($3); 15.176 ++ parser->registerNodeTest($$); 15.177 + } 15.178 + ; 15.179 +@@ -294,6 +294,6 @@ 15.180 + $$ = new Vector<Predicate*>; 15.181 + $$->append(new Predicate($1)); 15.182 +- PARSER->unregisterParseNode($1); 15.183 +- PARSER->registerPredicateVector($$); 15.184 ++ parser->unregisterParseNode($1); 15.185 ++ parser->registerPredicateVector($$); 15.186 + } 15.187 + | 15.188 +@@ -301,5 +301,5 @@ 15.189 + { 15.190 + $$->append(new Predicate($2)); 15.191 +- PARSER->unregisterParseNode($2); 15.192 ++ parser->unregisterParseNode($2); 15.193 + } 15.194 + ; 15.195 +@@ -316,5 +316,5 @@ 15.196 + { 15.197 + $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 15.198 +- PARSER->registerParseNode($$); 15.199 ++ parser->registerParseNode($$); 15.200 + } 15.201 + ; 15.202 +@@ -324,5 +324,5 @@ 15.203 + { 15.204 + $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 15.205 +- PARSER->registerParseNode($$); 15.206 ++ parser->registerParseNode($$); 15.207 + } 15.208 + | 15.209 +@@ -330,5 +330,5 @@ 15.210 + { 15.211 + $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 15.212 +- PARSER->registerParseNode($$); 15.213 ++ parser->registerParseNode($$); 15.214 + } 15.215 + ; 15.216 +@@ -338,6 +338,6 @@ 15.217 + { 15.218 + $$ = new VariableReference(*$1); 15.219 +- PARSER->deleteString($1); 15.220 +- PARSER->registerParseNode($$); 15.221 ++ parser->deleteString($1); 15.222 ++ parser->registerParseNode($$); 15.223 + } 15.224 + | 15.225 +@@ -350,6 +350,6 @@ 15.226 + { 15.227 + $$ = new StringExpression(*$1); 15.228 +- PARSER->deleteString($1); 15.229 +- PARSER->registerParseNode($$); 15.230 ++ parser->deleteString($1); 15.231 ++ parser->registerParseNode($$); 15.232 + } 15.233 + | 15.234 +@@ -357,6 +357,6 @@ 15.235 + { 15.236 + $$ = new Number($1->toDouble()); 15.237 +- PARSER->deleteString($1); 15.238 +- PARSER->registerParseNode($$); 15.239 ++ parser->deleteString($1); 15.240 ++ parser->registerParseNode($$); 15.241 + } 15.242 + | 15.243 +@@ -370,6 +370,6 @@ 15.244 + if (!$$) 15.245 + YYABORT; 15.246 +- PARSER->deleteString($1); 15.247 +- PARSER->registerParseNode($$); 15.248 ++ parser->deleteString($1); 15.249 ++ parser->registerParseNode($$); 15.250 + } 15.251 + | 15.252 +@@ -379,7 +379,7 @@ 15.253 + if (!$$) 15.254 + YYABORT; 15.255 +- PARSER->deleteString($1); 15.256 +- PARSER->deleteExpressionVector($3); 15.257 +- PARSER->registerParseNode($$); 15.258 ++ parser->deleteString($1); 15.259 ++ parser->deleteExpressionVector($3); 15.260 ++ parser->registerParseNode($$); 15.261 + } 15.262 + ; 15.263 +@@ -390,6 +390,6 @@ 15.264 + $$ = new Vector<Expression*>; 15.265 + $$->append($1); 15.266 +- PARSER->unregisterParseNode($1); 15.267 +- PARSER->registerExpressionVector($$); 15.268 ++ parser->unregisterParseNode($1); 15.269 ++ parser->registerExpressionVector($$); 15.270 + } 15.271 + | 15.272 +@@ -397,5 +397,5 @@ 15.273 + { 15.274 + $$->append($3); 15.275 +- PARSER->unregisterParseNode($3); 15.276 ++ parser->unregisterParseNode($3); 15.277 + } 15.278 + ; 15.279 +@@ -413,7 +413,7 @@ 15.280 + $$->addSubExpression($1); 15.281 + $$->addSubExpression($3); 15.282 +- PARSER->unregisterParseNode($1); 15.283 +- PARSER->unregisterParseNode($3); 15.284 +- PARSER->registerParseNode($$); 15.285 ++ parser->unregisterParseNode($1); 15.286 ++ parser->unregisterParseNode($3); 15.287 ++ parser->registerParseNode($$); 15.288 + } 15.289 + ; 15.290 +@@ -431,7 +431,7 @@ 15.291 + $3->setAbsolute(true); 15.292 + $$ = new Path(static_cast<Filter*>($1), $3); 15.293 +- PARSER->unregisterParseNode($1); 15.294 +- PARSER->unregisterParseNode($3); 15.295 +- PARSER->registerParseNode($$); 15.296 ++ parser->unregisterParseNode($1); 15.297 ++ parser->unregisterParseNode($3); 15.298 ++ parser->registerParseNode($$); 15.299 + } 15.300 + | 15.301 +@@ -441,8 +441,8 @@ 15.302 + $3->setAbsolute(true); 15.303 + $$ = new Path(static_cast<Filter*>($1), $3); 15.304 +- PARSER->unregisterParseNode($1); 15.305 +- PARSER->unregisterParseNode($2); 15.306 +- PARSER->unregisterParseNode($3); 15.307 +- PARSER->registerParseNode($$); 15.308 ++ parser->unregisterParseNode($1); 15.309 ++ parser->unregisterParseNode($2); 15.310 ++ parser->unregisterParseNode($3); 15.311 ++ parser->registerParseNode($$); 15.312 + } 15.313 + ; 15.314 +@@ -454,7 +454,7 @@ 15.315 + { 15.316 + $$ = new Filter($1, *$2); 15.317 +- PARSER->unregisterParseNode($1); 15.318 +- PARSER->deletePredicateVector($2); 15.319 +- PARSER->registerParseNode($$); 15.320 ++ parser->unregisterParseNode($1); 15.321 ++ parser->deletePredicateVector($2); 15.322 ++ parser->registerParseNode($$); 15.323 + } 15.324 + ; 15.325 +@@ -466,7 +466,7 @@ 15.326 + { 15.327 + $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); 15.328 +- PARSER->unregisterParseNode($1); 15.329 +- PARSER->unregisterParseNode($3); 15.330 +- PARSER->registerParseNode($$); 15.331 ++ parser->unregisterParseNode($1); 15.332 ++ parser->unregisterParseNode($3); 15.333 ++ parser->registerParseNode($$); 15.334 + } 15.335 + ; 15.336 +@@ -478,7 +478,7 @@ 15.337 + { 15.338 + $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); 15.339 +- PARSER->unregisterParseNode($1); 15.340 +- PARSER->unregisterParseNode($3); 15.341 +- PARSER->registerParseNode($$); 15.342 ++ parser->unregisterParseNode($1); 15.343 ++ parser->unregisterParseNode($3); 15.344 ++ parser->registerParseNode($$); 15.345 + } 15.346 + ; 15.347 +@@ -490,7 +490,7 @@ 15.348 + { 15.349 + $$ = new EqTestOp($2, $1, $3); 15.350 +- PARSER->unregisterParseNode($1); 15.351 +- PARSER->unregisterParseNode($3); 15.352 +- PARSER->registerParseNode($$); 15.353 ++ parser->unregisterParseNode($1); 15.354 ++ parser->unregisterParseNode($3); 15.355 ++ parser->registerParseNode($$); 15.356 + } 15.357 + ; 15.358 +@@ -502,7 +502,7 @@ 15.359 + { 15.360 + $$ = new EqTestOp($2, $1, $3); 15.361 +- PARSER->unregisterParseNode($1); 15.362 +- PARSER->unregisterParseNode($3); 15.363 +- PARSER->registerParseNode($$); 15.364 ++ parser->unregisterParseNode($1); 15.365 ++ parser->unregisterParseNode($3); 15.366 ++ parser->registerParseNode($$); 15.367 + } 15.368 + ; 15.369 +@@ -514,7 +514,7 @@ 15.370 + { 15.371 + $$ = new NumericOp(NumericOp::OP_Add, $1, $3); 15.372 +- PARSER->unregisterParseNode($1); 15.373 +- PARSER->unregisterParseNode($3); 15.374 +- PARSER->registerParseNode($$); 15.375 ++ parser->unregisterParseNode($1); 15.376 ++ parser->unregisterParseNode($3); 15.377 ++ parser->registerParseNode($$); 15.378 + } 15.379 + | 15.380 +@@ -522,7 +522,7 @@ 15.381 + { 15.382 + $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); 15.383 +- PARSER->unregisterParseNode($1); 15.384 +- PARSER->unregisterParseNode($3); 15.385 +- PARSER->registerParseNode($$); 15.386 ++ parser->unregisterParseNode($1); 15.387 ++ parser->unregisterParseNode($3); 15.388 ++ parser->registerParseNode($$); 15.389 + } 15.390 + ; 15.391 +@@ -534,7 +534,7 @@ 15.392 + { 15.393 + $$ = new NumericOp($2, $1, $3); 15.394 +- PARSER->unregisterParseNode($1); 15.395 +- PARSER->unregisterParseNode($3); 15.396 +- PARSER->registerParseNode($$); 15.397 ++ parser->unregisterParseNode($1); 15.398 ++ parser->unregisterParseNode($3); 15.399 ++ parser->registerParseNode($$); 15.400 + } 15.401 + ; 15.402 +@@ -547,6 +547,6 @@ 15.403 + $$ = new Negative; 15.404 + $$->addSubExpression($2); 15.405 +- PARSER->unregisterParseNode($2); 15.406 +- PARSER->registerParseNode($$); 15.407 ++ parser->unregisterParseNode($2); 15.408 ++ parser->registerParseNode($$); 15.409 + } 15.410 + ;
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/libwebkit-video/stuff/patches/WebCore_xml_XPathParser.cpp_124099.patch Thu Nov 23 17:20:44 2017 +0100 16.3 @@ -0,0 +1,39 @@ 16.4 +Index: trunk/Source/WebCore/xml/XPathParser.cpp 16.5 +=================================================================== 16.6 +--- trunk/Source/WebCore/xml/XPathParser.cpp (revision 97771) 16.7 ++++ trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099) 16.8 +@@ -33,22 +33,19 @@ 16.9 + #include "XPathException.h" 16.10 + #include "XPathNSResolver.h" 16.11 ++#include "XPathPath.h" 16.12 + #include "XPathStep.h" 16.13 + #include <wtf/StdLibExtras.h> 16.14 + #include <wtf/text/StringHash.h> 16.15 + 16.16 +-int xpathyyparse(void*); 16.17 +- 16.18 ++using namespace WebCore; 16.19 + using namespace WTF; 16.20 + using namespace Unicode; 16.21 +- 16.22 +-namespace WebCore { 16.23 +-namespace XPath { 16.24 +- 16.25 +-class LocationPath; 16.26 +- 16.27 +-#include "XPathGrammar.h" 16.28 ++using namespace XPath; 16.29 ++ 16.30 ++extern int xpathyyparse(WebCore::XPath::Parser*); 16.31 ++#include "XPathGrammar.h" 16.32 + 16.33 + Parser* Parser::currentParser = 0; 16.34 +- 16.35 ++ 16.36 + enum XMLCat { NameStart, NameCont, NotPartOfName }; 16.37 + 16.38 +@@ -631,4 +628,2 @@ 16.39 + } 16.40 + 16.41 +-} 16.42 +-}
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/libwebkit-video/stuff/patches/series Thu Nov 23 17:20:44 2017 +0100 17.3 @@ -0,0 +1,7 @@ 17.4 +CodeGeneratorGObject-bug-84526.patch 17.5 +GtkClickCounter.patch 17.6 +WebCore_ChangeLog_124099.patch 17.7 +WebCore_css_CSSGrammar.y_124099.patch 17.8 +WebCore_css_CSSParser.cpp_124099.patch 17.9 +WebCore_xml_XPathGrammar.y_124099.patch 17.10 +WebCore_xml_XPathParser.cpp_124099.patch
18.1 --- a/libwebkit/receipt Thu Nov 23 12:57:31 2017 +0200 18.2 +++ b/libwebkit/receipt Thu Nov 23 17:20:44 2017 +0100 18.3 @@ -32,15 +32,6 @@ 18.4 # libwebkit does not like parallel builds. 18.5 export MAKEFLAGS=$(echo $MAKEFLAGS | sed 's/-j[0-9]*/-j1/') 18.6 # fix Bug 84526: webkit-gtk-1.8.0 fails to build with --disable-video 18.7 - # Build fix with newer bison 2.6 18.8 - if [ ! "$continue" ]; then 18.9 - for file_diff in $stuff/*.diff; do 18.10 - echo -n "Applying patch $(basename $file_diff)" 18.11 - patch -Np1 -i $file_diff > /dev/null 18.12 - status 18.13 - done 18.14 - patch -p0 < $stuff/CodeGeneratorGObject-bug-84526.patch || exit 1 18.15 - fi 18.16 # Build 18.17 ./configure \ 18.18 --enable-introspection=no \ 18.19 @@ -75,7 +66,8 @@ 18.20 ;; 18.21 libwebkit-dev) 18.22 CAT="development|devel files for libwebkit" 18.23 - DEPENDS="libwebkit libsoup-dev enchant-dev libtasn1-dev sqlite3-dev" 18.24 + DEPENDS="libwebkit libsoup-dev enchant-dev libtasn1-dev \ 18.25 + sqlite3-dev xorg-libXt-dev" 18.26 mkdir -p $fs/usr/lib $fs/usr/share 18.27 cp -a $install/usr/lib/*.*a $fs/usr/lib 18.28 # ARM: no pkg-config, include or gir files
19.1 --- a/libwebkit/stuff/CodeGeneratorGObject-bug-84526.patch Thu Nov 23 12:57:31 2017 +0200 19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 19.3 @@ -1,14 +0,0 @@ 19.4 ---- Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (revision 115562) 19.5 -+++ Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (working copy) 19.6 -@@ -1444,9 +1444,10 @@ 19.7 - print IMPL "namespace WebKit {\n\n"; 19.8 - print IMPL @cBodyPriv; 19.9 - print IMPL "} // namespace WebKit\n\n"; 19.10 -+ 19.11 -+ print IMPL @cBodyProperties; 19.12 - print IMPL "#endif // ${conditionalString}\n\n" if $conditionalString; 19.13 - 19.14 -- print IMPL @cBodyProperties; 19.15 - print IMPL @cBody; 19.16 - 19.17 - close(IMPL);
20.1 --- a/libwebkit/stuff/README Thu Nov 23 12:57:31 2017 +0200 20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 20.3 @@ -1,2 +0,0 @@ 20.4 -Upstream patches for building webkit gtk with newer bison 2.6, see: 20.5 -http://trac.webkit.org/changeset/124099 20.6 \ No newline at end of file
21.1 --- a/libwebkit/stuff/WebCore_ChangeLog_124099.diff Thu Nov 23 12:57:31 2017 +0200 21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 21.3 @@ -1,32 +0,0 @@ 21.4 -Index: trunk/Source/WebCore/ChangeLog 21.5 -=================================================================== 21.6 ---- trunk/Source/WebCore/ChangeLog (revision 124098) 21.7 -+++ trunk/Source/WebCore/ChangeLog (revision 124099) 21.8 -@@ -1,2 +1,27 @@ 21.9 -+2012-07-30 Alexis Menard <alexis.menard@openbossa.org> 21.10 -+ 21.11 -+ Build fix with newer bison 2.6. 21.12 -+ https://bugs.webkit.org/show_bug.cgi?id=92264 21.13 -+ 21.14 -+ Reviewed by Adam Barth. 21.15 -+ 21.16 -+ As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html 21.17 -+ YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS 21.18 -+ version I had access to as well as recent Linux runs at least version 2.3 so it's safe 21.19 -+ to use the replacement of these deprecated macros in favor of %lex-param and %parse-param. 21.20 -+ As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release 21.21 -+ of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore. 21.22 -+ 21.23 -+ No new tests : build fix and the patch should not trigger any regressions 21.24 -+ 21.25 -+ * css/CSSGrammar.y: 21.26 -+ * css/CSSParser.cpp: 21.27 -+ * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define. 21.28 -+ * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h 21.29 -+ therefore including this file within the namespace {} declarations leads to xpathyyparse being 21.30 -+ defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp 21.31 -+ (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 21.32 -+ to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same. 21.33 -+ 21.34 - 2012-07-30 Sadrul Habib Chowdhury <sadrul@chromium.org> 21.35 -
22.1 --- a/libwebkit/stuff/WebCore_css_CSSGrammar.y_124099.diff Thu Nov 23 12:57:31 2017 +0200 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,26 +0,0 @@ 22.4 -Index: trunk/Source/WebCore/css/CSSGrammar.y 22.5 -=================================================================== 22.6 ---- trunk/Source/WebCore/css/CSSGrammar.y (revision 121874) 22.7 -+++ trunk/Source/WebCore/css/CSSGrammar.y (revision 124099) 22.8 -@@ -54,11 +54,10 @@ 22.9 - #define YYDEBUG 0 22.10 - 22.11 --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x 22.12 --#define YYPARSE_PARAM parser 22.13 --#define YYLEX_PARAM parser 22.14 -- 22.15 - %} 22.16 - 22.17 - %pure_parser 22.18 -+ 22.19 -+%parse-param { CSSParser* parser } 22.20 -+%lex-param { CSSParser* parser } 22.21 - 22.22 - %union { 22.23 -@@ -90,5 +89,5 @@ 22.24 - %{ 22.25 - 22.26 --static inline int cssyyerror(const char*) 22.27 -+static inline int cssyyerror(void*, const char*) 22.28 - { 22.29 - return 1;
23.1 --- a/libwebkit/stuff/WebCore_css_CSSParser.cpp_124099.diff Thu Nov 23 12:57:31 2017 +0200 23.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 23.3 @@ -1,11 +0,0 @@ 23.4 -Index: trunk/Source/WebCore/css/CSSParser.cpp 23.5 -=================================================================== 23.6 ---- trunk/Source/WebCore/css/CSSParser.cpp (revision 123746) 23.7 -+++ trunk/Source/WebCore/css/CSSParser.cpp (revision 124099) 23.8 -@@ -115,5 +115,5 @@ 23.9 - #endif 23.10 - 23.11 --extern int cssyyparse(void* parser); 23.12 -+extern int cssyyparse(WebCore::CSSParser*); 23.13 - 23.14 - using namespace std;
24.1 --- a/libwebkit/stuff/WebCore_xml_XPathGrammar.y_124099.diff Thu Nov 23 12:57:31 2017 +0200 24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 24.3 @@ -1,407 +0,0 @@ 24.4 -Index: trunk/Source/WebCore/xml/XPathGrammar.y 24.5 -=================================================================== 24.6 ---- trunk/Source/WebCore/xml/XPathGrammar.y (revision 97771) 24.7 -+++ trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099) 24.8 -@@ -35,4 +35,5 @@ 24.9 - #include "XPathPath.h" 24.10 - #include "XPathPredicate.h" 24.11 -+#include "XPathStep.h" 24.12 - #include "XPathVariableReference.h" 24.13 - #include <wtf/FastMalloc.h> 24.14 -@@ -45,6 +46,4 @@ 24.15 - #define YYDEBUG 0 24.16 - #define YYMAXDEPTH 10000 24.17 --#define YYPARSE_PARAM parserParameter 24.18 --#define PARSER static_cast<Parser*>(parserParameter) 24.19 - 24.20 - using namespace WebCore; 24.21 -@@ -54,4 +53,5 @@ 24.22 - 24.23 - %pure_parser 24.24 -+%parse-param { WebCore::XPath::Parser* parser } 24.25 - 24.26 - %union 24.27 -@@ -72,5 +72,5 @@ 24.28 - 24.29 - static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } 24.30 --static void xpathyyerror(const char*) { } 24.31 -+static void xpathyyerror(void*, const char*) { } 24.32 - 24.33 - %} 24.34 -@@ -119,5 +119,5 @@ 24.35 - OrExpr 24.36 - { 24.37 -- PARSER->m_topExpr = $1; 24.38 -+ parser->m_topExpr = $1; 24.39 - } 24.40 - ; 24.41 -@@ -139,5 +139,5 @@ 24.42 - { 24.43 - $$ = new LocationPath; 24.44 -- PARSER->registerParseNode($$); 24.45 -+ parser->registerParseNode($$); 24.46 - } 24.47 - | 24.48 -@@ -151,5 +151,5 @@ 24.49 - $$ = $2; 24.50 - $$->insertFirstStep($1); 24.51 -- PARSER->unregisterParseNode($1); 24.52 -+ parser->unregisterParseNode($1); 24.53 - } 24.54 - ; 24.55 -@@ -160,6 +160,6 @@ 24.56 - $$ = new LocationPath; 24.57 - $$->appendStep($1); 24.58 -- PARSER->unregisterParseNode($1); 24.59 -- PARSER->registerParseNode($$); 24.60 -+ parser->unregisterParseNode($1); 24.61 -+ parser->registerParseNode($$); 24.62 - } 24.63 - | 24.64 -@@ -167,5 +167,5 @@ 24.65 - { 24.66 - $$->appendStep($3); 24.67 -- PARSER->unregisterParseNode($3); 24.68 -+ parser->unregisterParseNode($3); 24.69 - } 24.70 - | 24.71 -@@ -174,6 +174,6 @@ 24.72 - $$->appendStep($2); 24.73 - $$->appendStep($3); 24.74 -- PARSER->unregisterParseNode($2); 24.75 -- PARSER->unregisterParseNode($3); 24.76 -+ parser->unregisterParseNode($2); 24.77 -+ parser->unregisterParseNode($3); 24.78 - } 24.79 - ; 24.80 -@@ -184,9 +184,9 @@ 24.81 - if ($2) { 24.82 - $$ = new Step(Step::ChildAxis, *$1, *$2); 24.83 -- PARSER->deletePredicateVector($2); 24.84 -+ parser->deletePredicateVector($2); 24.85 - } else 24.86 - $$ = new Step(Step::ChildAxis, *$1); 24.87 -- PARSER->deleteNodeTest($1); 24.88 -- PARSER->registerParseNode($$); 24.89 -+ parser->deleteNodeTest($1); 24.90 -+ parser->registerParseNode($$); 24.91 - } 24.92 - | 24.93 -@@ -195,6 +195,6 @@ 24.94 - String localName; 24.95 - String namespaceURI; 24.96 -- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { 24.97 -- PARSER->m_gotNamespaceError = true; 24.98 -+ if (!parser->expandQName(*$1, localName, namespaceURI)) { 24.99 -+ parser->m_gotNamespaceError = true; 24.100 - YYABORT; 24.101 - } 24.102 -@@ -202,9 +202,9 @@ 24.103 - if ($2) { 24.104 - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); 24.105 -- PARSER->deletePredicateVector($2); 24.106 -+ parser->deletePredicateVector($2); 24.107 - } else 24.108 - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 24.109 -- PARSER->deleteString($1); 24.110 -- PARSER->registerParseNode($$); 24.111 -+ parser->deleteString($1); 24.112 -+ parser->registerParseNode($$); 24.113 - } 24.114 - | 24.115 -@@ -213,9 +213,9 @@ 24.116 - if ($3) { 24.117 - $$ = new Step($1, *$2, *$3); 24.118 -- PARSER->deletePredicateVector($3); 24.119 -+ parser->deletePredicateVector($3); 24.120 - } else 24.121 - $$ = new Step($1, *$2); 24.122 -- PARSER->deleteNodeTest($2); 24.123 -- PARSER->registerParseNode($$); 24.124 -+ parser->deleteNodeTest($2); 24.125 -+ parser->registerParseNode($$); 24.126 - } 24.127 - | 24.128 -@@ -224,6 +224,6 @@ 24.129 - String localName; 24.130 - String namespaceURI; 24.131 -- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { 24.132 -- PARSER->m_gotNamespaceError = true; 24.133 -+ if (!parser->expandQName(*$2, localName, namespaceURI)) { 24.134 -+ parser->m_gotNamespaceError = true; 24.135 - YYABORT; 24.136 - } 24.137 -@@ -231,9 +231,9 @@ 24.138 - if ($3) { 24.139 - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); 24.140 -- PARSER->deletePredicateVector($3); 24.141 -+ parser->deletePredicateVector($3); 24.142 - } else 24.143 - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 24.144 -- PARSER->deleteString($2); 24.145 -- PARSER->registerParseNode($$); 24.146 -+ parser->deleteString($2); 24.147 -+ parser->registerParseNode($$); 24.148 - } 24.149 - | 24.150 -@@ -260,6 +260,6 @@ 24.151 - $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); 24.152 - 24.153 -- PARSER->deleteString($1); 24.154 -- PARSER->registerNodeTest($$); 24.155 -+ parser->deleteString($1); 24.156 -+ parser->registerNodeTest($$); 24.157 - } 24.158 - | 24.159 -@@ -267,6 +267,6 @@ 24.160 - { 24.161 - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); 24.162 -- PARSER->deleteString($1); 24.163 -- PARSER->registerNodeTest($$); 24.164 -+ parser->deleteString($1); 24.165 -+ parser->registerNodeTest($$); 24.166 - } 24.167 - | 24.168 -@@ -274,7 +274,7 @@ 24.169 - { 24.170 - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); 24.171 -- PARSER->deleteString($1); 24.172 -- PARSER->deleteString($3); 24.173 -- PARSER->registerNodeTest($$); 24.174 -+ parser->deleteString($1); 24.175 -+ parser->deleteString($3); 24.176 -+ parser->registerNodeTest($$); 24.177 - } 24.178 - ; 24.179 -@@ -294,6 +294,6 @@ 24.180 - $$ = new Vector<Predicate*>; 24.181 - $$->append(new Predicate($1)); 24.182 -- PARSER->unregisterParseNode($1); 24.183 -- PARSER->registerPredicateVector($$); 24.184 -+ parser->unregisterParseNode($1); 24.185 -+ parser->registerPredicateVector($$); 24.186 - } 24.187 - | 24.188 -@@ -301,5 +301,5 @@ 24.189 - { 24.190 - $$->append(new Predicate($2)); 24.191 -- PARSER->unregisterParseNode($2); 24.192 -+ parser->unregisterParseNode($2); 24.193 - } 24.194 - ; 24.195 -@@ -316,5 +316,5 @@ 24.196 - { 24.197 - $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 24.198 -- PARSER->registerParseNode($$); 24.199 -+ parser->registerParseNode($$); 24.200 - } 24.201 - ; 24.202 -@@ -324,5 +324,5 @@ 24.203 - { 24.204 - $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 24.205 -- PARSER->registerParseNode($$); 24.206 -+ parser->registerParseNode($$); 24.207 - } 24.208 - | 24.209 -@@ -330,5 +330,5 @@ 24.210 - { 24.211 - $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 24.212 -- PARSER->registerParseNode($$); 24.213 -+ parser->registerParseNode($$); 24.214 - } 24.215 - ; 24.216 -@@ -338,6 +338,6 @@ 24.217 - { 24.218 - $$ = new VariableReference(*$1); 24.219 -- PARSER->deleteString($1); 24.220 -- PARSER->registerParseNode($$); 24.221 -+ parser->deleteString($1); 24.222 -+ parser->registerParseNode($$); 24.223 - } 24.224 - | 24.225 -@@ -350,6 +350,6 @@ 24.226 - { 24.227 - $$ = new StringExpression(*$1); 24.228 -- PARSER->deleteString($1); 24.229 -- PARSER->registerParseNode($$); 24.230 -+ parser->deleteString($1); 24.231 -+ parser->registerParseNode($$); 24.232 - } 24.233 - | 24.234 -@@ -357,6 +357,6 @@ 24.235 - { 24.236 - $$ = new Number($1->toDouble()); 24.237 -- PARSER->deleteString($1); 24.238 -- PARSER->registerParseNode($$); 24.239 -+ parser->deleteString($1); 24.240 -+ parser->registerParseNode($$); 24.241 - } 24.242 - | 24.243 -@@ -370,6 +370,6 @@ 24.244 - if (!$$) 24.245 - YYABORT; 24.246 -- PARSER->deleteString($1); 24.247 -- PARSER->registerParseNode($$); 24.248 -+ parser->deleteString($1); 24.249 -+ parser->registerParseNode($$); 24.250 - } 24.251 - | 24.252 -@@ -379,7 +379,7 @@ 24.253 - if (!$$) 24.254 - YYABORT; 24.255 -- PARSER->deleteString($1); 24.256 -- PARSER->deleteExpressionVector($3); 24.257 -- PARSER->registerParseNode($$); 24.258 -+ parser->deleteString($1); 24.259 -+ parser->deleteExpressionVector($3); 24.260 -+ parser->registerParseNode($$); 24.261 - } 24.262 - ; 24.263 -@@ -390,6 +390,6 @@ 24.264 - $$ = new Vector<Expression*>; 24.265 - $$->append($1); 24.266 -- PARSER->unregisterParseNode($1); 24.267 -- PARSER->registerExpressionVector($$); 24.268 -+ parser->unregisterParseNode($1); 24.269 -+ parser->registerExpressionVector($$); 24.270 - } 24.271 - | 24.272 -@@ -397,5 +397,5 @@ 24.273 - { 24.274 - $$->append($3); 24.275 -- PARSER->unregisterParseNode($3); 24.276 -+ parser->unregisterParseNode($3); 24.277 - } 24.278 - ; 24.279 -@@ -413,7 +413,7 @@ 24.280 - $$->addSubExpression($1); 24.281 - $$->addSubExpression($3); 24.282 -- PARSER->unregisterParseNode($1); 24.283 -- PARSER->unregisterParseNode($3); 24.284 -- PARSER->registerParseNode($$); 24.285 -+ parser->unregisterParseNode($1); 24.286 -+ parser->unregisterParseNode($3); 24.287 -+ parser->registerParseNode($$); 24.288 - } 24.289 - ; 24.290 -@@ -431,7 +431,7 @@ 24.291 - $3->setAbsolute(true); 24.292 - $$ = new Path(static_cast<Filter*>($1), $3); 24.293 -- PARSER->unregisterParseNode($1); 24.294 -- PARSER->unregisterParseNode($3); 24.295 -- PARSER->registerParseNode($$); 24.296 -+ parser->unregisterParseNode($1); 24.297 -+ parser->unregisterParseNode($3); 24.298 -+ parser->registerParseNode($$); 24.299 - } 24.300 - | 24.301 -@@ -441,8 +441,8 @@ 24.302 - $3->setAbsolute(true); 24.303 - $$ = new Path(static_cast<Filter*>($1), $3); 24.304 -- PARSER->unregisterParseNode($1); 24.305 -- PARSER->unregisterParseNode($2); 24.306 -- PARSER->unregisterParseNode($3); 24.307 -- PARSER->registerParseNode($$); 24.308 -+ parser->unregisterParseNode($1); 24.309 -+ parser->unregisterParseNode($2); 24.310 -+ parser->unregisterParseNode($3); 24.311 -+ parser->registerParseNode($$); 24.312 - } 24.313 - ; 24.314 -@@ -454,7 +454,7 @@ 24.315 - { 24.316 - $$ = new Filter($1, *$2); 24.317 -- PARSER->unregisterParseNode($1); 24.318 -- PARSER->deletePredicateVector($2); 24.319 -- PARSER->registerParseNode($$); 24.320 -+ parser->unregisterParseNode($1); 24.321 -+ parser->deletePredicateVector($2); 24.322 -+ parser->registerParseNode($$); 24.323 - } 24.324 - ; 24.325 -@@ -466,7 +466,7 @@ 24.326 - { 24.327 - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); 24.328 -- PARSER->unregisterParseNode($1); 24.329 -- PARSER->unregisterParseNode($3); 24.330 -- PARSER->registerParseNode($$); 24.331 -+ parser->unregisterParseNode($1); 24.332 -+ parser->unregisterParseNode($3); 24.333 -+ parser->registerParseNode($$); 24.334 - } 24.335 - ; 24.336 -@@ -478,7 +478,7 @@ 24.337 - { 24.338 - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); 24.339 -- PARSER->unregisterParseNode($1); 24.340 -- PARSER->unregisterParseNode($3); 24.341 -- PARSER->registerParseNode($$); 24.342 -+ parser->unregisterParseNode($1); 24.343 -+ parser->unregisterParseNode($3); 24.344 -+ parser->registerParseNode($$); 24.345 - } 24.346 - ; 24.347 -@@ -490,7 +490,7 @@ 24.348 - { 24.349 - $$ = new EqTestOp($2, $1, $3); 24.350 -- PARSER->unregisterParseNode($1); 24.351 -- PARSER->unregisterParseNode($3); 24.352 -- PARSER->registerParseNode($$); 24.353 -+ parser->unregisterParseNode($1); 24.354 -+ parser->unregisterParseNode($3); 24.355 -+ parser->registerParseNode($$); 24.356 - } 24.357 - ; 24.358 -@@ -502,7 +502,7 @@ 24.359 - { 24.360 - $$ = new EqTestOp($2, $1, $3); 24.361 -- PARSER->unregisterParseNode($1); 24.362 -- PARSER->unregisterParseNode($3); 24.363 -- PARSER->registerParseNode($$); 24.364 -+ parser->unregisterParseNode($1); 24.365 -+ parser->unregisterParseNode($3); 24.366 -+ parser->registerParseNode($$); 24.367 - } 24.368 - ; 24.369 -@@ -514,7 +514,7 @@ 24.370 - { 24.371 - $$ = new NumericOp(NumericOp::OP_Add, $1, $3); 24.372 -- PARSER->unregisterParseNode($1); 24.373 -- PARSER->unregisterParseNode($3); 24.374 -- PARSER->registerParseNode($$); 24.375 -+ parser->unregisterParseNode($1); 24.376 -+ parser->unregisterParseNode($3); 24.377 -+ parser->registerParseNode($$); 24.378 - } 24.379 - | 24.380 -@@ -522,7 +522,7 @@ 24.381 - { 24.382 - $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); 24.383 -- PARSER->unregisterParseNode($1); 24.384 -- PARSER->unregisterParseNode($3); 24.385 -- PARSER->registerParseNode($$); 24.386 -+ parser->unregisterParseNode($1); 24.387 -+ parser->unregisterParseNode($3); 24.388 -+ parser->registerParseNode($$); 24.389 - } 24.390 - ; 24.391 -@@ -534,7 +534,7 @@ 24.392 - { 24.393 - $$ = new NumericOp($2, $1, $3); 24.394 -- PARSER->unregisterParseNode($1); 24.395 -- PARSER->unregisterParseNode($3); 24.396 -- PARSER->registerParseNode($$); 24.397 -+ parser->unregisterParseNode($1); 24.398 -+ parser->unregisterParseNode($3); 24.399 -+ parser->registerParseNode($$); 24.400 - } 24.401 - ; 24.402 -@@ -547,6 +547,6 @@ 24.403 - $$ = new Negative; 24.404 - $$->addSubExpression($2); 24.405 -- PARSER->unregisterParseNode($2); 24.406 -- PARSER->registerParseNode($$); 24.407 -+ parser->unregisterParseNode($2); 24.408 -+ parser->registerParseNode($$); 24.409 - } 24.410 - ;
25.1 --- a/libwebkit/stuff/WebCore_xml_XPathParser.cpp_124099.diff Thu Nov 23 12:57:31 2017 +0200 25.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 25.3 @@ -1,39 +0,0 @@ 25.4 -Index: trunk/Source/WebCore/xml/XPathParser.cpp 25.5 -=================================================================== 25.6 ---- trunk/Source/WebCore/xml/XPathParser.cpp (revision 97771) 25.7 -+++ trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099) 25.8 -@@ -33,22 +33,19 @@ 25.9 - #include "XPathException.h" 25.10 - #include "XPathNSResolver.h" 25.11 -+#include "XPathPath.h" 25.12 - #include "XPathStep.h" 25.13 - #include <wtf/StdLibExtras.h> 25.14 - #include <wtf/text/StringHash.h> 25.15 - 25.16 --int xpathyyparse(void*); 25.17 -- 25.18 -+using namespace WebCore; 25.19 - using namespace WTF; 25.20 - using namespace Unicode; 25.21 -- 25.22 --namespace WebCore { 25.23 --namespace XPath { 25.24 -- 25.25 --class LocationPath; 25.26 -- 25.27 --#include "XPathGrammar.h" 25.28 -+using namespace XPath; 25.29 -+ 25.30 -+extern int xpathyyparse(WebCore::XPath::Parser*); 25.31 -+#include "XPathGrammar.h" 25.32 - 25.33 - Parser* Parser::currentParser = 0; 25.34 -- 25.35 -+ 25.36 - enum XMLCat { NameStart, NameCont, NotPartOfName }; 25.37 - 25.38 -@@ -631,4 +628,2 @@ 25.39 - } 25.40 - 25.41 --} 25.42 --}
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 26.2 +++ b/libwebkit/stuff/patches/CodeGeneratorGObject-bug-84526.patch Thu Nov 23 17:20:44 2017 +0100 26.3 @@ -0,0 +1,14 @@ 26.4 +--- Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (revision 115562) 26.5 ++++ Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (working copy) 26.6 +@@ -1444,9 +1444,10 @@ 26.7 + print IMPL "namespace WebKit {\n\n"; 26.8 + print IMPL @cBodyPriv; 26.9 + print IMPL "} // namespace WebKit\n\n"; 26.10 ++ 26.11 ++ print IMPL @cBodyProperties; 26.12 + print IMPL "#endif // ${conditionalString}\n\n" if $conditionalString; 26.13 + 26.14 +- print IMPL @cBodyProperties; 26.15 + print IMPL @cBody; 26.16 + 26.17 + close(IMPL);
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/libwebkit/stuff/patches/GtkClickCounter.patch Thu Nov 23 17:20:44 2017 +0100 27.3 @@ -0,0 +1,13 @@ 27.4 +--- libwebkit-1.8.3/Source/WebCore/platform/gtk/GtkClickCounter.cpp 27.5 ++++ libwebkit-1.8.3/Source/WebCore/platform/gtk/GtkClickCounter.cpp 27.6 +@@ -85,8 +85,8 @@ 27.7 + guint32 eventTime = getEventTime(event); 27.8 + 27.9 + if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) 27.10 +- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) 27.11 +- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) 27.12 ++ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) 27.13 ++ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) 27.14 + && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime)) 27.15 + && (buttonEvent->button == m_previousClickButton))) 27.16 + m_currentClickCount++;
28.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 28.2 +++ b/libwebkit/stuff/patches/README Thu Nov 23 17:20:44 2017 +0100 28.3 @@ -0,0 +1,2 @@ 28.4 +Upstream patches for building webkit gtk with newer bison 2.6, see: 28.5 +http://trac.webkit.org/changeset/124099 28.6 \ No newline at end of file
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 29.2 +++ b/libwebkit/stuff/patches/WebCore_ChangeLog_124099.patch Thu Nov 23 17:20:44 2017 +0100 29.3 @@ -0,0 +1,32 @@ 29.4 +Index: trunk/Source/WebCore/ChangeLog 29.5 +=================================================================== 29.6 +--- trunk/Source/WebCore/ChangeLog (revision 124098) 29.7 ++++ trunk/Source/WebCore/ChangeLog (revision 124099) 29.8 +@@ -1,2 +1,27 @@ 29.9 ++2012-07-30 Alexis Menard <alexis.menard@openbossa.org> 29.10 ++ 29.11 ++ Build fix with newer bison 2.6. 29.12 ++ https://bugs.webkit.org/show_bug.cgi?id=92264 29.13 ++ 29.14 ++ Reviewed by Adam Barth. 29.15 ++ 29.16 ++ As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html 29.17 ++ YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS 29.18 ++ version I had access to as well as recent Linux runs at least version 2.3 so it's safe 29.19 ++ to use the replacement of these deprecated macros in favor of %lex-param and %parse-param. 29.20 ++ As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release 29.21 ++ of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore. 29.22 ++ 29.23 ++ No new tests : build fix and the patch should not trigger any regressions 29.24 ++ 29.25 ++ * css/CSSGrammar.y: 29.26 ++ * css/CSSParser.cpp: 29.27 ++ * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define. 29.28 ++ * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h 29.29 ++ therefore including this file within the namespace {} declarations leads to xpathyyparse being 29.30 ++ defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp 29.31 ++ (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 29.32 ++ to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same. 29.33 ++ 29.34 + 2012-07-30 Sadrul Habib Chowdhury <sadrul@chromium.org> 29.35 +
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/libwebkit/stuff/patches/WebCore_css_CSSGrammar.y_124099.patch Thu Nov 23 17:20:44 2017 +0100 30.3 @@ -0,0 +1,26 @@ 30.4 +Index: trunk/Source/WebCore/css/CSSGrammar.y 30.5 +=================================================================== 30.6 +--- trunk/Source/WebCore/css/CSSGrammar.y (revision 121874) 30.7 ++++ trunk/Source/WebCore/css/CSSGrammar.y (revision 124099) 30.8 +@@ -54,11 +54,10 @@ 30.9 + #define YYDEBUG 0 30.10 + 30.11 +-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x 30.12 +-#define YYPARSE_PARAM parser 30.13 +-#define YYLEX_PARAM parser 30.14 +- 30.15 + %} 30.16 + 30.17 + %pure_parser 30.18 ++ 30.19 ++%parse-param { CSSParser* parser } 30.20 ++%lex-param { CSSParser* parser } 30.21 + 30.22 + %union { 30.23 +@@ -90,5 +89,5 @@ 30.24 + %{ 30.25 + 30.26 +-static inline int cssyyerror(const char*) 30.27 ++static inline int cssyyerror(void*, const char*) 30.28 + { 30.29 + return 1;
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/libwebkit/stuff/patches/WebCore_css_CSSParser.cpp_124099.patch Thu Nov 23 17:20:44 2017 +0100 31.3 @@ -0,0 +1,11 @@ 31.4 +Index: trunk/Source/WebCore/css/CSSParser.cpp 31.5 +=================================================================== 31.6 +--- trunk/Source/WebCore/css/CSSParser.cpp (revision 123746) 31.7 ++++ trunk/Source/WebCore/css/CSSParser.cpp (revision 124099) 31.8 +@@ -115,5 +115,5 @@ 31.9 + #endif 31.10 + 31.11 +-extern int cssyyparse(void* parser); 31.12 ++extern int cssyyparse(WebCore::CSSParser*); 31.13 + 31.14 + using namespace std;
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 32.2 +++ b/libwebkit/stuff/patches/WebCore_xml_XPathGrammar.y_124099.patch Thu Nov 23 17:20:44 2017 +0100 32.3 @@ -0,0 +1,407 @@ 32.4 +Index: trunk/Source/WebCore/xml/XPathGrammar.y 32.5 +=================================================================== 32.6 +--- trunk/Source/WebCore/xml/XPathGrammar.y (revision 97771) 32.7 ++++ trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099) 32.8 +@@ -35,4 +35,5 @@ 32.9 + #include "XPathPath.h" 32.10 + #include "XPathPredicate.h" 32.11 ++#include "XPathStep.h" 32.12 + #include "XPathVariableReference.h" 32.13 + #include <wtf/FastMalloc.h> 32.14 +@@ -45,6 +46,4 @@ 32.15 + #define YYDEBUG 0 32.16 + #define YYMAXDEPTH 10000 32.17 +-#define YYPARSE_PARAM parserParameter 32.18 +-#define PARSER static_cast<Parser*>(parserParameter) 32.19 + 32.20 + using namespace WebCore; 32.21 +@@ -54,4 +53,5 @@ 32.22 + 32.23 + %pure_parser 32.24 ++%parse-param { WebCore::XPath::Parser* parser } 32.25 + 32.26 + %union 32.27 +@@ -72,5 +72,5 @@ 32.28 + 32.29 + static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } 32.30 +-static void xpathyyerror(const char*) { } 32.31 ++static void xpathyyerror(void*, const char*) { } 32.32 + 32.33 + %} 32.34 +@@ -119,5 +119,5 @@ 32.35 + OrExpr 32.36 + { 32.37 +- PARSER->m_topExpr = $1; 32.38 ++ parser->m_topExpr = $1; 32.39 + } 32.40 + ; 32.41 +@@ -139,5 +139,5 @@ 32.42 + { 32.43 + $$ = new LocationPath; 32.44 +- PARSER->registerParseNode($$); 32.45 ++ parser->registerParseNode($$); 32.46 + } 32.47 + | 32.48 +@@ -151,5 +151,5 @@ 32.49 + $$ = $2; 32.50 + $$->insertFirstStep($1); 32.51 +- PARSER->unregisterParseNode($1); 32.52 ++ parser->unregisterParseNode($1); 32.53 + } 32.54 + ; 32.55 +@@ -160,6 +160,6 @@ 32.56 + $$ = new LocationPath; 32.57 + $$->appendStep($1); 32.58 +- PARSER->unregisterParseNode($1); 32.59 +- PARSER->registerParseNode($$); 32.60 ++ parser->unregisterParseNode($1); 32.61 ++ parser->registerParseNode($$); 32.62 + } 32.63 + | 32.64 +@@ -167,5 +167,5 @@ 32.65 + { 32.66 + $$->appendStep($3); 32.67 +- PARSER->unregisterParseNode($3); 32.68 ++ parser->unregisterParseNode($3); 32.69 + } 32.70 + | 32.71 +@@ -174,6 +174,6 @@ 32.72 + $$->appendStep($2); 32.73 + $$->appendStep($3); 32.74 +- PARSER->unregisterParseNode($2); 32.75 +- PARSER->unregisterParseNode($3); 32.76 ++ parser->unregisterParseNode($2); 32.77 ++ parser->unregisterParseNode($3); 32.78 + } 32.79 + ; 32.80 +@@ -184,9 +184,9 @@ 32.81 + if ($2) { 32.82 + $$ = new Step(Step::ChildAxis, *$1, *$2); 32.83 +- PARSER->deletePredicateVector($2); 32.84 ++ parser->deletePredicateVector($2); 32.85 + } else 32.86 + $$ = new Step(Step::ChildAxis, *$1); 32.87 +- PARSER->deleteNodeTest($1); 32.88 +- PARSER->registerParseNode($$); 32.89 ++ parser->deleteNodeTest($1); 32.90 ++ parser->registerParseNode($$); 32.91 + } 32.92 + | 32.93 +@@ -195,6 +195,6 @@ 32.94 + String localName; 32.95 + String namespaceURI; 32.96 +- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { 32.97 +- PARSER->m_gotNamespaceError = true; 32.98 ++ if (!parser->expandQName(*$1, localName, namespaceURI)) { 32.99 ++ parser->m_gotNamespaceError = true; 32.100 + YYABORT; 32.101 + } 32.102 +@@ -202,9 +202,9 @@ 32.103 + if ($2) { 32.104 + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); 32.105 +- PARSER->deletePredicateVector($2); 32.106 ++ parser->deletePredicateVector($2); 32.107 + } else 32.108 + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 32.109 +- PARSER->deleteString($1); 32.110 +- PARSER->registerParseNode($$); 32.111 ++ parser->deleteString($1); 32.112 ++ parser->registerParseNode($$); 32.113 + } 32.114 + | 32.115 +@@ -213,9 +213,9 @@ 32.116 + if ($3) { 32.117 + $$ = new Step($1, *$2, *$3); 32.118 +- PARSER->deletePredicateVector($3); 32.119 ++ parser->deletePredicateVector($3); 32.120 + } else 32.121 + $$ = new Step($1, *$2); 32.122 +- PARSER->deleteNodeTest($2); 32.123 +- PARSER->registerParseNode($$); 32.124 ++ parser->deleteNodeTest($2); 32.125 ++ parser->registerParseNode($$); 32.126 + } 32.127 + | 32.128 +@@ -224,6 +224,6 @@ 32.129 + String localName; 32.130 + String namespaceURI; 32.131 +- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { 32.132 +- PARSER->m_gotNamespaceError = true; 32.133 ++ if (!parser->expandQName(*$2, localName, namespaceURI)) { 32.134 ++ parser->m_gotNamespaceError = true; 32.135 + YYABORT; 32.136 + } 32.137 +@@ -231,9 +231,9 @@ 32.138 + if ($3) { 32.139 + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); 32.140 +- PARSER->deletePredicateVector($3); 32.141 ++ parser->deletePredicateVector($3); 32.142 + } else 32.143 + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 32.144 +- PARSER->deleteString($2); 32.145 +- PARSER->registerParseNode($$); 32.146 ++ parser->deleteString($2); 32.147 ++ parser->registerParseNode($$); 32.148 + } 32.149 + | 32.150 +@@ -260,6 +260,6 @@ 32.151 + $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); 32.152 + 32.153 +- PARSER->deleteString($1); 32.154 +- PARSER->registerNodeTest($$); 32.155 ++ parser->deleteString($1); 32.156 ++ parser->registerNodeTest($$); 32.157 + } 32.158 + | 32.159 +@@ -267,6 +267,6 @@ 32.160 + { 32.161 + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); 32.162 +- PARSER->deleteString($1); 32.163 +- PARSER->registerNodeTest($$); 32.164 ++ parser->deleteString($1); 32.165 ++ parser->registerNodeTest($$); 32.166 + } 32.167 + | 32.168 +@@ -274,7 +274,7 @@ 32.169 + { 32.170 + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); 32.171 +- PARSER->deleteString($1); 32.172 +- PARSER->deleteString($3); 32.173 +- PARSER->registerNodeTest($$); 32.174 ++ parser->deleteString($1); 32.175 ++ parser->deleteString($3); 32.176 ++ parser->registerNodeTest($$); 32.177 + } 32.178 + ; 32.179 +@@ -294,6 +294,6 @@ 32.180 + $$ = new Vector<Predicate*>; 32.181 + $$->append(new Predicate($1)); 32.182 +- PARSER->unregisterParseNode($1); 32.183 +- PARSER->registerPredicateVector($$); 32.184 ++ parser->unregisterParseNode($1); 32.185 ++ parser->registerPredicateVector($$); 32.186 + } 32.187 + | 32.188 +@@ -301,5 +301,5 @@ 32.189 + { 32.190 + $$->append(new Predicate($2)); 32.191 +- PARSER->unregisterParseNode($2); 32.192 ++ parser->unregisterParseNode($2); 32.193 + } 32.194 + ; 32.195 +@@ -316,5 +316,5 @@ 32.196 + { 32.197 + $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 32.198 +- PARSER->registerParseNode($$); 32.199 ++ parser->registerParseNode($$); 32.200 + } 32.201 + ; 32.202 +@@ -324,5 +324,5 @@ 32.203 + { 32.204 + $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 32.205 +- PARSER->registerParseNode($$); 32.206 ++ parser->registerParseNode($$); 32.207 + } 32.208 + | 32.209 +@@ -330,5 +330,5 @@ 32.210 + { 32.211 + $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 32.212 +- PARSER->registerParseNode($$); 32.213 ++ parser->registerParseNode($$); 32.214 + } 32.215 + ; 32.216 +@@ -338,6 +338,6 @@ 32.217 + { 32.218 + $$ = new VariableReference(*$1); 32.219 +- PARSER->deleteString($1); 32.220 +- PARSER->registerParseNode($$); 32.221 ++ parser->deleteString($1); 32.222 ++ parser->registerParseNode($$); 32.223 + } 32.224 + | 32.225 +@@ -350,6 +350,6 @@ 32.226 + { 32.227 + $$ = new StringExpression(*$1); 32.228 +- PARSER->deleteString($1); 32.229 +- PARSER->registerParseNode($$); 32.230 ++ parser->deleteString($1); 32.231 ++ parser->registerParseNode($$); 32.232 + } 32.233 + | 32.234 +@@ -357,6 +357,6 @@ 32.235 + { 32.236 + $$ = new Number($1->toDouble()); 32.237 +- PARSER->deleteString($1); 32.238 +- PARSER->registerParseNode($$); 32.239 ++ parser->deleteString($1); 32.240 ++ parser->registerParseNode($$); 32.241 + } 32.242 + | 32.243 +@@ -370,6 +370,6 @@ 32.244 + if (!$$) 32.245 + YYABORT; 32.246 +- PARSER->deleteString($1); 32.247 +- PARSER->registerParseNode($$); 32.248 ++ parser->deleteString($1); 32.249 ++ parser->registerParseNode($$); 32.250 + } 32.251 + | 32.252 +@@ -379,7 +379,7 @@ 32.253 + if (!$$) 32.254 + YYABORT; 32.255 +- PARSER->deleteString($1); 32.256 +- PARSER->deleteExpressionVector($3); 32.257 +- PARSER->registerParseNode($$); 32.258 ++ parser->deleteString($1); 32.259 ++ parser->deleteExpressionVector($3); 32.260 ++ parser->registerParseNode($$); 32.261 + } 32.262 + ; 32.263 +@@ -390,6 +390,6 @@ 32.264 + $$ = new Vector<Expression*>; 32.265 + $$->append($1); 32.266 +- PARSER->unregisterParseNode($1); 32.267 +- PARSER->registerExpressionVector($$); 32.268 ++ parser->unregisterParseNode($1); 32.269 ++ parser->registerExpressionVector($$); 32.270 + } 32.271 + | 32.272 +@@ -397,5 +397,5 @@ 32.273 + { 32.274 + $$->append($3); 32.275 +- PARSER->unregisterParseNode($3); 32.276 ++ parser->unregisterParseNode($3); 32.277 + } 32.278 + ; 32.279 +@@ -413,7 +413,7 @@ 32.280 + $$->addSubExpression($1); 32.281 + $$->addSubExpression($3); 32.282 +- PARSER->unregisterParseNode($1); 32.283 +- PARSER->unregisterParseNode($3); 32.284 +- PARSER->registerParseNode($$); 32.285 ++ parser->unregisterParseNode($1); 32.286 ++ parser->unregisterParseNode($3); 32.287 ++ parser->registerParseNode($$); 32.288 + } 32.289 + ; 32.290 +@@ -431,7 +431,7 @@ 32.291 + $3->setAbsolute(true); 32.292 + $$ = new Path(static_cast<Filter*>($1), $3); 32.293 +- PARSER->unregisterParseNode($1); 32.294 +- PARSER->unregisterParseNode($3); 32.295 +- PARSER->registerParseNode($$); 32.296 ++ parser->unregisterParseNode($1); 32.297 ++ parser->unregisterParseNode($3); 32.298 ++ parser->registerParseNode($$); 32.299 + } 32.300 + | 32.301 +@@ -441,8 +441,8 @@ 32.302 + $3->setAbsolute(true); 32.303 + $$ = new Path(static_cast<Filter*>($1), $3); 32.304 +- PARSER->unregisterParseNode($1); 32.305 +- PARSER->unregisterParseNode($2); 32.306 +- PARSER->unregisterParseNode($3); 32.307 +- PARSER->registerParseNode($$); 32.308 ++ parser->unregisterParseNode($1); 32.309 ++ parser->unregisterParseNode($2); 32.310 ++ parser->unregisterParseNode($3); 32.311 ++ parser->registerParseNode($$); 32.312 + } 32.313 + ; 32.314 +@@ -454,7 +454,7 @@ 32.315 + { 32.316 + $$ = new Filter($1, *$2); 32.317 +- PARSER->unregisterParseNode($1); 32.318 +- PARSER->deletePredicateVector($2); 32.319 +- PARSER->registerParseNode($$); 32.320 ++ parser->unregisterParseNode($1); 32.321 ++ parser->deletePredicateVector($2); 32.322 ++ parser->registerParseNode($$); 32.323 + } 32.324 + ; 32.325 +@@ -466,7 +466,7 @@ 32.326 + { 32.327 + $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); 32.328 +- PARSER->unregisterParseNode($1); 32.329 +- PARSER->unregisterParseNode($3); 32.330 +- PARSER->registerParseNode($$); 32.331 ++ parser->unregisterParseNode($1); 32.332 ++ parser->unregisterParseNode($3); 32.333 ++ parser->registerParseNode($$); 32.334 + } 32.335 + ; 32.336 +@@ -478,7 +478,7 @@ 32.337 + { 32.338 + $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); 32.339 +- PARSER->unregisterParseNode($1); 32.340 +- PARSER->unregisterParseNode($3); 32.341 +- PARSER->registerParseNode($$); 32.342 ++ parser->unregisterParseNode($1); 32.343 ++ parser->unregisterParseNode($3); 32.344 ++ parser->registerParseNode($$); 32.345 + } 32.346 + ; 32.347 +@@ -490,7 +490,7 @@ 32.348 + { 32.349 + $$ = new EqTestOp($2, $1, $3); 32.350 +- PARSER->unregisterParseNode($1); 32.351 +- PARSER->unregisterParseNode($3); 32.352 +- PARSER->registerParseNode($$); 32.353 ++ parser->unregisterParseNode($1); 32.354 ++ parser->unregisterParseNode($3); 32.355 ++ parser->registerParseNode($$); 32.356 + } 32.357 + ; 32.358 +@@ -502,7 +502,7 @@ 32.359 + { 32.360 + $$ = new EqTestOp($2, $1, $3); 32.361 +- PARSER->unregisterParseNode($1); 32.362 +- PARSER->unregisterParseNode($3); 32.363 +- PARSER->registerParseNode($$); 32.364 ++ parser->unregisterParseNode($1); 32.365 ++ parser->unregisterParseNode($3); 32.366 ++ parser->registerParseNode($$); 32.367 + } 32.368 + ; 32.369 +@@ -514,7 +514,7 @@ 32.370 + { 32.371 + $$ = new NumericOp(NumericOp::OP_Add, $1, $3); 32.372 +- PARSER->unregisterParseNode($1); 32.373 +- PARSER->unregisterParseNode($3); 32.374 +- PARSER->registerParseNode($$); 32.375 ++ parser->unregisterParseNode($1); 32.376 ++ parser->unregisterParseNode($3); 32.377 ++ parser->registerParseNode($$); 32.378 + } 32.379 + | 32.380 +@@ -522,7 +522,7 @@ 32.381 + { 32.382 + $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); 32.383 +- PARSER->unregisterParseNode($1); 32.384 +- PARSER->unregisterParseNode($3); 32.385 +- PARSER->registerParseNode($$); 32.386 ++ parser->unregisterParseNode($1); 32.387 ++ parser->unregisterParseNode($3); 32.388 ++ parser->registerParseNode($$); 32.389 + } 32.390 + ; 32.391 +@@ -534,7 +534,7 @@ 32.392 + { 32.393 + $$ = new NumericOp($2, $1, $3); 32.394 +- PARSER->unregisterParseNode($1); 32.395 +- PARSER->unregisterParseNode($3); 32.396 +- PARSER->registerParseNode($$); 32.397 ++ parser->unregisterParseNode($1); 32.398 ++ parser->unregisterParseNode($3); 32.399 ++ parser->registerParseNode($$); 32.400 + } 32.401 + ; 32.402 +@@ -547,6 +547,6 @@ 32.403 + $$ = new Negative; 32.404 + $$->addSubExpression($2); 32.405 +- PARSER->unregisterParseNode($2); 32.406 +- PARSER->registerParseNode($$); 32.407 ++ parser->unregisterParseNode($2); 32.408 ++ parser->registerParseNode($$); 32.409 + } 32.410 + ;
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 33.2 +++ b/libwebkit/stuff/patches/WebCore_xml_XPathParser.cpp_124099.patch Thu Nov 23 17:20:44 2017 +0100 33.3 @@ -0,0 +1,39 @@ 33.4 +Index: trunk/Source/WebCore/xml/XPathParser.cpp 33.5 +=================================================================== 33.6 +--- trunk/Source/WebCore/xml/XPathParser.cpp (revision 97771) 33.7 ++++ trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099) 33.8 +@@ -33,22 +33,19 @@ 33.9 + #include "XPathException.h" 33.10 + #include "XPathNSResolver.h" 33.11 ++#include "XPathPath.h" 33.12 + #include "XPathStep.h" 33.13 + #include <wtf/StdLibExtras.h> 33.14 + #include <wtf/text/StringHash.h> 33.15 + 33.16 +-int xpathyyparse(void*); 33.17 +- 33.18 ++using namespace WebCore; 33.19 + using namespace WTF; 33.20 + using namespace Unicode; 33.21 +- 33.22 +-namespace WebCore { 33.23 +-namespace XPath { 33.24 +- 33.25 +-class LocationPath; 33.26 +- 33.27 +-#include "XPathGrammar.h" 33.28 ++using namespace XPath; 33.29 ++ 33.30 ++extern int xpathyyparse(WebCore::XPath::Parser*); 33.31 ++#include "XPathGrammar.h" 33.32 + 33.33 + Parser* Parser::currentParser = 0; 33.34 +- 33.35 ++ 33.36 + enum XMLCat { NameStart, NameCont, NotPartOfName }; 33.37 + 33.38 +@@ -631,4 +628,2 @@ 33.39 + } 33.40 + 33.41 +-} 33.42 +-}
34.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 34.2 +++ b/libwebkit/stuff/patches/series Thu Nov 23 17:20:44 2017 +0100 34.3 @@ -0,0 +1,7 @@ 34.4 +CodeGeneratorGObject-bug-84526.patch 34.5 +GtkClickCounter.patch 34.6 +WebCore_ChangeLog_124099.patch 34.7 +WebCore_css_CSSGrammar.y_124099.patch 34.8 +WebCore_css_CSSParser.cpp_124099.patch 34.9 +WebCore_xml_XPathGrammar.y_124099.patch 34.10 +WebCore_xml_XPathParser.cpp_124099.patch