wok rev 14107
Up: libwekkit-video (1.8.3) + Build fix with bison 2.6
| author | Dominique Corbex <domcox@slitaz.org> |
|---|---|
| date | Sun Feb 24 09:19:03 2013 +0100 (2013-02-24) |
| parents | 6f5c5997b4b4 |
| children | cc1a7a187042 |
| files | libwebkit-video/receipt libwebkit-video/stuff/README libwebkit-video/stuff/WebCore_ChangeLog_124099.diff libwebkit-video/stuff/WebCore_css_CSSGrammar.y_124099.diff libwebkit-video/stuff/WebCore_css_CSSParser.cpp_124099.diff libwebkit-video/stuff/WebCore_xml_XPathGrammar.y_124099.diff libwebkit-video/stuff/WebCore_xml_XPathParser.cpp_124099.diff |
line diff
1.1 --- a/libwebkit-video/receipt Sun Feb 24 09:16:13 2013 +0100 1.2 +++ b/libwebkit-video/receipt Sun Feb 24 09:19:03 2013 +0100 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="libwebkit-video" 1.7 -VERSION="1.8.1" 1.8 +VERSION="1.8.3" 1.9 CATEGORY="network" 1.10 SHORT_DESC="xHTML render library." 1.11 MAINTAINER="mallory@sweetpeople.org" 1.12 @@ -14,15 +14,14 @@ 1.13 xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \ 1.14 xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \ 1.15 xorg-libXrandr xorg-libXrender xorg-libXt acl xorg-libXdamage libsoup \ 1.16 -gcc-lib-base libtasn1 util-linux-uuid glib-networking" 1.17 +gcc-lib-base libtasn1 util-linux-uuid glib-networking gst-plugins-base" 1.18 BUILD_DEPENDS="gtk+-dev enchant enchant-dev gperf libxslt-dev jpeg-dev \ 1.19 libpng-dev glib-dev autoconf automake gnutls-dev sqlite-dev libtool \ 1.20 m4 bison flex xorg-libXdamage-dev acl-dev libsoup-dev libxml2-dev \ 1.21 libxcb-dev xcb-util-dev util-linux-uuid-dev zlib-dev libtasn1-dev \ 1.22 gobject-introspection-dev tar gettext glib-networking-dev \ 1.23 -gstreamer-dev gst-plugins-base-dev gtk-doc" 1.24 -SUGGESTED="gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad \ 1.25 -gst-plugins-ugly gst-ffmpeg" 1.26 +gstreamer-dev gst-plugins-base-dev orc-dev" 1.27 +SUGGESTED="gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg" 1.28 1.29 # Rules to configure and make the package. 1.30 compile_rules() 1.31 @@ -30,6 +29,13 @@ 1.32 cd $src 1.33 # libwebkit does not like parallel builds. 1.34 export MAKEFLAGS=$(echo $MAKEFLAGS | sed 's/-j[0-9]*/-j1/') 1.35 + # Build fix with newer bison 2.6 1.36 + for file_diff in $stuff/*.diff; do 1.37 + echo -n "Applying patch $(basename $file_diff)" 1.38 + patch -Np1 -i $file_diff > /dev/null 1.39 + status 1.40 + done 1.41 + # Build 1.42 ./configure \ 1.43 --prefix=/usr \ 1.44 --infodir=/usr/share/info \ 1.45 @@ -41,6 +47,7 @@ 1.46 --disable-geolocation \ 1.47 --with-unicode-backend=glib \ 1.48 --with-gtk=2.0 \ 1.49 + --disable-webkit2 \ 1.50 --disable-gtk-doc-html \ 1.51 $CONFIGURE_ARGS && 1.52 make all stamp-po && make DESTDIR=$DESTDIR install && 1.53 @@ -51,6 +58,7 @@ 1.54 genpkg_rules() 1.55 { 1.56 mkdir -p $fs/usr/lib $fs/usr/bin 1.57 - [ -d $_pkg/usr/lib/girepository-1.0 ] && cp -a $_pkg/usr/lib/girepository-1.0 $fs/usr/lib 1.58 + [ -d $_pkg/usr/lib/girepository-1.0 ] && 1.59 + cp -a $_pkg/usr/lib/girepository-1.0 $fs/usr/lib 1.60 cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 1.61 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/libwebkit-video/stuff/README Sun Feb 24 09:19:03 2013 +0100 2.3 @@ -0,0 +1,2 @@ 2.4 +Upstream patches for building webkit gtk with newer bison 2.6, see: 2.5 +http://trac.webkit.org/changeset/124099 2.6 \ No newline at end of file
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/libwebkit-video/stuff/WebCore_ChangeLog_124099.diff Sun Feb 24 09:19:03 2013 +0100 3.3 @@ -0,0 +1,32 @@ 3.4 +Index: trunk/Source/WebCore/ChangeLog 3.5 +=================================================================== 3.6 +--- trunk/Source/WebCore/ChangeLog (revision 124098) 3.7 ++++ trunk/Source/WebCore/ChangeLog (revision 124099) 3.8 +@@ -1,2 +1,27 @@ 3.9 ++2012-07-30 Alexis Menard <alexis.menard@openbossa.org> 3.10 ++ 3.11 ++ Build fix with newer bison 2.6. 3.12 ++ https://bugs.webkit.org/show_bug.cgi?id=92264 3.13 ++ 3.14 ++ Reviewed by Adam Barth. 3.15 ++ 3.16 ++ As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html 3.17 ++ YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS 3.18 ++ version I had access to as well as recent Linux runs at least version 2.3 so it's safe 3.19 ++ to use the replacement of these deprecated macros in favor of %lex-param and %parse-param. 3.20 ++ As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release 3.21 ++ of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore. 3.22 ++ 3.23 ++ No new tests : build fix and the patch should not trigger any regressions 3.24 ++ 3.25 ++ * css/CSSGrammar.y: 3.26 ++ * css/CSSParser.cpp: 3.27 ++ * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define. 3.28 ++ * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h 3.29 ++ therefore including this file within the namespace {} declarations leads to xpathyyparse being 3.30 ++ defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp 3.31 ++ (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 3.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. 3.33 ++ 3.34 + 2012-07-30 Sadrul Habib Chowdhury <sadrul@chromium.org> 3.35 +
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/libwebkit-video/stuff/WebCore_css_CSSGrammar.y_124099.diff Sun Feb 24 09:19:03 2013 +0100 4.3 @@ -0,0 +1,26 @@ 4.4 +Index: trunk/Source/WebCore/css/CSSGrammar.y 4.5 +=================================================================== 4.6 +--- trunk/Source/WebCore/css/CSSGrammar.y (revision 121874) 4.7 ++++ trunk/Source/WebCore/css/CSSGrammar.y (revision 124099) 4.8 +@@ -54,11 +54,10 @@ 4.9 + #define YYDEBUG 0 4.10 + 4.11 +-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x 4.12 +-#define YYPARSE_PARAM parser 4.13 +-#define YYLEX_PARAM parser 4.14 +- 4.15 + %} 4.16 + 4.17 + %pure_parser 4.18 ++ 4.19 ++%parse-param { CSSParser* parser } 4.20 ++%lex-param { CSSParser* parser } 4.21 + 4.22 + %union { 4.23 +@@ -90,5 +89,5 @@ 4.24 + %{ 4.25 + 4.26 +-static inline int cssyyerror(const char*) 4.27 ++static inline int cssyyerror(void*, const char*) 4.28 + { 4.29 + return 1;
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/libwebkit-video/stuff/WebCore_css_CSSParser.cpp_124099.diff Sun Feb 24 09:19:03 2013 +0100 5.3 @@ -0,0 +1,11 @@ 5.4 +Index: trunk/Source/WebCore/css/CSSParser.cpp 5.5 +=================================================================== 5.6 +--- trunk/Source/WebCore/css/CSSParser.cpp (revision 123746) 5.7 ++++ trunk/Source/WebCore/css/CSSParser.cpp (revision 124099) 5.8 +@@ -115,5 +115,5 @@ 5.9 + #endif 5.10 + 5.11 +-extern int cssyyparse(void* parser); 5.12 ++extern int cssyyparse(WebCore::CSSParser*); 5.13 + 5.14 + using namespace std;
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/libwebkit-video/stuff/WebCore_xml_XPathGrammar.y_124099.diff Sun Feb 24 09:19:03 2013 +0100 6.3 @@ -0,0 +1,407 @@ 6.4 +Index: trunk/Source/WebCore/xml/XPathGrammar.y 6.5 +=================================================================== 6.6 +--- trunk/Source/WebCore/xml/XPathGrammar.y (revision 97771) 6.7 ++++ trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099) 6.8 +@@ -35,4 +35,5 @@ 6.9 + #include "XPathPath.h" 6.10 + #include "XPathPredicate.h" 6.11 ++#include "XPathStep.h" 6.12 + #include "XPathVariableReference.h" 6.13 + #include <wtf/FastMalloc.h> 6.14 +@@ -45,6 +46,4 @@ 6.15 + #define YYDEBUG 0 6.16 + #define YYMAXDEPTH 10000 6.17 +-#define YYPARSE_PARAM parserParameter 6.18 +-#define PARSER static_cast<Parser*>(parserParameter) 6.19 + 6.20 + using namespace WebCore; 6.21 +@@ -54,4 +53,5 @@ 6.22 + 6.23 + %pure_parser 6.24 ++%parse-param { WebCore::XPath::Parser* parser } 6.25 + 6.26 + %union 6.27 +@@ -72,5 +72,5 @@ 6.28 + 6.29 + static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } 6.30 +-static void xpathyyerror(const char*) { } 6.31 ++static void xpathyyerror(void*, const char*) { } 6.32 + 6.33 + %} 6.34 +@@ -119,5 +119,5 @@ 6.35 + OrExpr 6.36 + { 6.37 +- PARSER->m_topExpr = $1; 6.38 ++ parser->m_topExpr = $1; 6.39 + } 6.40 + ; 6.41 +@@ -139,5 +139,5 @@ 6.42 + { 6.43 + $$ = new LocationPath; 6.44 +- PARSER->registerParseNode($$); 6.45 ++ parser->registerParseNode($$); 6.46 + } 6.47 + | 6.48 +@@ -151,5 +151,5 @@ 6.49 + $$ = $2; 6.50 + $$->insertFirstStep($1); 6.51 +- PARSER->unregisterParseNode($1); 6.52 ++ parser->unregisterParseNode($1); 6.53 + } 6.54 + ; 6.55 +@@ -160,6 +160,6 @@ 6.56 + $$ = new LocationPath; 6.57 + $$->appendStep($1); 6.58 +- PARSER->unregisterParseNode($1); 6.59 +- PARSER->registerParseNode($$); 6.60 ++ parser->unregisterParseNode($1); 6.61 ++ parser->registerParseNode($$); 6.62 + } 6.63 + | 6.64 +@@ -167,5 +167,5 @@ 6.65 + { 6.66 + $$->appendStep($3); 6.67 +- PARSER->unregisterParseNode($3); 6.68 ++ parser->unregisterParseNode($3); 6.69 + } 6.70 + | 6.71 +@@ -174,6 +174,6 @@ 6.72 + $$->appendStep($2); 6.73 + $$->appendStep($3); 6.74 +- PARSER->unregisterParseNode($2); 6.75 +- PARSER->unregisterParseNode($3); 6.76 ++ parser->unregisterParseNode($2); 6.77 ++ parser->unregisterParseNode($3); 6.78 + } 6.79 + ; 6.80 +@@ -184,9 +184,9 @@ 6.81 + if ($2) { 6.82 + $$ = new Step(Step::ChildAxis, *$1, *$2); 6.83 +- PARSER->deletePredicateVector($2); 6.84 ++ parser->deletePredicateVector($2); 6.85 + } else 6.86 + $$ = new Step(Step::ChildAxis, *$1); 6.87 +- PARSER->deleteNodeTest($1); 6.88 +- PARSER->registerParseNode($$); 6.89 ++ parser->deleteNodeTest($1); 6.90 ++ parser->registerParseNode($$); 6.91 + } 6.92 + | 6.93 +@@ -195,6 +195,6 @@ 6.94 + String localName; 6.95 + String namespaceURI; 6.96 +- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { 6.97 +- PARSER->m_gotNamespaceError = true; 6.98 ++ if (!parser->expandQName(*$1, localName, namespaceURI)) { 6.99 ++ parser->m_gotNamespaceError = true; 6.100 + YYABORT; 6.101 + } 6.102 +@@ -202,9 +202,9 @@ 6.103 + if ($2) { 6.104 + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); 6.105 +- PARSER->deletePredicateVector($2); 6.106 ++ parser->deletePredicateVector($2); 6.107 + } else 6.108 + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 6.109 +- PARSER->deleteString($1); 6.110 +- PARSER->registerParseNode($$); 6.111 ++ parser->deleteString($1); 6.112 ++ parser->registerParseNode($$); 6.113 + } 6.114 + | 6.115 +@@ -213,9 +213,9 @@ 6.116 + if ($3) { 6.117 + $$ = new Step($1, *$2, *$3); 6.118 +- PARSER->deletePredicateVector($3); 6.119 ++ parser->deletePredicateVector($3); 6.120 + } else 6.121 + $$ = new Step($1, *$2); 6.122 +- PARSER->deleteNodeTest($2); 6.123 +- PARSER->registerParseNode($$); 6.124 ++ parser->deleteNodeTest($2); 6.125 ++ parser->registerParseNode($$); 6.126 + } 6.127 + | 6.128 +@@ -224,6 +224,6 @@ 6.129 + String localName; 6.130 + String namespaceURI; 6.131 +- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { 6.132 +- PARSER->m_gotNamespaceError = true; 6.133 ++ if (!parser->expandQName(*$2, localName, namespaceURI)) { 6.134 ++ parser->m_gotNamespaceError = true; 6.135 + YYABORT; 6.136 + } 6.137 +@@ -231,9 +231,9 @@ 6.138 + if ($3) { 6.139 + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); 6.140 +- PARSER->deletePredicateVector($3); 6.141 ++ parser->deletePredicateVector($3); 6.142 + } else 6.143 + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 6.144 +- PARSER->deleteString($2); 6.145 +- PARSER->registerParseNode($$); 6.146 ++ parser->deleteString($2); 6.147 ++ parser->registerParseNode($$); 6.148 + } 6.149 + | 6.150 +@@ -260,6 +260,6 @@ 6.151 + $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); 6.152 + 6.153 +- PARSER->deleteString($1); 6.154 +- PARSER->registerNodeTest($$); 6.155 ++ parser->deleteString($1); 6.156 ++ parser->registerNodeTest($$); 6.157 + } 6.158 + | 6.159 +@@ -267,6 +267,6 @@ 6.160 + { 6.161 + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); 6.162 +- PARSER->deleteString($1); 6.163 +- PARSER->registerNodeTest($$); 6.164 ++ parser->deleteString($1); 6.165 ++ parser->registerNodeTest($$); 6.166 + } 6.167 + | 6.168 +@@ -274,7 +274,7 @@ 6.169 + { 6.170 + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); 6.171 +- PARSER->deleteString($1); 6.172 +- PARSER->deleteString($3); 6.173 +- PARSER->registerNodeTest($$); 6.174 ++ parser->deleteString($1); 6.175 ++ parser->deleteString($3); 6.176 ++ parser->registerNodeTest($$); 6.177 + } 6.178 + ; 6.179 +@@ -294,6 +294,6 @@ 6.180 + $$ = new Vector<Predicate*>; 6.181 + $$->append(new Predicate($1)); 6.182 +- PARSER->unregisterParseNode($1); 6.183 +- PARSER->registerPredicateVector($$); 6.184 ++ parser->unregisterParseNode($1); 6.185 ++ parser->registerPredicateVector($$); 6.186 + } 6.187 + | 6.188 +@@ -301,5 +301,5 @@ 6.189 + { 6.190 + $$->append(new Predicate($2)); 6.191 +- PARSER->unregisterParseNode($2); 6.192 ++ parser->unregisterParseNode($2); 6.193 + } 6.194 + ; 6.195 +@@ -316,5 +316,5 @@ 6.196 + { 6.197 + $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 6.198 +- PARSER->registerParseNode($$); 6.199 ++ parser->registerParseNode($$); 6.200 + } 6.201 + ; 6.202 +@@ -324,5 +324,5 @@ 6.203 + { 6.204 + $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 6.205 +- PARSER->registerParseNode($$); 6.206 ++ parser->registerParseNode($$); 6.207 + } 6.208 + | 6.209 +@@ -330,5 +330,5 @@ 6.210 + { 6.211 + $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 6.212 +- PARSER->registerParseNode($$); 6.213 ++ parser->registerParseNode($$); 6.214 + } 6.215 + ; 6.216 +@@ -338,6 +338,6 @@ 6.217 + { 6.218 + $$ = new VariableReference(*$1); 6.219 +- PARSER->deleteString($1); 6.220 +- PARSER->registerParseNode($$); 6.221 ++ parser->deleteString($1); 6.222 ++ parser->registerParseNode($$); 6.223 + } 6.224 + | 6.225 +@@ -350,6 +350,6 @@ 6.226 + { 6.227 + $$ = new StringExpression(*$1); 6.228 +- PARSER->deleteString($1); 6.229 +- PARSER->registerParseNode($$); 6.230 ++ parser->deleteString($1); 6.231 ++ parser->registerParseNode($$); 6.232 + } 6.233 + | 6.234 +@@ -357,6 +357,6 @@ 6.235 + { 6.236 + $$ = new Number($1->toDouble()); 6.237 +- PARSER->deleteString($1); 6.238 +- PARSER->registerParseNode($$); 6.239 ++ parser->deleteString($1); 6.240 ++ parser->registerParseNode($$); 6.241 + } 6.242 + | 6.243 +@@ -370,6 +370,6 @@ 6.244 + if (!$$) 6.245 + YYABORT; 6.246 +- PARSER->deleteString($1); 6.247 +- PARSER->registerParseNode($$); 6.248 ++ parser->deleteString($1); 6.249 ++ parser->registerParseNode($$); 6.250 + } 6.251 + | 6.252 +@@ -379,7 +379,7 @@ 6.253 + if (!$$) 6.254 + YYABORT; 6.255 +- PARSER->deleteString($1); 6.256 +- PARSER->deleteExpressionVector($3); 6.257 +- PARSER->registerParseNode($$); 6.258 ++ parser->deleteString($1); 6.259 ++ parser->deleteExpressionVector($3); 6.260 ++ parser->registerParseNode($$); 6.261 + } 6.262 + ; 6.263 +@@ -390,6 +390,6 @@ 6.264 + $$ = new Vector<Expression*>; 6.265 + $$->append($1); 6.266 +- PARSER->unregisterParseNode($1); 6.267 +- PARSER->registerExpressionVector($$); 6.268 ++ parser->unregisterParseNode($1); 6.269 ++ parser->registerExpressionVector($$); 6.270 + } 6.271 + | 6.272 +@@ -397,5 +397,5 @@ 6.273 + { 6.274 + $$->append($3); 6.275 +- PARSER->unregisterParseNode($3); 6.276 ++ parser->unregisterParseNode($3); 6.277 + } 6.278 + ; 6.279 +@@ -413,7 +413,7 @@ 6.280 + $$->addSubExpression($1); 6.281 + $$->addSubExpression($3); 6.282 +- PARSER->unregisterParseNode($1); 6.283 +- PARSER->unregisterParseNode($3); 6.284 +- PARSER->registerParseNode($$); 6.285 ++ parser->unregisterParseNode($1); 6.286 ++ parser->unregisterParseNode($3); 6.287 ++ parser->registerParseNode($$); 6.288 + } 6.289 + ; 6.290 +@@ -431,7 +431,7 @@ 6.291 + $3->setAbsolute(true); 6.292 + $$ = new Path(static_cast<Filter*>($1), $3); 6.293 +- PARSER->unregisterParseNode($1); 6.294 +- PARSER->unregisterParseNode($3); 6.295 +- PARSER->registerParseNode($$); 6.296 ++ parser->unregisterParseNode($1); 6.297 ++ parser->unregisterParseNode($3); 6.298 ++ parser->registerParseNode($$); 6.299 + } 6.300 + | 6.301 +@@ -441,8 +441,8 @@ 6.302 + $3->setAbsolute(true); 6.303 + $$ = new Path(static_cast<Filter*>($1), $3); 6.304 +- PARSER->unregisterParseNode($1); 6.305 +- PARSER->unregisterParseNode($2); 6.306 +- PARSER->unregisterParseNode($3); 6.307 +- PARSER->registerParseNode($$); 6.308 ++ parser->unregisterParseNode($1); 6.309 ++ parser->unregisterParseNode($2); 6.310 ++ parser->unregisterParseNode($3); 6.311 ++ parser->registerParseNode($$); 6.312 + } 6.313 + ; 6.314 +@@ -454,7 +454,7 @@ 6.315 + { 6.316 + $$ = new Filter($1, *$2); 6.317 +- PARSER->unregisterParseNode($1); 6.318 +- PARSER->deletePredicateVector($2); 6.319 +- PARSER->registerParseNode($$); 6.320 ++ parser->unregisterParseNode($1); 6.321 ++ parser->deletePredicateVector($2); 6.322 ++ parser->registerParseNode($$); 6.323 + } 6.324 + ; 6.325 +@@ -466,7 +466,7 @@ 6.326 + { 6.327 + $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); 6.328 +- PARSER->unregisterParseNode($1); 6.329 +- PARSER->unregisterParseNode($3); 6.330 +- PARSER->registerParseNode($$); 6.331 ++ parser->unregisterParseNode($1); 6.332 ++ parser->unregisterParseNode($3); 6.333 ++ parser->registerParseNode($$); 6.334 + } 6.335 + ; 6.336 +@@ -478,7 +478,7 @@ 6.337 + { 6.338 + $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); 6.339 +- PARSER->unregisterParseNode($1); 6.340 +- PARSER->unregisterParseNode($3); 6.341 +- PARSER->registerParseNode($$); 6.342 ++ parser->unregisterParseNode($1); 6.343 ++ parser->unregisterParseNode($3); 6.344 ++ parser->registerParseNode($$); 6.345 + } 6.346 + ; 6.347 +@@ -490,7 +490,7 @@ 6.348 + { 6.349 + $$ = new EqTestOp($2, $1, $3); 6.350 +- PARSER->unregisterParseNode($1); 6.351 +- PARSER->unregisterParseNode($3); 6.352 +- PARSER->registerParseNode($$); 6.353 ++ parser->unregisterParseNode($1); 6.354 ++ parser->unregisterParseNode($3); 6.355 ++ parser->registerParseNode($$); 6.356 + } 6.357 + ; 6.358 +@@ -502,7 +502,7 @@ 6.359 + { 6.360 + $$ = new EqTestOp($2, $1, $3); 6.361 +- PARSER->unregisterParseNode($1); 6.362 +- PARSER->unregisterParseNode($3); 6.363 +- PARSER->registerParseNode($$); 6.364 ++ parser->unregisterParseNode($1); 6.365 ++ parser->unregisterParseNode($3); 6.366 ++ parser->registerParseNode($$); 6.367 + } 6.368 + ; 6.369 +@@ -514,7 +514,7 @@ 6.370 + { 6.371 + $$ = new NumericOp(NumericOp::OP_Add, $1, $3); 6.372 +- PARSER->unregisterParseNode($1); 6.373 +- PARSER->unregisterParseNode($3); 6.374 +- PARSER->registerParseNode($$); 6.375 ++ parser->unregisterParseNode($1); 6.376 ++ parser->unregisterParseNode($3); 6.377 ++ parser->registerParseNode($$); 6.378 + } 6.379 + | 6.380 +@@ -522,7 +522,7 @@ 6.381 + { 6.382 + $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); 6.383 +- PARSER->unregisterParseNode($1); 6.384 +- PARSER->unregisterParseNode($3); 6.385 +- PARSER->registerParseNode($$); 6.386 ++ parser->unregisterParseNode($1); 6.387 ++ parser->unregisterParseNode($3); 6.388 ++ parser->registerParseNode($$); 6.389 + } 6.390 + ; 6.391 +@@ -534,7 +534,7 @@ 6.392 + { 6.393 + $$ = new NumericOp($2, $1, $3); 6.394 +- PARSER->unregisterParseNode($1); 6.395 +- PARSER->unregisterParseNode($3); 6.396 +- PARSER->registerParseNode($$); 6.397 ++ parser->unregisterParseNode($1); 6.398 ++ parser->unregisterParseNode($3); 6.399 ++ parser->registerParseNode($$); 6.400 + } 6.401 + ; 6.402 +@@ -547,6 +547,6 @@ 6.403 + $$ = new Negative; 6.404 + $$->addSubExpression($2); 6.405 +- PARSER->unregisterParseNode($2); 6.406 +- PARSER->registerParseNode($$); 6.407 ++ parser->unregisterParseNode($2); 6.408 ++ parser->registerParseNode($$); 6.409 + } 6.410 + ;
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/libwebkit-video/stuff/WebCore_xml_XPathParser.cpp_124099.diff Sun Feb 24 09:19:03 2013 +0100 7.3 @@ -0,0 +1,39 @@ 7.4 +Index: trunk/Source/WebCore/xml/XPathParser.cpp 7.5 +=================================================================== 7.6 +--- trunk/Source/WebCore/xml/XPathParser.cpp (revision 97771) 7.7 ++++ trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099) 7.8 +@@ -33,22 +33,19 @@ 7.9 + #include "XPathException.h" 7.10 + #include "XPathNSResolver.h" 7.11 ++#include "XPathPath.h" 7.12 + #include "XPathStep.h" 7.13 + #include <wtf/StdLibExtras.h> 7.14 + #include <wtf/text/StringHash.h> 7.15 + 7.16 +-int xpathyyparse(void*); 7.17 +- 7.18 ++using namespace WebCore; 7.19 + using namespace WTF; 7.20 + using namespace Unicode; 7.21 +- 7.22 +-namespace WebCore { 7.23 +-namespace XPath { 7.24 +- 7.25 +-class LocationPath; 7.26 +- 7.27 +-#include "XPathGrammar.h" 7.28 ++using namespace XPath; 7.29 ++ 7.30 ++extern int xpathyyparse(WebCore::XPath::Parser*); 7.31 ++#include "XPathGrammar.h" 7.32 + 7.33 + Parser* Parser::currentParser = 0; 7.34 +- 7.35 ++ 7.36 + enum XMLCat { NameStart, NameCont, NotPartOfName }; 7.37 + 7.38 +@@ -631,4 +628,2 @@ 7.39 + } 7.40 + 7.41 +-} 7.42 +-}