wok-next rev 20699
Remove libwebkit-video, libwebkit, webkit-r: use webkitgtk or webkit2gtk instead
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu May 24 00:37:52 2018 +0300 (2018-05-24) |
| parents | 33eaabec8ecd |
| children | 014a4f35b014 |
| files | libwebkit-video/receipt libwebkit-video/stuff/patches/CodeGeneratorGObject-bug-84526.patch libwebkit-video/stuff/patches/GtkClickCounter.patch libwebkit-video/stuff/patches/README libwebkit-video/stuff/patches/WebCore_ChangeLog_124099.patch libwebkit-video/stuff/patches/WebCore_css_CSSGrammar.y_124099.patch libwebkit-video/stuff/patches/WebCore_css_CSSParser.cpp_124099.patch libwebkit-video/stuff/patches/WebCore_xml_XPathGrammar.y_124099.patch libwebkit-video/stuff/patches/WebCore_xml_XPathParser.cpp_124099.patch libwebkit-video/stuff/patches/series libwebkit/description.txt libwebkit/receipt libwebkit/stuff/patches/CodeGeneratorGObject-bug-84526.patch libwebkit/stuff/patches/GtkClickCounter.patch libwebkit/stuff/patches/README libwebkit/stuff/patches/WebCore_ChangeLog_124099.patch libwebkit/stuff/patches/WebCore_css_CSSGrammar.y_124099.patch libwebkit/stuff/patches/WebCore_css_CSSParser.cpp_124099.patch libwebkit/stuff/patches/WebCore_xml_XPathGrammar.y_124099.patch libwebkit/stuff/patches/WebCore_xml_XPathParser.cpp_124099.patch libwebkit/stuff/patches/series webkit-r/receipt webkit-r/stuff/CSSParser.cpp.u webkit-r/stuff/bison26.u |
line diff
1.1 --- a/libwebkit-video/receipt Wed May 23 15:22:22 2018 +0000 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,81 +0,0 @@ 1.4 -# SliTaz package receipt v2. 1.5 - 1.6 -PACKAGE="libwebkit-video" 1.7 -VERSION="1.8.3" 1.8 -CATEGORY="network" 1.9 -SHORT_DESC="xHTML render library." 1.10 -MAINTAINER="mallory@sweetpeople.org" 1.11 -LICENSE="LGPL2" 1.12 -SOURCE="webkit" 1.13 -TARBALL="$SOURCE-$VERSION.tar.xz" 1.14 -WEB_SITE="http://webkitgtk.org" 1.15 -WGET_URL="$WEB_SITE/releases/$TARBALL" 1.16 - 1.17 -BUILD_DEPENDS="gtk+-dev enchant enchant-dev gperf libxslt-dev jpeg-dev \ 1.18 -libpng16-dev glib-dev autoconf automake gnutls-dev sqlite3-dev libtool \ 1.19 -m4 bison flex xorg-libXdamage-dev acl-dev libsoup-dev libxml2-dev \ 1.20 -xorg-libxcb-dev xorg-xcb-util-dev util-linux-uuid-dev zlib-dev libtasn1-dev \ 1.21 -gobject-introspection-dev tar gettext glib-networking gtk-doc \ 1.22 -xorg-libXt gstreamer0-dev gst0-plugins-base-dev" 1.23 -SPLIT="libwebkit-video libwebkit-video-dev" 1.24 -SUGGESTED="gst0-plugins-good gst0-plugins-bad gst0-plugins-ugly gst0-ffmpeg" 1.25 - 1.26 -compile_rules() { 1.27 - # libwebkit does not like parallel builds. 1.28 - export MAKEFLAGS=$(echo $MAKEFLAGS | sed 's/-j[0-9]*/-j1/') 1.29 - touch Documentation/webkitgtk/version.xml 1.30 - 1.31 - # Build 1.32 - ./configure \ 1.33 - --prefix=/usr \ 1.34 - --infodir=/usr/share/info \ 1.35 - --mandir=/usr/share/man \ 1.36 - --enable-introspection=no \ 1.37 - --enable-video=yes \ 1.38 - --enable-jit=yes \ 1.39 - --disable-webgl \ 1.40 - --disable-geolocation \ 1.41 - --with-unicode-backend=glib \ 1.42 - --with-gtk=2.0 \ 1.43 - --disable-webkit2 \ 1.44 - --disable-gtk-doc-html \ 1.45 - $CONFIGURE_ARGS && 1.46 - fix libtool && 1.47 - make all stamp-po 2>&1 | grep -v Source/WebCore/dom/testing && 1.48 - make DESTDIR=$DESTDIR install 2>&1 | grep -v /usr/share/gtk-doc/html/ && 1.49 - cp -a $src/Programs/GtkLauncher $DESTDIR/usr/bin 1.50 -} 1.51 - 1.52 -genpkg_rules() { 1.53 - case $PACKAGE in 1.54 - libwebkit-video) 1.55 - PROVIDE="libwebkit" 1.56 - DEPENDS="gtk+ enchant libxslt expat gtk+ jpeg libpng16 libxml2 \ 1.57 - sqlite3 xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \ 1.58 - xorg-libXcomposite xorg-libXcursor xorg-libXdmcp \ 1.59 - xorg-libXext xorg-libXfixes xorg-libXinerama \ 1.60 - xorg-libXrandr xorg-libXrender xorg-libXt acl \ 1.61 - xorg-libXdamage libsoup gcc-lib-base libtasn1 \ 1.62 - util-linux-uuid glib-networking gst0-plugins-base" 1.63 - mkdir -p $fs/usr/lib $fs/usr/bin 1.64 - [ -d $install/usr/lib/girepository-1.0 ] && 1.65 - cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib 1.66 - cp -a $install/usr/lib/*.so* $fs/usr/lib 1.67 - ;; 1.68 - libwebkit-video-dev) 1.69 - CAT="development|devel files for libwebkit" 1.70 - DEPENDS="libwebkit-video libsoup-dev enchant-dev libtasn1-dev \ 1.71 - sqlite3-dev" 1.72 - mkdir -p $fs/usr/lib $fs/usr/share 1.73 - cp -a $install/usr/lib/*.*a $fs/usr/lib 1.74 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.75 - cp -a $install/usr/include $fs/usr 1.76 - [ -d $install/usr/share/gir-1.0 ] && 1.77 - cp -a $install/usr/share/gir-1.0 $fs/usr/share 1.78 - if [ -f $fs/usr/lib/pkgconfig/webkit-1.0.pc ]; then 1.79 - ln -sf /usr/lib/pkgconfig/webkit-1.0.pc \ 1.80 - $fs/usr/lib/pkgconfig/webkitgtk-1.0.pc 1.81 - fi 1.82 - ;; 1.83 - esac 1.84 -}
2.1 --- a/libwebkit-video/stuff/patches/CodeGeneratorGObject-bug-84526.patch Wed May 23 15:22:22 2018 +0000 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,14 +0,0 @@ 2.4 ---- Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (revision 115562) 2.5 -+++ Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (working copy) 2.6 -@@ -1444,9 +1444,10 @@ 2.7 - print IMPL "namespace WebKit {\n\n"; 2.8 - print IMPL @cBodyPriv; 2.9 - print IMPL "} // namespace WebKit\n\n"; 2.10 -+ 2.11 -+ print IMPL @cBodyProperties; 2.12 - print IMPL "#endif // ${conditionalString}\n\n" if $conditionalString; 2.13 - 2.14 -- print IMPL @cBodyProperties; 2.15 - print IMPL @cBody; 2.16 - 2.17 - close(IMPL);
3.1 --- a/libwebkit-video/stuff/patches/GtkClickCounter.patch Wed May 23 15:22:22 2018 +0000 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,13 +0,0 @@ 3.4 ---- libwebkit-1.8.3/Source/WebCore/platform/gtk/GtkClickCounter.cpp 3.5 -+++ libwebkit-1.8.3/Source/WebCore/platform/gtk/GtkClickCounter.cpp 3.6 -@@ -85,8 +85,8 @@ 3.7 - guint32 eventTime = getEventTime(event); 3.8 - 3.9 - if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) 3.10 -- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) 3.11 -- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) 3.12 -+ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) 3.13 -+ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) 3.14 - && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime)) 3.15 - && (buttonEvent->button == m_previousClickButton))) 3.16 - m_currentClickCount++;
4.1 --- a/libwebkit-video/stuff/patches/README Wed May 23 15:22:22 2018 +0000 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,2 +0,0 @@ 4.4 -Upstream patches for building webkit gtk with newer bison 2.6, see: 4.5 -http://trac.webkit.org/changeset/124099 4.6 \ No newline at end of file
5.1 --- a/libwebkit-video/stuff/patches/WebCore_ChangeLog_124099.patch Wed May 23 15:22:22 2018 +0000 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,32 +0,0 @@ 5.4 -Index: trunk/Source/WebCore/ChangeLog 5.5 -=================================================================== 5.6 ---- trunk/Source/WebCore/ChangeLog (revision 124098) 5.7 -+++ trunk/Source/WebCore/ChangeLog (revision 124099) 5.8 -@@ -1,2 +1,27 @@ 5.9 -+2012-07-30 Alexis Menard <alexis.menard@openbossa.org> 5.10 -+ 5.11 -+ Build fix with newer bison 2.6. 5.12 -+ https://bugs.webkit.org/show_bug.cgi?id=92264 5.13 -+ 5.14 -+ Reviewed by Adam Barth. 5.15 -+ 5.16 -+ As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html 5.17 -+ YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS 5.18 -+ version I had access to as well as recent Linux runs at least version 2.3 so it's safe 5.19 -+ to use the replacement of these deprecated macros in favor of %lex-param and %parse-param. 5.20 -+ As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release 5.21 -+ of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore. 5.22 -+ 5.23 -+ No new tests : build fix and the patch should not trigger any regressions 5.24 -+ 5.25 -+ * css/CSSGrammar.y: 5.26 -+ * css/CSSParser.cpp: 5.27 -+ * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define. 5.28 -+ * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h 5.29 -+ therefore including this file within the namespace {} declarations leads to xpathyyparse being 5.30 -+ defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp 5.31 -+ (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 5.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. 5.33 -+ 5.34 - 2012-07-30 Sadrul Habib Chowdhury <sadrul@chromium.org> 5.35 -
6.1 --- a/libwebkit-video/stuff/patches/WebCore_css_CSSGrammar.y_124099.patch Wed May 23 15:22:22 2018 +0000 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,26 +0,0 @@ 6.4 -Index: trunk/Source/WebCore/css/CSSGrammar.y 6.5 -=================================================================== 6.6 ---- trunk/Source/WebCore/css/CSSGrammar.y (revision 121874) 6.7 -+++ trunk/Source/WebCore/css/CSSGrammar.y (revision 124099) 6.8 -@@ -54,11 +54,10 @@ 6.9 - #define YYDEBUG 0 6.10 - 6.11 --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x 6.12 --#define YYPARSE_PARAM parser 6.13 --#define YYLEX_PARAM parser 6.14 -- 6.15 - %} 6.16 - 6.17 - %pure_parser 6.18 -+ 6.19 -+%parse-param { CSSParser* parser } 6.20 -+%lex-param { CSSParser* parser } 6.21 - 6.22 - %union { 6.23 -@@ -90,5 +89,5 @@ 6.24 - %{ 6.25 - 6.26 --static inline int cssyyerror(const char*) 6.27 -+static inline int cssyyerror(void*, const char*) 6.28 - { 6.29 - return 1;
7.1 --- a/libwebkit-video/stuff/patches/WebCore_css_CSSParser.cpp_124099.patch Wed May 23 15:22:22 2018 +0000 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,11 +0,0 @@ 7.4 -Index: trunk/Source/WebCore/css/CSSParser.cpp 7.5 -=================================================================== 7.6 ---- trunk/Source/WebCore/css/CSSParser.cpp (revision 123746) 7.7 -+++ trunk/Source/WebCore/css/CSSParser.cpp (revision 124099) 7.8 -@@ -115,5 +115,5 @@ 7.9 - #endif 7.10 - 7.11 --extern int cssyyparse(void* parser); 7.12 -+extern int cssyyparse(WebCore::CSSParser*); 7.13 - 7.14 - using namespace std;
8.1 --- a/libwebkit-video/stuff/patches/WebCore_xml_XPathGrammar.y_124099.patch Wed May 23 15:22:22 2018 +0000 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,407 +0,0 @@ 8.4 -Index: trunk/Source/WebCore/xml/XPathGrammar.y 8.5 -=================================================================== 8.6 ---- trunk/Source/WebCore/xml/XPathGrammar.y (revision 97771) 8.7 -+++ trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099) 8.8 -@@ -35,4 +35,5 @@ 8.9 - #include "XPathPath.h" 8.10 - #include "XPathPredicate.h" 8.11 -+#include "XPathStep.h" 8.12 - #include "XPathVariableReference.h" 8.13 - #include <wtf/FastMalloc.h> 8.14 -@@ -45,6 +46,4 @@ 8.15 - #define YYDEBUG 0 8.16 - #define YYMAXDEPTH 10000 8.17 --#define YYPARSE_PARAM parserParameter 8.18 --#define PARSER static_cast<Parser*>(parserParameter) 8.19 - 8.20 - using namespace WebCore; 8.21 -@@ -54,4 +53,5 @@ 8.22 - 8.23 - %pure_parser 8.24 -+%parse-param { WebCore::XPath::Parser* parser } 8.25 - 8.26 - %union 8.27 -@@ -72,5 +72,5 @@ 8.28 - 8.29 - static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } 8.30 --static void xpathyyerror(const char*) { } 8.31 -+static void xpathyyerror(void*, const char*) { } 8.32 - 8.33 - %} 8.34 -@@ -119,5 +119,5 @@ 8.35 - OrExpr 8.36 - { 8.37 -- PARSER->m_topExpr = $1; 8.38 -+ parser->m_topExpr = $1; 8.39 - } 8.40 - ; 8.41 -@@ -139,5 +139,5 @@ 8.42 - { 8.43 - $$ = new LocationPath; 8.44 -- PARSER->registerParseNode($$); 8.45 -+ parser->registerParseNode($$); 8.46 - } 8.47 - | 8.48 -@@ -151,5 +151,5 @@ 8.49 - $$ = $2; 8.50 - $$->insertFirstStep($1); 8.51 -- PARSER->unregisterParseNode($1); 8.52 -+ parser->unregisterParseNode($1); 8.53 - } 8.54 - ; 8.55 -@@ -160,6 +160,6 @@ 8.56 - $$ = new LocationPath; 8.57 - $$->appendStep($1); 8.58 -- PARSER->unregisterParseNode($1); 8.59 -- PARSER->registerParseNode($$); 8.60 -+ parser->unregisterParseNode($1); 8.61 -+ parser->registerParseNode($$); 8.62 - } 8.63 - | 8.64 -@@ -167,5 +167,5 @@ 8.65 - { 8.66 - $$->appendStep($3); 8.67 -- PARSER->unregisterParseNode($3); 8.68 -+ parser->unregisterParseNode($3); 8.69 - } 8.70 - | 8.71 -@@ -174,6 +174,6 @@ 8.72 - $$->appendStep($2); 8.73 - $$->appendStep($3); 8.74 -- PARSER->unregisterParseNode($2); 8.75 -- PARSER->unregisterParseNode($3); 8.76 -+ parser->unregisterParseNode($2); 8.77 -+ parser->unregisterParseNode($3); 8.78 - } 8.79 - ; 8.80 -@@ -184,9 +184,9 @@ 8.81 - if ($2) { 8.82 - $$ = new Step(Step::ChildAxis, *$1, *$2); 8.83 -- PARSER->deletePredicateVector($2); 8.84 -+ parser->deletePredicateVector($2); 8.85 - } else 8.86 - $$ = new Step(Step::ChildAxis, *$1); 8.87 -- PARSER->deleteNodeTest($1); 8.88 -- PARSER->registerParseNode($$); 8.89 -+ parser->deleteNodeTest($1); 8.90 -+ parser->registerParseNode($$); 8.91 - } 8.92 - | 8.93 -@@ -195,6 +195,6 @@ 8.94 - String localName; 8.95 - String namespaceURI; 8.96 -- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { 8.97 -- PARSER->m_gotNamespaceError = true; 8.98 -+ if (!parser->expandQName(*$1, localName, namespaceURI)) { 8.99 -+ parser->m_gotNamespaceError = true; 8.100 - YYABORT; 8.101 - } 8.102 -@@ -202,9 +202,9 @@ 8.103 - if ($2) { 8.104 - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); 8.105 -- PARSER->deletePredicateVector($2); 8.106 -+ parser->deletePredicateVector($2); 8.107 - } else 8.108 - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 8.109 -- PARSER->deleteString($1); 8.110 -- PARSER->registerParseNode($$); 8.111 -+ parser->deleteString($1); 8.112 -+ parser->registerParseNode($$); 8.113 - } 8.114 - | 8.115 -@@ -213,9 +213,9 @@ 8.116 - if ($3) { 8.117 - $$ = new Step($1, *$2, *$3); 8.118 -- PARSER->deletePredicateVector($3); 8.119 -+ parser->deletePredicateVector($3); 8.120 - } else 8.121 - $$ = new Step($1, *$2); 8.122 -- PARSER->deleteNodeTest($2); 8.123 -- PARSER->registerParseNode($$); 8.124 -+ parser->deleteNodeTest($2); 8.125 -+ parser->registerParseNode($$); 8.126 - } 8.127 - | 8.128 -@@ -224,6 +224,6 @@ 8.129 - String localName; 8.130 - String namespaceURI; 8.131 -- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { 8.132 -- PARSER->m_gotNamespaceError = true; 8.133 -+ if (!parser->expandQName(*$2, localName, namespaceURI)) { 8.134 -+ parser->m_gotNamespaceError = true; 8.135 - YYABORT; 8.136 - } 8.137 -@@ -231,9 +231,9 @@ 8.138 - if ($3) { 8.139 - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); 8.140 -- PARSER->deletePredicateVector($3); 8.141 -+ parser->deletePredicateVector($3); 8.142 - } else 8.143 - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 8.144 -- PARSER->deleteString($2); 8.145 -- PARSER->registerParseNode($$); 8.146 -+ parser->deleteString($2); 8.147 -+ parser->registerParseNode($$); 8.148 - } 8.149 - | 8.150 -@@ -260,6 +260,6 @@ 8.151 - $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); 8.152 - 8.153 -- PARSER->deleteString($1); 8.154 -- PARSER->registerNodeTest($$); 8.155 -+ parser->deleteString($1); 8.156 -+ parser->registerNodeTest($$); 8.157 - } 8.158 - | 8.159 -@@ -267,6 +267,6 @@ 8.160 - { 8.161 - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); 8.162 -- PARSER->deleteString($1); 8.163 -- PARSER->registerNodeTest($$); 8.164 -+ parser->deleteString($1); 8.165 -+ parser->registerNodeTest($$); 8.166 - } 8.167 - | 8.168 -@@ -274,7 +274,7 @@ 8.169 - { 8.170 - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); 8.171 -- PARSER->deleteString($1); 8.172 -- PARSER->deleteString($3); 8.173 -- PARSER->registerNodeTest($$); 8.174 -+ parser->deleteString($1); 8.175 -+ parser->deleteString($3); 8.176 -+ parser->registerNodeTest($$); 8.177 - } 8.178 - ; 8.179 -@@ -294,6 +294,6 @@ 8.180 - $$ = new Vector<Predicate*>; 8.181 - $$->append(new Predicate($1)); 8.182 -- PARSER->unregisterParseNode($1); 8.183 -- PARSER->registerPredicateVector($$); 8.184 -+ parser->unregisterParseNode($1); 8.185 -+ parser->registerPredicateVector($$); 8.186 - } 8.187 - | 8.188 -@@ -301,5 +301,5 @@ 8.189 - { 8.190 - $$->append(new Predicate($2)); 8.191 -- PARSER->unregisterParseNode($2); 8.192 -+ parser->unregisterParseNode($2); 8.193 - } 8.194 - ; 8.195 -@@ -316,5 +316,5 @@ 8.196 - { 8.197 - $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 8.198 -- PARSER->registerParseNode($$); 8.199 -+ parser->registerParseNode($$); 8.200 - } 8.201 - ; 8.202 -@@ -324,5 +324,5 @@ 8.203 - { 8.204 - $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 8.205 -- PARSER->registerParseNode($$); 8.206 -+ parser->registerParseNode($$); 8.207 - } 8.208 - | 8.209 -@@ -330,5 +330,5 @@ 8.210 - { 8.211 - $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 8.212 -- PARSER->registerParseNode($$); 8.213 -+ parser->registerParseNode($$); 8.214 - } 8.215 - ; 8.216 -@@ -338,6 +338,6 @@ 8.217 - { 8.218 - $$ = new VariableReference(*$1); 8.219 -- PARSER->deleteString($1); 8.220 -- PARSER->registerParseNode($$); 8.221 -+ parser->deleteString($1); 8.222 -+ parser->registerParseNode($$); 8.223 - } 8.224 - | 8.225 -@@ -350,6 +350,6 @@ 8.226 - { 8.227 - $$ = new StringExpression(*$1); 8.228 -- PARSER->deleteString($1); 8.229 -- PARSER->registerParseNode($$); 8.230 -+ parser->deleteString($1); 8.231 -+ parser->registerParseNode($$); 8.232 - } 8.233 - | 8.234 -@@ -357,6 +357,6 @@ 8.235 - { 8.236 - $$ = new Number($1->toDouble()); 8.237 -- PARSER->deleteString($1); 8.238 -- PARSER->registerParseNode($$); 8.239 -+ parser->deleteString($1); 8.240 -+ parser->registerParseNode($$); 8.241 - } 8.242 - | 8.243 -@@ -370,6 +370,6 @@ 8.244 - if (!$$) 8.245 - YYABORT; 8.246 -- PARSER->deleteString($1); 8.247 -- PARSER->registerParseNode($$); 8.248 -+ parser->deleteString($1); 8.249 -+ parser->registerParseNode($$); 8.250 - } 8.251 - | 8.252 -@@ -379,7 +379,7 @@ 8.253 - if (!$$) 8.254 - YYABORT; 8.255 -- PARSER->deleteString($1); 8.256 -- PARSER->deleteExpressionVector($3); 8.257 -- PARSER->registerParseNode($$); 8.258 -+ parser->deleteString($1); 8.259 -+ parser->deleteExpressionVector($3); 8.260 -+ parser->registerParseNode($$); 8.261 - } 8.262 - ; 8.263 -@@ -390,6 +390,6 @@ 8.264 - $$ = new Vector<Expression*>; 8.265 - $$->append($1); 8.266 -- PARSER->unregisterParseNode($1); 8.267 -- PARSER->registerExpressionVector($$); 8.268 -+ parser->unregisterParseNode($1); 8.269 -+ parser->registerExpressionVector($$); 8.270 - } 8.271 - | 8.272 -@@ -397,5 +397,5 @@ 8.273 - { 8.274 - $$->append($3); 8.275 -- PARSER->unregisterParseNode($3); 8.276 -+ parser->unregisterParseNode($3); 8.277 - } 8.278 - ; 8.279 -@@ -413,7 +413,7 @@ 8.280 - $$->addSubExpression($1); 8.281 - $$->addSubExpression($3); 8.282 -- PARSER->unregisterParseNode($1); 8.283 -- PARSER->unregisterParseNode($3); 8.284 -- PARSER->registerParseNode($$); 8.285 -+ parser->unregisterParseNode($1); 8.286 -+ parser->unregisterParseNode($3); 8.287 -+ parser->registerParseNode($$); 8.288 - } 8.289 - ; 8.290 -@@ -431,7 +431,7 @@ 8.291 - $3->setAbsolute(true); 8.292 - $$ = new Path(static_cast<Filter*>($1), $3); 8.293 -- PARSER->unregisterParseNode($1); 8.294 -- PARSER->unregisterParseNode($3); 8.295 -- PARSER->registerParseNode($$); 8.296 -+ parser->unregisterParseNode($1); 8.297 -+ parser->unregisterParseNode($3); 8.298 -+ parser->registerParseNode($$); 8.299 - } 8.300 - | 8.301 -@@ -441,8 +441,8 @@ 8.302 - $3->setAbsolute(true); 8.303 - $$ = new Path(static_cast<Filter*>($1), $3); 8.304 -- PARSER->unregisterParseNode($1); 8.305 -- PARSER->unregisterParseNode($2); 8.306 -- PARSER->unregisterParseNode($3); 8.307 -- PARSER->registerParseNode($$); 8.308 -+ parser->unregisterParseNode($1); 8.309 -+ parser->unregisterParseNode($2); 8.310 -+ parser->unregisterParseNode($3); 8.311 -+ parser->registerParseNode($$); 8.312 - } 8.313 - ; 8.314 -@@ -454,7 +454,7 @@ 8.315 - { 8.316 - $$ = new Filter($1, *$2); 8.317 -- PARSER->unregisterParseNode($1); 8.318 -- PARSER->deletePredicateVector($2); 8.319 -- PARSER->registerParseNode($$); 8.320 -+ parser->unregisterParseNode($1); 8.321 -+ parser->deletePredicateVector($2); 8.322 -+ parser->registerParseNode($$); 8.323 - } 8.324 - ; 8.325 -@@ -466,7 +466,7 @@ 8.326 - { 8.327 - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); 8.328 -- PARSER->unregisterParseNode($1); 8.329 -- PARSER->unregisterParseNode($3); 8.330 -- PARSER->registerParseNode($$); 8.331 -+ parser->unregisterParseNode($1); 8.332 -+ parser->unregisterParseNode($3); 8.333 -+ parser->registerParseNode($$); 8.334 - } 8.335 - ; 8.336 -@@ -478,7 +478,7 @@ 8.337 - { 8.338 - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); 8.339 -- PARSER->unregisterParseNode($1); 8.340 -- PARSER->unregisterParseNode($3); 8.341 -- PARSER->registerParseNode($$); 8.342 -+ parser->unregisterParseNode($1); 8.343 -+ parser->unregisterParseNode($3); 8.344 -+ parser->registerParseNode($$); 8.345 - } 8.346 - ; 8.347 -@@ -490,7 +490,7 @@ 8.348 - { 8.349 - $$ = new EqTestOp($2, $1, $3); 8.350 -- PARSER->unregisterParseNode($1); 8.351 -- PARSER->unregisterParseNode($3); 8.352 -- PARSER->registerParseNode($$); 8.353 -+ parser->unregisterParseNode($1); 8.354 -+ parser->unregisterParseNode($3); 8.355 -+ parser->registerParseNode($$); 8.356 - } 8.357 - ; 8.358 -@@ -502,7 +502,7 @@ 8.359 - { 8.360 - $$ = new EqTestOp($2, $1, $3); 8.361 -- PARSER->unregisterParseNode($1); 8.362 -- PARSER->unregisterParseNode($3); 8.363 -- PARSER->registerParseNode($$); 8.364 -+ parser->unregisterParseNode($1); 8.365 -+ parser->unregisterParseNode($3); 8.366 -+ parser->registerParseNode($$); 8.367 - } 8.368 - ; 8.369 -@@ -514,7 +514,7 @@ 8.370 - { 8.371 - $$ = new NumericOp(NumericOp::OP_Add, $1, $3); 8.372 -- PARSER->unregisterParseNode($1); 8.373 -- PARSER->unregisterParseNode($3); 8.374 -- PARSER->registerParseNode($$); 8.375 -+ parser->unregisterParseNode($1); 8.376 -+ parser->unregisterParseNode($3); 8.377 -+ parser->registerParseNode($$); 8.378 - } 8.379 - | 8.380 -@@ -522,7 +522,7 @@ 8.381 - { 8.382 - $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); 8.383 -- PARSER->unregisterParseNode($1); 8.384 -- PARSER->unregisterParseNode($3); 8.385 -- PARSER->registerParseNode($$); 8.386 -+ parser->unregisterParseNode($1); 8.387 -+ parser->unregisterParseNode($3); 8.388 -+ parser->registerParseNode($$); 8.389 - } 8.390 - ; 8.391 -@@ -534,7 +534,7 @@ 8.392 - { 8.393 - $$ = new NumericOp($2, $1, $3); 8.394 -- PARSER->unregisterParseNode($1); 8.395 -- PARSER->unregisterParseNode($3); 8.396 -- PARSER->registerParseNode($$); 8.397 -+ parser->unregisterParseNode($1); 8.398 -+ parser->unregisterParseNode($3); 8.399 -+ parser->registerParseNode($$); 8.400 - } 8.401 - ; 8.402 -@@ -547,6 +547,6 @@ 8.403 - $$ = new Negative; 8.404 - $$->addSubExpression($2); 8.405 -- PARSER->unregisterParseNode($2); 8.406 -- PARSER->registerParseNode($$); 8.407 -+ parser->unregisterParseNode($2); 8.408 -+ parser->registerParseNode($$); 8.409 - } 8.410 - ;
9.1 --- a/libwebkit-video/stuff/patches/WebCore_xml_XPathParser.cpp_124099.patch Wed May 23 15:22:22 2018 +0000 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,39 +0,0 @@ 9.4 -Index: trunk/Source/WebCore/xml/XPathParser.cpp 9.5 -=================================================================== 9.6 ---- trunk/Source/WebCore/xml/XPathParser.cpp (revision 97771) 9.7 -+++ trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099) 9.8 -@@ -33,22 +33,19 @@ 9.9 - #include "XPathException.h" 9.10 - #include "XPathNSResolver.h" 9.11 -+#include "XPathPath.h" 9.12 - #include "XPathStep.h" 9.13 - #include <wtf/StdLibExtras.h> 9.14 - #include <wtf/text/StringHash.h> 9.15 - 9.16 --int xpathyyparse(void*); 9.17 -- 9.18 -+using namespace WebCore; 9.19 - using namespace WTF; 9.20 - using namespace Unicode; 9.21 -- 9.22 --namespace WebCore { 9.23 --namespace XPath { 9.24 -- 9.25 --class LocationPath; 9.26 -- 9.27 --#include "XPathGrammar.h" 9.28 -+using namespace XPath; 9.29 -+ 9.30 -+extern int xpathyyparse(WebCore::XPath::Parser*); 9.31 -+#include "XPathGrammar.h" 9.32 - 9.33 - Parser* Parser::currentParser = 0; 9.34 -- 9.35 -+ 9.36 - enum XMLCat { NameStart, NameCont, NotPartOfName }; 9.37 - 9.38 -@@ -631,4 +628,2 @@ 9.39 - } 9.40 - 9.41 --} 9.42 --}
10.1 --- a/libwebkit-video/stuff/patches/series Wed May 23 15:22:22 2018 +0000 10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 10.3 @@ -1,7 +0,0 @@ 10.4 -CodeGeneratorGObject-bug-84526.patch 10.5 -GtkClickCounter.patch 10.6 -WebCore_ChangeLog_124099.patch 10.7 -WebCore_css_CSSGrammar.y_124099.patch 10.8 -WebCore_css_CSSParser.cpp_124099.patch 10.9 -WebCore_xml_XPathGrammar.y_124099.patch 10.10 -WebCore_xml_XPathParser.cpp_124099.patch
11.1 --- a/libwebkit/description.txt Wed May 23 15:22:22 2018 +0000 11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 11.3 @@ -1,2 +0,0 @@ 11.4 -WebKitGTK+ is the port of the portable web rendering engine WebKit to the GTK+ 11.5 -platform.
12.1 --- a/libwebkit/receipt Wed May 23 15:22:22 2018 +0000 12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 12.3 @@ -1,93 +0,0 @@ 12.4 -# SliTaz package receipt v2. 12.5 - 12.6 -PACKAGE="libwebkit" 12.7 -VERSION="1.8.3" 12.8 -CATEGORY="network" 12.9 -SHORT_DESC="xHTML render library." 12.10 -MAINTAINER="devel@slitaz.org" 12.11 -LICENSE="LGPL2" 12.12 -SOURCE="webkit" 12.13 -TARBALL="$SOURCE-$VERSION.tar.xz" 12.14 -WEB_SITE="http://webkitgtk.org" 12.15 -WGET_URL="$WEB_SITE/releases/$TARBALL" 12.16 - 12.17 -BUILD_DEPENDS="gtk+-dev enchant-dev libxslt-dev jpeg-dev libpng16-dev \ 12.18 -glib-dev sqlite3-dev gnutls-dev xorg-libXdamage-dev acl-dev libsoup-dev \ 12.19 -libxml2-dev xorg-libxcb-dev xorg-xcb-util-dev util-linux-uuid-dev zlib-dev \ 12.20 -libtasn1-dev glib-networking xorg-libXt-dev" 12.21 -SPLIT="libwebkit libwebkit-dev webkit-web-inspector" 12.22 - 12.23 -# Handle cross compilation. 12.24 -case "$ARCH" in 12.25 - i?86) 12.26 - BUILD_DEPENDS="$BUILD_DEPENDS tar gettext m4 bison flex gperf 12.27 - autoconf automake gtk-doc libtool" ;; 12.28 -esac 12.29 - 12.30 -# Rules to configure and make the package. 12.31 -compile_rules() 12.32 -{ 12.33 - export CXXFLAGS="$CXXFLAGS -std=gnu++98" 12.34 - # libwebkit does not like parallel builds. 12.35 - export MAKEFLAGS=$(echo $MAKEFLAGS | sed 's/-j[0-9]*/-j1/') 12.36 - # fix Bug 84526: webkit-gtk-1.8.0 fails to build with --disable-video 12.37 - # Build 12.38 - ./configure \ 12.39 - --enable-introspection=no \ 12.40 - --enable-video=no \ 12.41 - --enable-jit=yes \ 12.42 - --disable-webgl \ 12.43 - --disable-geolocation \ 12.44 - --with-unicode-backend=glib \ 12.45 - --with-gtk=2.0 \ 12.46 - --disable-gtk-doc \ 12.47 - $CONFIGURE_ARGS && 12.48 - make all stamp-po 2>&1 | grep -v Source/WebCore/dom/testing && 12.49 - make install 2>&1 | \ 12.50 - grep -Ev '(/usr/share/gtk-doc/html|Documentation/webkitgtk/version.xml)' && 12.51 - cp -a $src/Programs/GtkLauncher $DESTDIR/usr/bin 12.52 -} 12.53 - 12.54 -# Rules to gen a SliTaz package suitable for Tazpkg. 12.55 -genpkg_rules() 12.56 -{ 12.57 - case $PACKAGE in 12.58 - libwebkit) 12.59 - DEPENDS="gtk+ enchant libxslt expat gtk+ jpeg libpng16 libxml2 \ 12.60 - sqlite3 xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \ 12.61 - xorg-libXcomposite xorg-libXcursor xorg-libXdmcp \ 12.62 - xorg-libXext xorg-libXfixes xorg-libXinerama \ 12.63 - xorg-libXrandr xorg-libXrender xorg-libXt acl \ 12.64 - xorg-libXdamage libsoup gcc-lib-base libtasn1 \ 12.65 - util-linux-uuid glib-networking" 12.66 - mkdir -p $fs/usr/lib 12.67 - cp -a $install/usr/lib/*.so* $fs/usr/lib 12.68 - ;; 12.69 - libwebkit-dev) 12.70 - CAT="development|devel files for libwebkit" 12.71 - DEPENDS="libwebkit libsoup-dev enchant-dev libtasn1-dev \ 12.72 - sqlite3-dev xorg-libXt-dev" 12.73 - mkdir -p $fs/usr/lib $fs/usr/share 12.74 - cp -a $install/usr/lib/*.*a $fs/usr/lib 12.75 - # ARM: no pkg-config, include or gir files 12.76 - case "$ARCH" in 12.77 - i?86) 12.78 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 12.79 - cp -a $install/usr/include $fs/usr 12.80 - cp -a $install/usr/share/webkitgtk-1.0 $fs/usr/share 12.81 - # webkitgtk-1.0.pc 12.82 - if [ -f $fs/usr/lib/pkgconfig/webkit-1.0.pc ]; then 12.83 - ln -sf /usr/lib/pkgconfig/webkit-1.0.pc \ 12.84 - $fs/usr/lib/pkgconfig/webkitgtk-1.0.pc 12.85 - fi ;; 12.86 - esac 12.87 - ;; 12.88 - webkit-web-inspector) 12.89 - CAT="network|Webkit development tools" 12.90 - DEPENDS="libwebkit" 12.91 - mkdir -p $fs/usr/share 12.92 - cp -a $install/usr/bin $fs/usr/ 12.93 - cp -a $install/usr/share/webkitgtk-1.0 $fs/usr/share 12.94 - ;; 12.95 - esac 12.96 -}
13.1 --- a/libwebkit/stuff/patches/CodeGeneratorGObject-bug-84526.patch Wed May 23 15:22:22 2018 +0000 13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 13.3 @@ -1,14 +0,0 @@ 13.4 ---- Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (revision 115562) 13.5 -+++ Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (working copy) 13.6 -@@ -1444,9 +1444,10 @@ 13.7 - print IMPL "namespace WebKit {\n\n"; 13.8 - print IMPL @cBodyPriv; 13.9 - print IMPL "} // namespace WebKit\n\n"; 13.10 -+ 13.11 -+ print IMPL @cBodyProperties; 13.12 - print IMPL "#endif // ${conditionalString}\n\n" if $conditionalString; 13.13 - 13.14 -- print IMPL @cBodyProperties; 13.15 - print IMPL @cBody; 13.16 - 13.17 - close(IMPL);
14.1 --- a/libwebkit/stuff/patches/GtkClickCounter.patch Wed May 23 15:22:22 2018 +0000 14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 14.3 @@ -1,13 +0,0 @@ 14.4 ---- libwebkit-1.8.3/Source/WebCore/platform/gtk/GtkClickCounter.cpp 14.5 -+++ libwebkit-1.8.3/Source/WebCore/platform/gtk/GtkClickCounter.cpp 14.6 -@@ -85,8 +85,8 @@ 14.7 - guint32 eventTime = getEventTime(event); 14.8 - 14.9 - if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) 14.10 -- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) 14.11 -- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) 14.12 -+ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) 14.13 -+ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) 14.14 - && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime)) 14.15 - && (buttonEvent->button == m_previousClickButton))) 14.16 - m_currentClickCount++;
15.1 --- a/libwebkit/stuff/patches/README Wed May 23 15:22:22 2018 +0000 15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 15.3 @@ -1,2 +0,0 @@ 15.4 -Upstream patches for building webkit gtk with newer bison 2.6, see: 15.5 -http://trac.webkit.org/changeset/124099 15.6 \ No newline at end of file
16.1 --- a/libwebkit/stuff/patches/WebCore_ChangeLog_124099.patch Wed May 23 15:22:22 2018 +0000 16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 16.3 @@ -1,32 +0,0 @@ 16.4 -Index: trunk/Source/WebCore/ChangeLog 16.5 -=================================================================== 16.6 ---- trunk/Source/WebCore/ChangeLog (revision 124098) 16.7 -+++ trunk/Source/WebCore/ChangeLog (revision 124099) 16.8 -@@ -1,2 +1,27 @@ 16.9 -+2012-07-30 Alexis Menard <alexis.menard@openbossa.org> 16.10 -+ 16.11 -+ Build fix with newer bison 2.6. 16.12 -+ https://bugs.webkit.org/show_bug.cgi?id=92264 16.13 -+ 16.14 -+ Reviewed by Adam Barth. 16.15 -+ 16.16 -+ As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html 16.17 -+ YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS 16.18 -+ version I had access to as well as recent Linux runs at least version 2.3 so it's safe 16.19 -+ to use the replacement of these deprecated macros in favor of %lex-param and %parse-param. 16.20 -+ As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release 16.21 -+ of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore. 16.22 -+ 16.23 -+ No new tests : build fix and the patch should not trigger any regressions 16.24 -+ 16.25 -+ * css/CSSGrammar.y: 16.26 -+ * css/CSSParser.cpp: 16.27 -+ * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define. 16.28 -+ * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h 16.29 -+ therefore including this file within the namespace {} declarations leads to xpathyyparse being 16.30 -+ defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp 16.31 -+ (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 16.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. 16.33 -+ 16.34 - 2012-07-30 Sadrul Habib Chowdhury <sadrul@chromium.org> 16.35 -
17.1 --- a/libwebkit/stuff/patches/WebCore_css_CSSGrammar.y_124099.patch Wed May 23 15:22:22 2018 +0000 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,26 +0,0 @@ 17.4 -Index: trunk/Source/WebCore/css/CSSGrammar.y 17.5 -=================================================================== 17.6 ---- trunk/Source/WebCore/css/CSSGrammar.y (revision 121874) 17.7 -+++ trunk/Source/WebCore/css/CSSGrammar.y (revision 124099) 17.8 -@@ -54,11 +54,10 @@ 17.9 - #define YYDEBUG 0 17.10 - 17.11 --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x 17.12 --#define YYPARSE_PARAM parser 17.13 --#define YYLEX_PARAM parser 17.14 -- 17.15 - %} 17.16 - 17.17 - %pure_parser 17.18 -+ 17.19 -+%parse-param { CSSParser* parser } 17.20 -+%lex-param { CSSParser* parser } 17.21 - 17.22 - %union { 17.23 -@@ -90,5 +89,5 @@ 17.24 - %{ 17.25 - 17.26 --static inline int cssyyerror(const char*) 17.27 -+static inline int cssyyerror(void*, const char*) 17.28 - { 17.29 - return 1;
18.1 --- a/libwebkit/stuff/patches/WebCore_css_CSSParser.cpp_124099.patch Wed May 23 15:22:22 2018 +0000 18.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 18.3 @@ -1,11 +0,0 @@ 18.4 -Index: trunk/Source/WebCore/css/CSSParser.cpp 18.5 -=================================================================== 18.6 ---- trunk/Source/WebCore/css/CSSParser.cpp (revision 123746) 18.7 -+++ trunk/Source/WebCore/css/CSSParser.cpp (revision 124099) 18.8 -@@ -115,5 +115,5 @@ 18.9 - #endif 18.10 - 18.11 --extern int cssyyparse(void* parser); 18.12 -+extern int cssyyparse(WebCore::CSSParser*); 18.13 - 18.14 - using namespace std;
19.1 --- a/libwebkit/stuff/patches/WebCore_xml_XPathGrammar.y_124099.patch Wed May 23 15:22:22 2018 +0000 19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 19.3 @@ -1,407 +0,0 @@ 19.4 -Index: trunk/Source/WebCore/xml/XPathGrammar.y 19.5 -=================================================================== 19.6 ---- trunk/Source/WebCore/xml/XPathGrammar.y (revision 97771) 19.7 -+++ trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099) 19.8 -@@ -35,4 +35,5 @@ 19.9 - #include "XPathPath.h" 19.10 - #include "XPathPredicate.h" 19.11 -+#include "XPathStep.h" 19.12 - #include "XPathVariableReference.h" 19.13 - #include <wtf/FastMalloc.h> 19.14 -@@ -45,6 +46,4 @@ 19.15 - #define YYDEBUG 0 19.16 - #define YYMAXDEPTH 10000 19.17 --#define YYPARSE_PARAM parserParameter 19.18 --#define PARSER static_cast<Parser*>(parserParameter) 19.19 - 19.20 - using namespace WebCore; 19.21 -@@ -54,4 +53,5 @@ 19.22 - 19.23 - %pure_parser 19.24 -+%parse-param { WebCore::XPath::Parser* parser } 19.25 - 19.26 - %union 19.27 -@@ -72,5 +72,5 @@ 19.28 - 19.29 - static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } 19.30 --static void xpathyyerror(const char*) { } 19.31 -+static void xpathyyerror(void*, const char*) { } 19.32 - 19.33 - %} 19.34 -@@ -119,5 +119,5 @@ 19.35 - OrExpr 19.36 - { 19.37 -- PARSER->m_topExpr = $1; 19.38 -+ parser->m_topExpr = $1; 19.39 - } 19.40 - ; 19.41 -@@ -139,5 +139,5 @@ 19.42 - { 19.43 - $$ = new LocationPath; 19.44 -- PARSER->registerParseNode($$); 19.45 -+ parser->registerParseNode($$); 19.46 - } 19.47 - | 19.48 -@@ -151,5 +151,5 @@ 19.49 - $$ = $2; 19.50 - $$->insertFirstStep($1); 19.51 -- PARSER->unregisterParseNode($1); 19.52 -+ parser->unregisterParseNode($1); 19.53 - } 19.54 - ; 19.55 -@@ -160,6 +160,6 @@ 19.56 - $$ = new LocationPath; 19.57 - $$->appendStep($1); 19.58 -- PARSER->unregisterParseNode($1); 19.59 -- PARSER->registerParseNode($$); 19.60 -+ parser->unregisterParseNode($1); 19.61 -+ parser->registerParseNode($$); 19.62 - } 19.63 - | 19.64 -@@ -167,5 +167,5 @@ 19.65 - { 19.66 - $$->appendStep($3); 19.67 -- PARSER->unregisterParseNode($3); 19.68 -+ parser->unregisterParseNode($3); 19.69 - } 19.70 - | 19.71 -@@ -174,6 +174,6 @@ 19.72 - $$->appendStep($2); 19.73 - $$->appendStep($3); 19.74 -- PARSER->unregisterParseNode($2); 19.75 -- PARSER->unregisterParseNode($3); 19.76 -+ parser->unregisterParseNode($2); 19.77 -+ parser->unregisterParseNode($3); 19.78 - } 19.79 - ; 19.80 -@@ -184,9 +184,9 @@ 19.81 - if ($2) { 19.82 - $$ = new Step(Step::ChildAxis, *$1, *$2); 19.83 -- PARSER->deletePredicateVector($2); 19.84 -+ parser->deletePredicateVector($2); 19.85 - } else 19.86 - $$ = new Step(Step::ChildAxis, *$1); 19.87 -- PARSER->deleteNodeTest($1); 19.88 -- PARSER->registerParseNode($$); 19.89 -+ parser->deleteNodeTest($1); 19.90 -+ parser->registerParseNode($$); 19.91 - } 19.92 - | 19.93 -@@ -195,6 +195,6 @@ 19.94 - String localName; 19.95 - String namespaceURI; 19.96 -- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { 19.97 -- PARSER->m_gotNamespaceError = true; 19.98 -+ if (!parser->expandQName(*$1, localName, namespaceURI)) { 19.99 -+ parser->m_gotNamespaceError = true; 19.100 - YYABORT; 19.101 - } 19.102 -@@ -202,9 +202,9 @@ 19.103 - if ($2) { 19.104 - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); 19.105 -- PARSER->deletePredicateVector($2); 19.106 -+ parser->deletePredicateVector($2); 19.107 - } else 19.108 - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 19.109 -- PARSER->deleteString($1); 19.110 -- PARSER->registerParseNode($$); 19.111 -+ parser->deleteString($1); 19.112 -+ parser->registerParseNode($$); 19.113 - } 19.114 - | 19.115 -@@ -213,9 +213,9 @@ 19.116 - if ($3) { 19.117 - $$ = new Step($1, *$2, *$3); 19.118 -- PARSER->deletePredicateVector($3); 19.119 -+ parser->deletePredicateVector($3); 19.120 - } else 19.121 - $$ = new Step($1, *$2); 19.122 -- PARSER->deleteNodeTest($2); 19.123 -- PARSER->registerParseNode($$); 19.124 -+ parser->deleteNodeTest($2); 19.125 -+ parser->registerParseNode($$); 19.126 - } 19.127 - | 19.128 -@@ -224,6 +224,6 @@ 19.129 - String localName; 19.130 - String namespaceURI; 19.131 -- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { 19.132 -- PARSER->m_gotNamespaceError = true; 19.133 -+ if (!parser->expandQName(*$2, localName, namespaceURI)) { 19.134 -+ parser->m_gotNamespaceError = true; 19.135 - YYABORT; 19.136 - } 19.137 -@@ -231,9 +231,9 @@ 19.138 - if ($3) { 19.139 - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); 19.140 -- PARSER->deletePredicateVector($3); 19.141 -+ parser->deletePredicateVector($3); 19.142 - } else 19.143 - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 19.144 -- PARSER->deleteString($2); 19.145 -- PARSER->registerParseNode($$); 19.146 -+ parser->deleteString($2); 19.147 -+ parser->registerParseNode($$); 19.148 - } 19.149 - | 19.150 -@@ -260,6 +260,6 @@ 19.151 - $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); 19.152 - 19.153 -- PARSER->deleteString($1); 19.154 -- PARSER->registerNodeTest($$); 19.155 -+ parser->deleteString($1); 19.156 -+ parser->registerNodeTest($$); 19.157 - } 19.158 - | 19.159 -@@ -267,6 +267,6 @@ 19.160 - { 19.161 - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); 19.162 -- PARSER->deleteString($1); 19.163 -- PARSER->registerNodeTest($$); 19.164 -+ parser->deleteString($1); 19.165 -+ parser->registerNodeTest($$); 19.166 - } 19.167 - | 19.168 -@@ -274,7 +274,7 @@ 19.169 - { 19.170 - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); 19.171 -- PARSER->deleteString($1); 19.172 -- PARSER->deleteString($3); 19.173 -- PARSER->registerNodeTest($$); 19.174 -+ parser->deleteString($1); 19.175 -+ parser->deleteString($3); 19.176 -+ parser->registerNodeTest($$); 19.177 - } 19.178 - ; 19.179 -@@ -294,6 +294,6 @@ 19.180 - $$ = new Vector<Predicate*>; 19.181 - $$->append(new Predicate($1)); 19.182 -- PARSER->unregisterParseNode($1); 19.183 -- PARSER->registerPredicateVector($$); 19.184 -+ parser->unregisterParseNode($1); 19.185 -+ parser->registerPredicateVector($$); 19.186 - } 19.187 - | 19.188 -@@ -301,5 +301,5 @@ 19.189 - { 19.190 - $$->append(new Predicate($2)); 19.191 -- PARSER->unregisterParseNode($2); 19.192 -+ parser->unregisterParseNode($2); 19.193 - } 19.194 - ; 19.195 -@@ -316,5 +316,5 @@ 19.196 - { 19.197 - $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 19.198 -- PARSER->registerParseNode($$); 19.199 -+ parser->registerParseNode($$); 19.200 - } 19.201 - ; 19.202 -@@ -324,5 +324,5 @@ 19.203 - { 19.204 - $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 19.205 -- PARSER->registerParseNode($$); 19.206 -+ parser->registerParseNode($$); 19.207 - } 19.208 - | 19.209 -@@ -330,5 +330,5 @@ 19.210 - { 19.211 - $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 19.212 -- PARSER->registerParseNode($$); 19.213 -+ parser->registerParseNode($$); 19.214 - } 19.215 - ; 19.216 -@@ -338,6 +338,6 @@ 19.217 - { 19.218 - $$ = new VariableReference(*$1); 19.219 -- PARSER->deleteString($1); 19.220 -- PARSER->registerParseNode($$); 19.221 -+ parser->deleteString($1); 19.222 -+ parser->registerParseNode($$); 19.223 - } 19.224 - | 19.225 -@@ -350,6 +350,6 @@ 19.226 - { 19.227 - $$ = new StringExpression(*$1); 19.228 -- PARSER->deleteString($1); 19.229 -- PARSER->registerParseNode($$); 19.230 -+ parser->deleteString($1); 19.231 -+ parser->registerParseNode($$); 19.232 - } 19.233 - | 19.234 -@@ -357,6 +357,6 @@ 19.235 - { 19.236 - $$ = new Number($1->toDouble()); 19.237 -- PARSER->deleteString($1); 19.238 -- PARSER->registerParseNode($$); 19.239 -+ parser->deleteString($1); 19.240 -+ parser->registerParseNode($$); 19.241 - } 19.242 - | 19.243 -@@ -370,6 +370,6 @@ 19.244 - if (!$$) 19.245 - YYABORT; 19.246 -- PARSER->deleteString($1); 19.247 -- PARSER->registerParseNode($$); 19.248 -+ parser->deleteString($1); 19.249 -+ parser->registerParseNode($$); 19.250 - } 19.251 - | 19.252 -@@ -379,7 +379,7 @@ 19.253 - if (!$$) 19.254 - YYABORT; 19.255 -- PARSER->deleteString($1); 19.256 -- PARSER->deleteExpressionVector($3); 19.257 -- PARSER->registerParseNode($$); 19.258 -+ parser->deleteString($1); 19.259 -+ parser->deleteExpressionVector($3); 19.260 -+ parser->registerParseNode($$); 19.261 - } 19.262 - ; 19.263 -@@ -390,6 +390,6 @@ 19.264 - $$ = new Vector<Expression*>; 19.265 - $$->append($1); 19.266 -- PARSER->unregisterParseNode($1); 19.267 -- PARSER->registerExpressionVector($$); 19.268 -+ parser->unregisterParseNode($1); 19.269 -+ parser->registerExpressionVector($$); 19.270 - } 19.271 - | 19.272 -@@ -397,5 +397,5 @@ 19.273 - { 19.274 - $$->append($3); 19.275 -- PARSER->unregisterParseNode($3); 19.276 -+ parser->unregisterParseNode($3); 19.277 - } 19.278 - ; 19.279 -@@ -413,7 +413,7 @@ 19.280 - $$->addSubExpression($1); 19.281 - $$->addSubExpression($3); 19.282 -- PARSER->unregisterParseNode($1); 19.283 -- PARSER->unregisterParseNode($3); 19.284 -- PARSER->registerParseNode($$); 19.285 -+ parser->unregisterParseNode($1); 19.286 -+ parser->unregisterParseNode($3); 19.287 -+ parser->registerParseNode($$); 19.288 - } 19.289 - ; 19.290 -@@ -431,7 +431,7 @@ 19.291 - $3->setAbsolute(true); 19.292 - $$ = new Path(static_cast<Filter*>($1), $3); 19.293 -- PARSER->unregisterParseNode($1); 19.294 -- PARSER->unregisterParseNode($3); 19.295 -- PARSER->registerParseNode($$); 19.296 -+ parser->unregisterParseNode($1); 19.297 -+ parser->unregisterParseNode($3); 19.298 -+ parser->registerParseNode($$); 19.299 - } 19.300 - | 19.301 -@@ -441,8 +441,8 @@ 19.302 - $3->setAbsolute(true); 19.303 - $$ = new Path(static_cast<Filter*>($1), $3); 19.304 -- PARSER->unregisterParseNode($1); 19.305 -- PARSER->unregisterParseNode($2); 19.306 -- PARSER->unregisterParseNode($3); 19.307 -- PARSER->registerParseNode($$); 19.308 -+ parser->unregisterParseNode($1); 19.309 -+ parser->unregisterParseNode($2); 19.310 -+ parser->unregisterParseNode($3); 19.311 -+ parser->registerParseNode($$); 19.312 - } 19.313 - ; 19.314 -@@ -454,7 +454,7 @@ 19.315 - { 19.316 - $$ = new Filter($1, *$2); 19.317 -- PARSER->unregisterParseNode($1); 19.318 -- PARSER->deletePredicateVector($2); 19.319 -- PARSER->registerParseNode($$); 19.320 -+ parser->unregisterParseNode($1); 19.321 -+ parser->deletePredicateVector($2); 19.322 -+ parser->registerParseNode($$); 19.323 - } 19.324 - ; 19.325 -@@ -466,7 +466,7 @@ 19.326 - { 19.327 - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); 19.328 -- PARSER->unregisterParseNode($1); 19.329 -- PARSER->unregisterParseNode($3); 19.330 -- PARSER->registerParseNode($$); 19.331 -+ parser->unregisterParseNode($1); 19.332 -+ parser->unregisterParseNode($3); 19.333 -+ parser->registerParseNode($$); 19.334 - } 19.335 - ; 19.336 -@@ -478,7 +478,7 @@ 19.337 - { 19.338 - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); 19.339 -- PARSER->unregisterParseNode($1); 19.340 -- PARSER->unregisterParseNode($3); 19.341 -- PARSER->registerParseNode($$); 19.342 -+ parser->unregisterParseNode($1); 19.343 -+ parser->unregisterParseNode($3); 19.344 -+ parser->registerParseNode($$); 19.345 - } 19.346 - ; 19.347 -@@ -490,7 +490,7 @@ 19.348 - { 19.349 - $$ = new EqTestOp($2, $1, $3); 19.350 -- PARSER->unregisterParseNode($1); 19.351 -- PARSER->unregisterParseNode($3); 19.352 -- PARSER->registerParseNode($$); 19.353 -+ parser->unregisterParseNode($1); 19.354 -+ parser->unregisterParseNode($3); 19.355 -+ parser->registerParseNode($$); 19.356 - } 19.357 - ; 19.358 -@@ -502,7 +502,7 @@ 19.359 - { 19.360 - $$ = new EqTestOp($2, $1, $3); 19.361 -- PARSER->unregisterParseNode($1); 19.362 -- PARSER->unregisterParseNode($3); 19.363 -- PARSER->registerParseNode($$); 19.364 -+ parser->unregisterParseNode($1); 19.365 -+ parser->unregisterParseNode($3); 19.366 -+ parser->registerParseNode($$); 19.367 - } 19.368 - ; 19.369 -@@ -514,7 +514,7 @@ 19.370 - { 19.371 - $$ = new NumericOp(NumericOp::OP_Add, $1, $3); 19.372 -- PARSER->unregisterParseNode($1); 19.373 -- PARSER->unregisterParseNode($3); 19.374 -- PARSER->registerParseNode($$); 19.375 -+ parser->unregisterParseNode($1); 19.376 -+ parser->unregisterParseNode($3); 19.377 -+ parser->registerParseNode($$); 19.378 - } 19.379 - | 19.380 -@@ -522,7 +522,7 @@ 19.381 - { 19.382 - $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); 19.383 -- PARSER->unregisterParseNode($1); 19.384 -- PARSER->unregisterParseNode($3); 19.385 -- PARSER->registerParseNode($$); 19.386 -+ parser->unregisterParseNode($1); 19.387 -+ parser->unregisterParseNode($3); 19.388 -+ parser->registerParseNode($$); 19.389 - } 19.390 - ; 19.391 -@@ -534,7 +534,7 @@ 19.392 - { 19.393 - $$ = new NumericOp($2, $1, $3); 19.394 -- PARSER->unregisterParseNode($1); 19.395 -- PARSER->unregisterParseNode($3); 19.396 -- PARSER->registerParseNode($$); 19.397 -+ parser->unregisterParseNode($1); 19.398 -+ parser->unregisterParseNode($3); 19.399 -+ parser->registerParseNode($$); 19.400 - } 19.401 - ; 19.402 -@@ -547,6 +547,6 @@ 19.403 - $$ = new Negative; 19.404 - $$->addSubExpression($2); 19.405 -- PARSER->unregisterParseNode($2); 19.406 -- PARSER->registerParseNode($$); 19.407 -+ parser->unregisterParseNode($2); 19.408 -+ parser->registerParseNode($$); 19.409 - } 19.410 - ;
20.1 --- a/libwebkit/stuff/patches/WebCore_xml_XPathParser.cpp_124099.patch Wed May 23 15:22:22 2018 +0000 20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 20.3 @@ -1,39 +0,0 @@ 20.4 -Index: trunk/Source/WebCore/xml/XPathParser.cpp 20.5 -=================================================================== 20.6 ---- trunk/Source/WebCore/xml/XPathParser.cpp (revision 97771) 20.7 -+++ trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099) 20.8 -@@ -33,22 +33,19 @@ 20.9 - #include "XPathException.h" 20.10 - #include "XPathNSResolver.h" 20.11 -+#include "XPathPath.h" 20.12 - #include "XPathStep.h" 20.13 - #include <wtf/StdLibExtras.h> 20.14 - #include <wtf/text/StringHash.h> 20.15 - 20.16 --int xpathyyparse(void*); 20.17 -- 20.18 -+using namespace WebCore; 20.19 - using namespace WTF; 20.20 - using namespace Unicode; 20.21 -- 20.22 --namespace WebCore { 20.23 --namespace XPath { 20.24 -- 20.25 --class LocationPath; 20.26 -- 20.27 --#include "XPathGrammar.h" 20.28 -+using namespace XPath; 20.29 -+ 20.30 -+extern int xpathyyparse(WebCore::XPath::Parser*); 20.31 -+#include "XPathGrammar.h" 20.32 - 20.33 - Parser* Parser::currentParser = 0; 20.34 -- 20.35 -+ 20.36 - enum XMLCat { NameStart, NameCont, NotPartOfName }; 20.37 - 20.38 -@@ -631,4 +628,2 @@ 20.39 - } 20.40 - 20.41 --} 20.42 --}
21.1 --- a/libwebkit/stuff/patches/series Wed May 23 15:22:22 2018 +0000 21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 21.3 @@ -1,7 +0,0 @@ 21.4 -CodeGeneratorGObject-bug-84526.patch 21.5 -GtkClickCounter.patch 21.6 -WebCore_ChangeLog_124099.patch 21.7 -WebCore_css_CSSGrammar.y_124099.patch 21.8 -WebCore_css_CSSParser.cpp_124099.patch 21.9 -WebCore_xml_XPathGrammar.y_124099.patch 21.10 -WebCore_xml_XPathParser.cpp_124099.patch
22.1 --- a/webkit-r/receipt Wed May 23 15:22:22 2018 +0000 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,48 +0,0 @@ 22.4 -# SliTaz package receipt v2. 22.5 - 22.6 -PACKAGE="webkit-r" 22.7 -VERSION="99690" 22.8 -CATEGORY="network" 22.9 -SHORT_DESC="xHTML render library" 22.10 -MAINTAINER="pankso@slitaz.org" 22.11 -LICENSE="BSD LGPL" 22.12 -WEB_SITE="http://webkit.org/" 22.13 - 22.14 -TARBALL="WebKit-r$VERSION.tar.bz2" 22.15 -WGET_URL="http://nightly.webkit.org/files/trunk/src/$TARBALL" 22.16 - 22.17 -BUILD_DEPENDS="icu icu-dev gperf libxslt-dev glib-dev autoconf automake \ 22.18 -sqlite3-dev libtool m4 bison flex curl-dev gtk-doc libsoup-dev \ 22.19 -gst0-plugins-base-dev gstreamer0-dev util-linux-uuid-dev jpeg-dev libjpeg \ 22.20 -libpng16-dev pango-dev gtk+-dev orc-dev xorg-libXt-dev" 22.21 -SPLIT="webkit-r-dev" 22.22 - 22.23 -compile_rules() { 22.24 - mv WebKit-r$VERSION $PACKAGE-$VERSION 2>/dev/null 22.25 - cd $src 22.26 - patch -p0 < $stuff/bison26.u 22.27 - patch -p1 < $stuff/CSSParser.cpp.u 22.28 - 22.29 - ./autogen.sh \ 22.30 - --with-gtk=2.0 \ 22.31 - $CONFIGURE_ARGS && 22.32 - fix libtool && 22.33 - make $MAKEFLAGS && 22.34 - make DESTDIR=$DESTDIR install 22.35 -} 22.36 - 22.37 -genpkg_rules() { 22.38 - case $PACKAGE in 22.39 - webkit-r) 22.40 - copy @std 22.41 - DEPENDS="libxslt expat gtk+ icu jpeg libcurl libxml2 openssl \ 22.42 - sqlite3 xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \ 22.43 - xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \ 22.44 - xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \ 22.45 - xorg-libXt xorg-libXdamage gcc-lib-base" 22.46 - ;; 22.47 - *-dev) 22.48 - copy @dev 22.49 - ;; 22.50 - esac 22.51 -}
23.1 --- a/webkit-r/stuff/CSSParser.cpp.u Wed May 23 15:22:22 2018 +0000 23.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 23.3 @@ -1,8 +0,0 @@ 23.4 ---- WebKit-r99690-ori/Source/WebCore/css/CSSParser.cpp 23.5 -+++ WebKit-r99690/Source/WebCore/css/CSSParser.cpp 23.6 -@@ -7838,4 +7838,4 @@ 23.7 - 23.8 - #include "tokenizer.cpp" 23.9 - 23.10 --} 23.11 -+//}
24.1 --- a/webkit-r/stuff/bison26.u Wed May 23 15:22:22 2018 +0000 24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 24.3 @@ -1,540 +0,0 @@ 24.4 ---- Source/WebCore/css/CSSGrammar.y 24.5 -+++ Source/WebCore/css/CSSGrammar.y 24.6 -@@ -53,14 +53,13 @@ 24.7 - #define YYMAXDEPTH 10000 24.8 - #define YYDEBUG 0 24.9 - 24.10 --// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x 24.11 --#define YYPARSE_PARAM parser 24.12 --#define YYLEX_PARAM parser 24.13 -- 24.14 - %} 24.15 - 24.16 - %pure_parser 24.17 - 24.18 -+%parse-param { CSSParser* parser } 24.19 -+%lex-param { CSSParser* parser } 24.20 -+ 24.21 - %union { 24.22 - bool boolean; 24.23 - char character; 24.24 -@@ -88,7 +87,7 @@ 24.25 - 24.26 - %{ 24.27 - 24.28 --static inline int cssyyerror(const char*) 24.29 -+static inline int cssyyerror(void*, const char*) 24.30 - { 24.31 - return 1; 24.32 - } 24.33 ---- Source/WebCore/css/CSSParser.cpp 24.34 -+++ Source/WebCore/css/CSSParser.cpp 24.35 -@@ -96,7 +96,7 @@ 24.36 - extern int cssyydebug; 24.37 - #endif 24.38 - 24.39 --extern int cssyyparse(void* parser); 24.40 -+extern int cssyyparse(WebCore::CSSParser*); 24.41 - 24.42 - using namespace std; 24.43 - using namespace WTF; 24.44 ---- Source/WebCore/xml/XPathGrammar.y 24.45 -+++ Source/WebCore/xml/XPathGrammar.y 24.46 -@@ -34,6 +34,7 @@ 24.47 - #include "XPathParser.h" 24.48 - #include "XPathPath.h" 24.49 - #include "XPathPredicate.h" 24.50 -+#include "XPathStep.h" 24.51 - #include "XPathVariableReference.h" 24.52 - #include <wtf/FastMalloc.h> 24.53 - 24.54 -@@ -44,8 +45,6 @@ 24.55 - #define YYLTYPE_IS_TRIVIAL 1 24.56 - #define YYDEBUG 0 24.57 - #define YYMAXDEPTH 10000 24.58 --#define YYPARSE_PARAM parserParameter 24.59 --#define PARSER static_cast<Parser*>(parserParameter) 24.60 - 24.61 - using namespace WebCore; 24.62 - using namespace XPath; 24.63 -@@ -53,6 +52,7 @@ 24.64 - %} 24.65 - 24.66 - %pure_parser 24.67 -+%parse-param { WebCore::XPath::Parser* parser } 24.68 - 24.69 - %union 24.70 - { 24.71 -@@ -71,7 +71,7 @@ 24.72 - %{ 24.73 - 24.74 - static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } 24.75 --static void xpathyyerror(const char*) { } 24.76 -+static void xpathyyerror(void*, const char*) { } 24.77 - 24.78 - %} 24.79 - 24.80 -@@ -118,7 +118,7 @@ 24.81 - Expr: 24.82 - OrExpr 24.83 - { 24.84 -- PARSER->m_topExpr = $1; 24.85 -+ parser->m_topExpr = $1; 24.86 - } 24.87 - ; 24.88 - 24.89 -@@ -138,7 +138,7 @@ 24.90 - '/' 24.91 - { 24.92 - $$ = new LocationPath; 24.93 -- PARSER->registerParseNode($$); 24.94 -+ parser->registerParseNode($$); 24.95 - } 24.96 - | 24.97 - '/' RelativeLocationPath 24.98 -@@ -150,7 +150,7 @@ 24.99 - { 24.100 - $$ = $2; 24.101 - $$->insertFirstStep($1); 24.102 -- PARSER->unregisterParseNode($1); 24.103 -+ parser->unregisterParseNode($1); 24.104 - } 24.105 - ; 24.106 - 24.107 -@@ -159,22 +159,22 @@ 24.108 - { 24.109 - $$ = new LocationPath; 24.110 - $$->appendStep($1); 24.111 -- PARSER->unregisterParseNode($1); 24.112 -- PARSER->registerParseNode($$); 24.113 -+ parser->unregisterParseNode($1); 24.114 -+ parser->registerParseNode($$); 24.115 - } 24.116 - | 24.117 - RelativeLocationPath '/' Step 24.118 - { 24.119 - $$->appendStep($3); 24.120 -- PARSER->unregisterParseNode($3); 24.121 -+ parser->unregisterParseNode($3); 24.122 - } 24.123 - | 24.124 - RelativeLocationPath DescendantOrSelf Step 24.125 - { 24.126 - $$->appendStep($2); 24.127 - $$->appendStep($3); 24.128 -- PARSER->unregisterParseNode($2); 24.129 -- PARSER->unregisterParseNode($3); 24.130 -+ parser->unregisterParseNode($2); 24.131 -+ parser->unregisterParseNode($3); 24.132 - } 24.133 - ; 24.134 - 24.135 -@@ -183,58 +183,58 @@ 24.136 - { 24.137 - if ($2) { 24.138 - $$ = new Step(Step::ChildAxis, *$1, *$2); 24.139 -- PARSER->deletePredicateVector($2); 24.140 -+ parser->deletePredicateVector($2); 24.141 - } else 24.142 - $$ = new Step(Step::ChildAxis, *$1); 24.143 -- PARSER->deleteNodeTest($1); 24.144 -- PARSER->registerParseNode($$); 24.145 -+ parser->deleteNodeTest($1); 24.146 -+ parser->registerParseNode($$); 24.147 - } 24.148 - | 24.149 - NAMETEST OptionalPredicateList 24.150 - { 24.151 - String localName; 24.152 - String namespaceURI; 24.153 -- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { 24.154 -- PARSER->m_gotNamespaceError = true; 24.155 -+ if (!parser->expandQName(*$1, localName, namespaceURI)) { 24.156 -+ parser->m_gotNamespaceError = true; 24.157 - YYABORT; 24.158 - } 24.159 - 24.160 - if ($2) { 24.161 - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); 24.162 -- PARSER->deletePredicateVector($2); 24.163 -+ parser->deletePredicateVector($2); 24.164 - } else 24.165 - $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 24.166 -- PARSER->deleteString($1); 24.167 -- PARSER->registerParseNode($$); 24.168 -+ parser->deleteString($1); 24.169 -+ parser->registerParseNode($$); 24.170 - } 24.171 - | 24.172 - AxisSpecifier NodeTest OptionalPredicateList 24.173 - { 24.174 - if ($3) { 24.175 - $$ = new Step($1, *$2, *$3); 24.176 -- PARSER->deletePredicateVector($3); 24.177 -+ parser->deletePredicateVector($3); 24.178 - } else 24.179 - $$ = new Step($1, *$2); 24.180 -- PARSER->deleteNodeTest($2); 24.181 -- PARSER->registerParseNode($$); 24.182 -+ parser->deleteNodeTest($2); 24.183 -+ parser->registerParseNode($$); 24.184 - } 24.185 - | 24.186 - AxisSpecifier NAMETEST OptionalPredicateList 24.187 - { 24.188 - String localName; 24.189 - String namespaceURI; 24.190 -- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { 24.191 -- PARSER->m_gotNamespaceError = true; 24.192 -+ if (!parser->expandQName(*$2, localName, namespaceURI)) { 24.193 -+ parser->m_gotNamespaceError = true; 24.194 - YYABORT; 24.195 - } 24.196 - 24.197 - if ($3) { 24.198 - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); 24.199 -- PARSER->deletePredicateVector($3); 24.200 -+ parser->deletePredicateVector($3); 24.201 - } else 24.202 - $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); 24.203 -- PARSER->deleteString($2); 24.204 -- PARSER->registerParseNode($$); 24.205 -+ parser->deleteString($2); 24.206 -+ parser->registerParseNode($$); 24.207 - } 24.208 - | 24.209 - AbbreviatedStep 24.210 -@@ -259,23 +259,23 @@ 24.211 - else if (*$1 == "comment") 24.212 - $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); 24.213 - 24.214 -- PARSER->deleteString($1); 24.215 -- PARSER->registerNodeTest($$); 24.216 -+ parser->deleteString($1); 24.217 -+ parser->registerNodeTest($$); 24.218 - } 24.219 - | 24.220 - PI '(' ')' 24.221 - { 24.222 - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); 24.223 -- PARSER->deleteString($1); 24.224 -- PARSER->registerNodeTest($$); 24.225 -+ parser->deleteString($1); 24.226 -+ parser->registerNodeTest($$); 24.227 - } 24.228 - | 24.229 - PI '(' LITERAL ')' 24.230 - { 24.231 - $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); 24.232 -- PARSER->deleteString($1); 24.233 -- PARSER->deleteString($3); 24.234 -- PARSER->registerNodeTest($$); 24.235 -+ parser->deleteString($1); 24.236 -+ parser->deleteString($3); 24.237 -+ parser->registerNodeTest($$); 24.238 - } 24.239 - ; 24.240 - 24.241 -@@ -293,14 +293,14 @@ 24.242 - { 24.243 - $$ = new Vector<Predicate*>; 24.244 - $$->append(new Predicate($1)); 24.245 -- PARSER->unregisterParseNode($1); 24.246 -- PARSER->registerPredicateVector($$); 24.247 -+ parser->unregisterParseNode($1); 24.248 -+ parser->registerPredicateVector($$); 24.249 - } 24.250 - | 24.251 - PredicateList Predicate 24.252 - { 24.253 - $$->append(new Predicate($2)); 24.254 -- PARSER->unregisterParseNode($2); 24.255 -+ parser->unregisterParseNode($2); 24.256 - } 24.257 - ; 24.258 - 24.259 -@@ -315,7 +315,7 @@ 24.260 - SLASHSLASH 24.261 - { 24.262 - $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 24.263 -- PARSER->registerParseNode($$); 24.264 -+ parser->registerParseNode($$); 24.265 - } 24.266 - ; 24.267 - 24.268 -@@ -323,13 +323,13 @@ 24.269 - '.' 24.270 - { 24.271 - $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 24.272 -- PARSER->registerParseNode($$); 24.273 -+ parser->registerParseNode($$); 24.274 - } 24.275 - | 24.276 - DOTDOT 24.277 - { 24.278 - $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); 24.279 -- PARSER->registerParseNode($$); 24.280 -+ parser->registerParseNode($$); 24.281 - } 24.282 - ; 24.283 - 24.284 -@@ -337,8 +337,8 @@ 24.285 - VARIABLEREFERENCE 24.286 - { 24.287 - $$ = new VariableReference(*$1); 24.288 -- PARSER->deleteString($1); 24.289 -- PARSER->registerParseNode($$); 24.290 -+ parser->deleteString($1); 24.291 -+ parser->registerParseNode($$); 24.292 - } 24.293 - | 24.294 - '(' Expr ')' 24.295 -@@ -349,15 +349,15 @@ 24.296 - LITERAL 24.297 - { 24.298 - $$ = new StringExpression(*$1); 24.299 -- PARSER->deleteString($1); 24.300 -- PARSER->registerParseNode($$); 24.301 -+ parser->deleteString($1); 24.302 -+ parser->registerParseNode($$); 24.303 - } 24.304 - | 24.305 - NUMBER 24.306 - { 24.307 - $$ = new Number($1->toDouble()); 24.308 -- PARSER->deleteString($1); 24.309 -- PARSER->registerParseNode($$); 24.310 -+ parser->deleteString($1); 24.311 -+ parser->registerParseNode($$); 24.312 - } 24.313 - | 24.314 - FunctionCall 24.315 -@@ -369,8 +369,8 @@ 24.316 - $$ = createFunction(*$1); 24.317 - if (!$$) 24.318 - YYABORT; 24.319 -- PARSER->deleteString($1); 24.320 -- PARSER->registerParseNode($$); 24.321 -+ parser->deleteString($1); 24.322 -+ parser->registerParseNode($$); 24.323 - } 24.324 - | 24.325 - FUNCTIONNAME '(' ArgumentList ')' 24.326 -@@ -378,9 +378,9 @@ 24.327 - $$ = createFunction(*$1, *$3); 24.328 - if (!$$) 24.329 - YYABORT; 24.330 -- PARSER->deleteString($1); 24.331 -- PARSER->deleteExpressionVector($3); 24.332 -- PARSER->registerParseNode($$); 24.333 -+ parser->deleteString($1); 24.334 -+ parser->deleteExpressionVector($3); 24.335 -+ parser->registerParseNode($$); 24.336 - } 24.337 - ; 24.338 - 24.339 -@@ -389,14 +389,14 @@ 24.340 - { 24.341 - $$ = new Vector<Expression*>; 24.342 - $$->append($1); 24.343 -- PARSER->unregisterParseNode($1); 24.344 -- PARSER->registerExpressionVector($$); 24.345 -+ parser->unregisterParseNode($1); 24.346 -+ parser->registerExpressionVector($$); 24.347 - } 24.348 - | 24.349 - ArgumentList ',' Argument 24.350 - { 24.351 - $$->append($3); 24.352 -- PARSER->unregisterParseNode($3); 24.353 -+ parser->unregisterParseNode($3); 24.354 - } 24.355 - ; 24.356 - 24.357 -@@ -412,9 +412,9 @@ 24.358 - $$ = new Union; 24.359 - $$->addSubExpression($1); 24.360 - $$->addSubExpression($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 - 24.370 -@@ -430,9 +430,9 @@ 24.371 - { 24.372 - $3->setAbsolute(true); 24.373 - $$ = new Path(static_cast<Filter*>($1), $3); 24.374 -- PARSER->unregisterParseNode($1); 24.375 -- PARSER->unregisterParseNode($3); 24.376 -- PARSER->registerParseNode($$); 24.377 -+ parser->unregisterParseNode($1); 24.378 -+ parser->unregisterParseNode($3); 24.379 -+ parser->registerParseNode($$); 24.380 - } 24.381 - | 24.382 - FilterExpr DescendantOrSelf RelativeLocationPath 24.383 -@@ -440,10 +440,10 @@ 24.384 - $3->insertFirstStep($2); 24.385 - $3->setAbsolute(true); 24.386 - $$ = new Path(static_cast<Filter*>($1), $3); 24.387 -- PARSER->unregisterParseNode($1); 24.388 -- PARSER->unregisterParseNode($2); 24.389 -- PARSER->unregisterParseNode($3); 24.390 -- PARSER->registerParseNode($$); 24.391 -+ parser->unregisterParseNode($1); 24.392 -+ parser->unregisterParseNode($2); 24.393 -+ parser->unregisterParseNode($3); 24.394 -+ parser->registerParseNode($$); 24.395 - } 24.396 - ; 24.397 - 24.398 -@@ -453,9 +453,9 @@ 24.399 - PrimaryExpr PredicateList 24.400 - { 24.401 - $$ = new Filter($1, *$2); 24.402 -- PARSER->unregisterParseNode($1); 24.403 -- PARSER->deletePredicateVector($2); 24.404 -- PARSER->registerParseNode($$); 24.405 -+ parser->unregisterParseNode($1); 24.406 -+ parser->deletePredicateVector($2); 24.407 -+ parser->registerParseNode($$); 24.408 - } 24.409 - ; 24.410 - 24.411 -@@ -465,9 +465,9 @@ 24.412 - OrExpr OR AndExpr 24.413 - { 24.414 - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); 24.415 -- PARSER->unregisterParseNode($1); 24.416 -- PARSER->unregisterParseNode($3); 24.417 -- PARSER->registerParseNode($$); 24.418 -+ parser->unregisterParseNode($1); 24.419 -+ parser->unregisterParseNode($3); 24.420 -+ parser->registerParseNode($$); 24.421 - } 24.422 - ; 24.423 - 24.424 -@@ -477,9 +477,9 @@ 24.425 - AndExpr AND EqualityExpr 24.426 - { 24.427 - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); 24.428 -- PARSER->unregisterParseNode($1); 24.429 -- PARSER->unregisterParseNode($3); 24.430 -- PARSER->registerParseNode($$); 24.431 -+ parser->unregisterParseNode($1); 24.432 -+ parser->unregisterParseNode($3); 24.433 -+ parser->registerParseNode($$); 24.434 - } 24.435 - ; 24.436 - 24.437 -@@ -489,9 +489,9 @@ 24.438 - EqualityExpr EQOP RelationalExpr 24.439 - { 24.440 - $$ = new EqTestOp($2, $1, $3); 24.441 -- PARSER->unregisterParseNode($1); 24.442 -- PARSER->unregisterParseNode($3); 24.443 -- PARSER->registerParseNode($$); 24.444 -+ parser->unregisterParseNode($1); 24.445 -+ parser->unregisterParseNode($3); 24.446 -+ parser->registerParseNode($$); 24.447 - } 24.448 - ; 24.449 - 24.450 -@@ -501,9 +501,9 @@ 24.451 - RelationalExpr RELOP AdditiveExpr 24.452 - { 24.453 - $$ = new EqTestOp($2, $1, $3); 24.454 -- PARSER->unregisterParseNode($1); 24.455 -- PARSER->unregisterParseNode($3); 24.456 -- PARSER->registerParseNode($$); 24.457 -+ parser->unregisterParseNode($1); 24.458 -+ parser->unregisterParseNode($3); 24.459 -+ parser->registerParseNode($$); 24.460 - } 24.461 - ; 24.462 - 24.463 -@@ -513,17 +513,17 @@ 24.464 - AdditiveExpr PLUS MultiplicativeExpr 24.465 - { 24.466 - $$ = new NumericOp(NumericOp::OP_Add, $1, $3); 24.467 -- PARSER->unregisterParseNode($1); 24.468 -- PARSER->unregisterParseNode($3); 24.469 -- PARSER->registerParseNode($$); 24.470 -+ parser->unregisterParseNode($1); 24.471 -+ parser->unregisterParseNode($3); 24.472 -+ parser->registerParseNode($$); 24.473 - } 24.474 - | 24.475 - AdditiveExpr MINUS MultiplicativeExpr 24.476 - { 24.477 - $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); 24.478 -- PARSER->unregisterParseNode($1); 24.479 -- PARSER->unregisterParseNode($3); 24.480 -- PARSER->registerParseNode($$); 24.481 -+ parser->unregisterParseNode($1); 24.482 -+ parser->unregisterParseNode($3); 24.483 -+ parser->registerParseNode($$); 24.484 - } 24.485 - ; 24.486 - 24.487 -@@ -533,9 +533,9 @@ 24.488 - MultiplicativeExpr MULOP UnaryExpr 24.489 - { 24.490 - $$ = new NumericOp($2, $1, $3); 24.491 -- PARSER->unregisterParseNode($1); 24.492 -- PARSER->unregisterParseNode($3); 24.493 -- PARSER->registerParseNode($$); 24.494 -+ parser->unregisterParseNode($1); 24.495 -+ parser->unregisterParseNode($3); 24.496 -+ parser->registerParseNode($$); 24.497 - } 24.498 - ; 24.499 - 24.500 -@@ -546,8 +546,8 @@ 24.501 - { 24.502 - $$ = new Negative; 24.503 - $$->addSubExpression($2); 24.504 -- PARSER->unregisterParseNode($2); 24.505 -- PARSER->registerParseNode($$); 24.506 -+ parser->unregisterParseNode($2); 24.507 -+ parser->registerParseNode($$); 24.508 - } 24.509 - ; 24.510 - 24.511 ---- Source/WebCore/xml/XPathParser.cpp 24.512 -+++ Source/WebCore/xml/XPathParser.cpp.NEW 24.513 -@@ -32,20 +32,17 @@ 24.514 - #include "XPathEvaluator.h" 24.515 - #include "XPathException.h" 24.516 - #include "XPathNSResolver.h" 24.517 -+#include "XPathPath.h" 24.518 - #include "XPathStep.h" 24.519 - #include <wtf/StdLibExtras.h> 24.520 - #include <wtf/text/StringHash.h> 24.521 - 24.522 --int xpathyyparse(void*); 24.523 -- 24.524 -+using namespace WebCore; 24.525 - using namespace WTF; 24.526 - using namespace Unicode; 24.527 -+using namespace XPath; 24.528 - 24.529 --namespace WebCore { 24.530 --namespace XPath { 24.531 -- 24.532 --class LocationPath; 24.533 -- 24.534 -+extern int xpathyyparse(WebCore::XPath::Parser*); 24.535 - #include "XPathGrammar.h" 24.536 - 24.537 - Parser* Parser::currentParser = 0; 24.538 -@@ -630,5 +627,3 @@ 24.539 - delete t; 24.540 - } 24.541 - 24.542 --} 24.543 --}