Hello community, here is the log from the commit of package libQtWebKit4 for openSUSE:Factory checked in at 2012-11-10 16:55:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libQtWebKit4 (Old) and /work/SRC/openSUSE:Factory/.libQtWebKit4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libQtWebKit4", Maintainer is "DMueller@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libQtWebKit4/libQtWebKit4.changes 2012-10-03 08:03:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libQtWebKit4.new/libQtWebKit4.changes 2012-11-10 16:55:53.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 5 18:30:36 UTC 2012 - dmueller@suse.com + +- fix build against bison 2.6 + +------------------------------------------------------------------- New: ---- bison-26.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libQtWebKit4.spec ++++++ --- /var/tmp/diff_new_pack.pUidAw/_old 2012-11-10 16:56:04.000000000 +0100 +++ /var/tmp/diff_new_pack.pUidAw/_new 2012-11-10 16:56:04.000000000 +0100 @@ -23,7 +23,7 @@ Version: %qt_version+%tar_version Release: 0 Summary: Open source Web Browser engine based on Qt4 -License: LGPL-2.1+ ; BSD-3-Clause +License: LGPL-2.1+ and BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://trac.webkit.org/wiki/QtWebKit Source0: QtWebKit-%{tar_version}.tar.bz2 @@ -52,6 +52,7 @@ Patch14: qwebview-buildfixes.diff # PATCH-FIX-OPENSUSE libQtWebKit4-gcc47.patch dimstar@opensuse.org -- Do not use -WError... Patch taken from Fedora Patch15: libQtWebKit4-gcc47.patch +Patch16: bison-26.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison @@ -111,6 +112,7 @@ %patch13 %patch14 %patch15 -p1 +%patch16 %build export QTDIR=%{_prefix} ++++++ bison-26.diff ++++++ --- Source/WebCore/css/CSSGrammar.y +++ Source/WebCore/css/CSSGrammar.y @@ -52,14 +52,13 @@ #define YYMAXDEPTH 10000 #define YYDEBUG 0 -// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x -#define YYPARSE_PARAM parser -#define YYLEX_PARAM parser - %} %pure_parser +%parse-param { CSSParser* parser } +%lex-param { CSSParser* parser } + %union { bool boolean; char character; @@ -87,7 +86,7 @@ %{ -static inline int cssyyerror(const char*) +static inline int cssyyerror(void*, const char*) { return 1; } --- Source/WebCore/css/CSSParser.cpp +++ Source/WebCore/css/CSSParser.cpp @@ -87,7 +87,7 @@ extern int cssyydebug; #endif -extern int cssyyparse(void* parser); +extern int cssyyparse(WebCore::CSSParser*); using namespace std; using namespace WTF; --- Source/WebCore/xml/XPathGrammar.y +++ Source/WebCore/xml/XPathGrammar.y @@ -36,6 +36,7 @@ #include "XPathParser.h" #include "XPathPath.h" #include "XPathPredicate.h" +#include "XPathStep.h" #include "XPathVariableReference.h" #include <wtf/FastMalloc.h> @@ -46,8 +47,6 @@ #define YYLTYPE_IS_TRIVIAL 1 #define YYDEBUG 0 #define YYMAXDEPTH 10000 -#define YYPARSE_PARAM parserParameter -#define PARSER static_cast<Parser*>(parserParameter) using namespace WebCore; using namespace XPath; @@ -55,6 +54,7 @@ %} %pure_parser +%parse-param { WebCore::XPath::Parser* parser } %union { @@ -73,7 +73,7 @@ %{ static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } -static void xpathyyerror(const char*) { } +static void xpathyyerror(void*, const char*) { } %} @@ -120,7 +120,7 @@ Expr: OrExpr { - PARSER->m_topExpr = $1; + parser->m_topExpr = $1; } ; @@ -140,7 +140,7 @@ '/' { $$ = new LocationPath; - PARSER->registerParseNode($$); + parser->registerParseNode($$); } | '/' RelativeLocationPath @@ -152,7 +152,7 @@ { $$ = $2; $$->insertFirstStep($1); - PARSER->unregisterParseNode($1); + parser->unregisterParseNode($1); } ; @@ -161,22 +161,22 @@ { $$ = new LocationPath; $$->appendStep($1); - PARSER->unregisterParseNode($1); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->registerParseNode($$); } | RelativeLocationPath '/' Step { $$->appendStep($3); - PARSER->unregisterParseNode($3); + parser->unregisterParseNode($3); } | RelativeLocationPath DescendantOrSelf Step { $$->appendStep($2); $$->appendStep($3); - PARSER->unregisterParseNode($2); - PARSER->unregisterParseNode($3); + parser->unregisterParseNode($2); + parser->unregisterParseNode($3); } ; @@ -185,58 +185,58 @@ { if ($2) { $$ = new Step(Step::ChildAxis, *$1, *$2); - PARSER->deletePredicateVector($2); + parser->deletePredicateVector($2); } else $$ = new Step(Step::ChildAxis, *$1); - PARSER->deleteNodeTest($1); - PARSER->registerParseNode($$); + parser->deleteNodeTest($1); + parser->registerParseNode($$); } | NAMETEST OptionalPredicateList { String localName; String namespaceURI; - if (!PARSER->expandQName(*$1, localName, namespaceURI)) { - PARSER->m_gotNamespaceError = true; + if (!parser->expandQName(*$1, localName, namespaceURI)) { + parser->m_gotNamespaceError = true; YYABORT; } if ($2) { $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); - PARSER->deletePredicateVector($2); + parser->deletePredicateVector($2); } else $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); - PARSER->deleteString($1); - PARSER->registerParseNode($$); + parser->deleteString($1); + parser->registerParseNode($$); } | AxisSpecifier NodeTest OptionalPredicateList { if ($3) { $$ = new Step($1, *$2, *$3); - PARSER->deletePredicateVector($3); + parser->deletePredicateVector($3); } else $$ = new Step($1, *$2); - PARSER->deleteNodeTest($2); - PARSER->registerParseNode($$); + parser->deleteNodeTest($2); + parser->registerParseNode($$); } | AxisSpecifier NAMETEST OptionalPredicateList { String localName; String namespaceURI; - if (!PARSER->expandQName(*$2, localName, namespaceURI)) { - PARSER->m_gotNamespaceError = true; + if (!parser->expandQName(*$2, localName, namespaceURI)) { + parser->m_gotNamespaceError = true; YYABORT; } if ($3) { $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); - PARSER->deletePredicateVector($3); + parser->deletePredicateVector($3); } else $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); - PARSER->deleteString($2); - PARSER->registerParseNode($$); + parser->deleteString($2); + parser->registerParseNode($$); } | AbbreviatedStep @@ -261,23 +261,23 @@ else if (*$1 == "comment") $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); - PARSER->deleteString($1); - PARSER->registerNodeTest($$); + parser->deleteString($1); + parser->registerNodeTest($$); } | PI '(' ')' { $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); - PARSER->deleteString($1); - PARSER->registerNodeTest($$); + parser->deleteString($1); + parser->registerNodeTest($$); } | PI '(' LITERAL ')' { $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); - PARSER->deleteString($1); - PARSER->deleteString($3); - PARSER->registerNodeTest($$); + parser->deleteString($1); + parser->deleteString($3); + parser->registerNodeTest($$); } ; @@ -295,14 +295,14 @@ { $$ = new Vector<Predicate*>; $$->append(new Predicate($1)); - PARSER->unregisterParseNode($1); - PARSER->registerPredicateVector($$); + parser->unregisterParseNode($1); + parser->registerPredicateVector($$); } | PredicateList Predicate { $$->append(new Predicate($2)); - PARSER->unregisterParseNode($2); + parser->unregisterParseNode($2); } ; @@ -317,7 +317,7 @@ SLASHSLASH { $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); - PARSER->registerParseNode($$); + parser->registerParseNode($$); } ; @@ -325,13 +325,13 @@ '.' { $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); - PARSER->registerParseNode($$); + parser->registerParseNode($$); } | DOTDOT { $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); - PARSER->registerParseNode($$); + parser->registerParseNode($$); } ; @@ -339,8 +339,8 @@ VARIABLEREFERENCE { $$ = new VariableReference(*$1); - PARSER->deleteString($1); - PARSER->registerParseNode($$); + parser->deleteString($1); + parser->registerParseNode($$); } | '(' Expr ')' @@ -351,15 +351,15 @@ LITERAL { $$ = new StringExpression(*$1); - PARSER->deleteString($1); - PARSER->registerParseNode($$); + parser->deleteString($1); + parser->registerParseNode($$); } | NUMBER { $$ = new Number($1->toDouble()); - PARSER->deleteString($1); - PARSER->registerParseNode($$); + parser->deleteString($1); + parser->registerParseNode($$); } | FunctionCall @@ -371,8 +371,8 @@ $$ = createFunction(*$1); if (!$$) YYABORT; - PARSER->deleteString($1); - PARSER->registerParseNode($$); + parser->deleteString($1); + parser->registerParseNode($$); } | FUNCTIONNAME '(' ArgumentList ')' @@ -380,9 +380,9 @@ $$ = createFunction(*$1, *$3); if (!$$) YYABORT; - PARSER->deleteString($1); - PARSER->deleteExpressionVector($3); - PARSER->registerParseNode($$); + parser->deleteString($1); + parser->deleteExpressionVector($3); + parser->registerParseNode($$); } ; @@ -391,14 +391,14 @@ { $$ = new Vector<Expression*>; $$->append($1); - PARSER->unregisterParseNode($1); - PARSER->registerExpressionVector($$); + parser->unregisterParseNode($1); + parser->registerExpressionVector($$); } | ArgumentList ',' Argument { $$->append($3); - PARSER->unregisterParseNode($3); + parser->unregisterParseNode($3); } ; @@ -414,9 +414,9 @@ $$ = new Union; $$->addSubExpression($1); $$->addSubExpression($3); - PARSER->unregisterParseNode($1); - PARSER->unregisterParseNode($3); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->unregisterParseNode($3); + parser->registerParseNode($$); } ; @@ -432,9 +432,9 @@ { $3->setAbsolute(true); $$ = new Path(static_cast<Filter*>($1), $3); - PARSER->unregisterParseNode($1); - PARSER->unregisterParseNode($3); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->unregisterParseNode($3); + parser->registerParseNode($$); } | FilterExpr DescendantOrSelf RelativeLocationPath @@ -442,10 +442,10 @@ $3->insertFirstStep($2); $3->setAbsolute(true); $$ = new Path(static_cast<Filter*>($1), $3); - PARSER->unregisterParseNode($1); - PARSER->unregisterParseNode($2); - PARSER->unregisterParseNode($3); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->unregisterParseNode($2); + parser->unregisterParseNode($3); + parser->registerParseNode($$); } ; @@ -455,9 +455,9 @@ PrimaryExpr PredicateList { $$ = new Filter($1, *$2); - PARSER->unregisterParseNode($1); - PARSER->deletePredicateVector($2); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->deletePredicateVector($2); + parser->registerParseNode($$); } ; @@ -467,9 +467,9 @@ OrExpr OR AndExpr { $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); - PARSER->unregisterParseNode($1); - PARSER->unregisterParseNode($3); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->unregisterParseNode($3); + parser->registerParseNode($$); } ; @@ -479,9 +479,9 @@ AndExpr AND EqualityExpr { $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); - PARSER->unregisterParseNode($1); - PARSER->unregisterParseNode($3); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->unregisterParseNode($3); + parser->registerParseNode($$); } ; @@ -491,9 +491,9 @@ EqualityExpr EQOP RelationalExpr { $$ = new EqTestOp($2, $1, $3); - PARSER->unregisterParseNode($1); - PARSER->unregisterParseNode($3); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->unregisterParseNode($3); + parser->registerParseNode($$); } ; @@ -503,9 +503,9 @@ RelationalExpr RELOP AdditiveExpr { $$ = new EqTestOp($2, $1, $3); - PARSER->unregisterParseNode($1); - PARSER->unregisterParseNode($3); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->unregisterParseNode($3); + parser->registerParseNode($$); } ; @@ -515,17 +515,17 @@ AdditiveExpr PLUS MultiplicativeExpr { $$ = new NumericOp(NumericOp::OP_Add, $1, $3); - PARSER->unregisterParseNode($1); - PARSER->unregisterParseNode($3); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->unregisterParseNode($3); + parser->registerParseNode($$); } | AdditiveExpr MINUS MultiplicativeExpr { $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); - PARSER->unregisterParseNode($1); - PARSER->unregisterParseNode($3); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->unregisterParseNode($3); + parser->registerParseNode($$); } ; @@ -535,9 +535,9 @@ MultiplicativeExpr MULOP UnaryExpr { $$ = new NumericOp($2, $1, $3); - PARSER->unregisterParseNode($1); - PARSER->unregisterParseNode($3); - PARSER->registerParseNode($$); + parser->unregisterParseNode($1); + parser->unregisterParseNode($3); + parser->registerParseNode($$); } ; @@ -548,8 +548,8 @@ { $$ = new Negative; $$->addSubExpression($2); - PARSER->unregisterParseNode($2); - PARSER->registerParseNode($$); + parser->unregisterParseNode($2); + parser->registerParseNode($$); } ; --- Source/WebCore/xml/XPathParser.cpp +++ Source/WebCore/xml/XPathParser.cpp @@ -34,21 +34,18 @@ #include "XPathEvaluator.h" #include "XPathException.h" #include "XPathNSResolver.h" +#include "XPathPath.h" #include "XPathStep.h" #include <wtf/StdLibExtras.h> #include <wtf/text/StringHash.h> -int xpathyyparse(void*); - +using namespace WebCore; using namespace WTF; using namespace Unicode; +using namespace XPath; -namespace WebCore { -namespace XPath { - -class LocationPath; - -#include "XPathGrammar.h" +extern int xpathyyparse(WebCore::XPath::Parser*); +#include "XPathGrammar.h" Parser* Parser::currentParser = 0; @@ -632,7 +629,5 @@ delete t; } -} -} #endif // ENABLE(XPATH) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org