[arch-commits] Commit in qtwebkit/trunk (5 files)
Andrea Scarpino
andrea at archlinux.org
Wed Jan 9 13:54:27 UTC 2013
Date: Wednesday, January 9, 2013 @ 08:54:26
Author: andrea
Revision: 174939
Switch to qtwebkit-23; 2.2.x doesn't build and has some issue (FS#31564) (FS#32495)
Added:
qtwebkit/trunk/qwebview.patch
qtwebkit/trunk/use-python2.patch
Modified:
qtwebkit/trunk/PKGBUILD
Deleted:
qtwebkit/trunk/bison26.patch
qtwebkit/trunk/unsupported-gcc-flag.patch
----------------------------+
PKGBUILD | 108 ++-------
bison26.patch | 515 -------------------------------------------
qwebview.patch | 21 +
unsupported-gcc-flag.patch | 21 -
use-python2.patch | 57 ++++
5 files changed, 104 insertions(+), 618 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-01-09 13:33:08 UTC (rev 174938)
+++ PKGBUILD 2013-01-09 13:54:26 UTC (rev 174939)
@@ -2,105 +2,49 @@
# Maintainer: Andrea Scarpino <andrea at archlinux.org>
pkgname=qtwebkit
-pkgver=2.2.3
+pkgver=2.3git20130108
pkgrel=1
arch=('i686' 'x86_64')
url='http://trac.webkit.org/wiki/QtWebKit'
pkgdesc='An open source web browser engine (Qt port)'
license=('LGPL2.1' 'GPL3')
-depends=('qt' 'gstreamer0.10-base')
-makedepends=('python2' 'mesa' 'gperf')
+depends=('qt' 'systemd')
+makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
conflicts=('qt<4.8')
-_qtver=4.8.3
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-source.tar.gz"
- "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-${_qtver}.tar.xz"
- 'bison26.patch'
- 'unsupported-gcc-flag.patch')
-sha1sums=('852dc408ff5ed872b8174780b9439bf8bdd51a42'
- 'cbaebec8d78a42b0a267b7a3461ed44b885f0366'
- 'f7cad6cfff9e03e5d2f2b74a0a13b89c637818bc'
- '7c4b27d235cc569a970eb7ad50b20978da07fddd')
+_qtver=4.8.4
+source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-2.3"
+ "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz"
+ 'use-python2.patch'
+ 'qwebview.patch')
+sha1sums=('a1c62eab9fc476d5e646c9370f216f3c262b0ab7'
+ 'f5880f11c139d7d8d01ecb8d874535f7d9553198'
+ '315b6ff603f35e5492a036f7082f6aa075dfb607'
+ 'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f')
build() {
- cd "${srcdir}"/${pkgname}-${pkgver}-source
- patch -p0 -i "${srcdir}"/bison26.patch
- patch -p0 -i "${srcdir}"/unsupported-gcc-flag.patch
+ cd webkit-qtwebkit-23
- # move headers
- mv include Source/
+ patch -p1 -i "${srcdir}"/use-python2.patch
- cd Source
- qmake
- cd ../
+ export QTDIR=/usr
+ Tools/Scripts/build-webkit --qt \
+ --prefix=/usr \
+ --no-webkit2
- make -C Source
-
# Build the QWebView plugin (FS#27914)
- cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview
+ cd qt-everywhere-opensource-src-${_qtver}
+ patch -p1 -i "${srcdir}"/qwebview.patch
+ cd tools/designer/src/plugins/qwebview
qmake
make
}
package() {
- cd "${srcdir}"/${pkgname}-${pkgver}-source
- make INSTALL_ROOT="${pkgdir}" -C Source install
+ cd webkit-qtwebkit-23
+ make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
- cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview
+ cd ../
+
+ cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
make INSTALL_ROOT="${pkgdir}" install
}
-
-# needs python2, qmake, git, gperf
-mksource() {
- local _current_dir=$(pwd)
- local _tmp=$(mktemp -d --tmpdir)
-
- cd ${_tmp}
- git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git
-
- # fetch the make-package.py script
- git clone git://qt.gitorious.org/qtwebkit/tools.git
-
- # create the qtwebkit tarball
- cd qtwebkit
- git checkout -b ${pkgname}-${pkgver} ${pkgname}-${pkgver}
-
- sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
- ../tools/make-package.py
- python2 ../tools/make-package.py
-
- mv ${pkgname}-${pkgver}-source.tar.gz ${_current_dir}/
-
- cd ..
-
- # create the qwebview plugin tarball
- mkdir qwebview-${_qtver}
- cd qwebview-${_qtver}
- wget http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz
- tar xf qt-everywhere-opensource-src-${_qtver}.tar.gz
- mkdir -p ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/
- cp -ra qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview \
- ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/
-
- cat > ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pro <<"EOF"
-TEMPLATE = subdirs
-CONFIG += ordered
-
-REQUIRES = !CONFIG(static,shared|static)
-contains(QT_CONFIG, webkit): SUBDIRS += qwebview
-EOF
-
- cat > ${_tmp}/header.txt <<"EOF"
-INCLUDEPATH += ../../../Source/include
-LIBS += -L../../../Source/lib
-
-EOF
-
- cat ${_tmp}/header.txt qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/plugins.pri > \
- ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pri
-
- tar cJf qwebview-${_qtver}.tar.xz ${pkgname}-${pkgver}-source
-
- mv qwebview-${_qtver}.tar.xz ${_current_dir}/
-
- rm -rf ${_tmp}
-}
Deleted: bison26.patch
===================================================================
--- bison26.patch 2013-01-09 13:33:08 UTC (rev 174938)
+++ bison26.patch 2013-01-09 13:54:26 UTC (rev 174939)
@@ -1,515 +0,0 @@
-Index: Source/WebCore/ChangeLog
-===================================================================
---- Source/WebCore/ChangeLog (revision 124098)
-+++ Source/WebCore/ChangeLog (revision 124099)
-@@ -1,2 +1,27 @@
-+2012-07-30 Alexis Menard <alexis.menard at openbossa.org>
-+
-+ Build fix with newer bison 2.6.
-+ https://bugs.webkit.org/show_bug.cgi?id=92264
-+
-+ Reviewed by Adam Barth.
-+
-+ As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html
-+ YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS
-+ version I had access to as well as recent Linux runs at least version 2.3 so it's safe
-+ to use the replacement of these deprecated macros in favor of %lex-param and %parse-param.
-+ As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release
-+ of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore.
-+
-+ No new tests : build fix and the patch should not trigger any regressions
-+
-+ * css/CSSGrammar.y:
-+ * css/CSSParser.cpp:
-+ * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define.
-+ * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h
-+ therefore including this file within the namespace {} declarations leads to xpathyyparse being
-+ defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp
-+ (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs
-+ to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same.
-+
- 2012-07-30 Sadrul Habib Chowdhury <sadrul at chromium.org>
-
-Index: Source/WebCore/css/CSSParser.cpp
-===================================================================
---- Source/WebCore/css/CSSParser.cpp (revision 124098)
-+++ Source/WebCore/css/CSSParser.cpp (revision 124099)
-@@ -115,5 +115,5 @@
- #endif
-
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
-
- using namespace std;
-Index: Source/WebCore/css/CSSGrammar.y
-===================================================================
---- Source/WebCore/css/CSSGrammar.y (revision 124098)
-+++ Source/WebCore/css/CSSGrammar.y (revision 124099)
-@@ -54,11 +54,10 @@
- #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 {
-@@ -90,5 +89,5 @@
- %{
-
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
- return 1;
-Index: Source/WebCore/xml/XPathParser.cpp
-===================================================================
---- Source/WebCore/xml/XPathParser.cpp (revision 124098)
-+++ Source/WebCore/xml/XPathParser.cpp (revision 124099)
-@@ -33,22 +33,19 @@
- #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;
--
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
--
--#include "XPathGrammar.h"
-+using namespace XPath;
-+
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
-
- Parser* Parser::currentParser = 0;
--
-+
- enum XMLCat { NameStart, NameCont, NotPartOfName };
-
-@@ -631,4 +628,2 @@
- }
-
--}
--}
-Index: Source/WebCore/xml/XPathGrammar.y
-===================================================================
---- Source/WebCore/xml/XPathGrammar.y (revision 124098)
-+++ Source/WebCore/xml/XPathGrammar.y (revision 124099)
-@@ -35,4 +35,5 @@
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
-@@ -45,6 +46,4 @@
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
-
- using namespace WebCore;
-@@ -54,4 +53,5 @@
-
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
-
- %union
-@@ -72,5 +72,5 @@
-
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-
- %}
-@@ -119,5 +119,5 @@
- OrExpr
- {
-- PARSER->m_topExpr = $1;
-+ parser->m_topExpr = $1;
- }
- ;
-@@ -139,5 +139,5 @@
- {
- $$ = new LocationPath;
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- |
-@@ -151,5 +151,5 @@
- $$ = $2;
- $$->insertFirstStep($1);
-- PARSER->unregisterParseNode($1);
-+ parser->unregisterParseNode($1);
- }
- ;
-@@ -160,6 +160,6 @@
- $$ = new LocationPath;
- $$->appendStep($1);
-- PARSER->unregisterParseNode($1);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerParseNode($$);
- }
- |
-@@ -167,5 +167,5 @@
- {
- $$->appendStep($3);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($3);
- }
- |
-@@ -174,6 +174,6 @@
- $$->appendStep($2);
- $$->appendStep($3);
-- PARSER->unregisterParseNode($2);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($2);
-+ parser->unregisterParseNode($3);
- }
- ;
-@@ -184,9 +184,9 @@
- 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($$);
- }
- |
-@@ -195,6 +195,6 @@
- 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;
- }
-@@ -202,9 +202,9 @@
- 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($$);
- }
- |
-@@ -213,9 +213,9 @@
- 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($$);
- }
- |
-@@ -224,6 +224,6 @@
- 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;
- }
-@@ -231,9 +231,9 @@
- 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($$);
- }
- |
-@@ -260,6 +260,6 @@
- $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
-
-- PARSER->deleteString($1);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->registerNodeTest($$);
- }
- |
-@@ -267,6 +267,6 @@
- {
- $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
-- PARSER->deleteString($1);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->registerNodeTest($$);
- }
- |
-@@ -274,7 +274,7 @@
- {
- $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
-- PARSER->deleteString($1);
-- PARSER->deleteString($3);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->deleteString($3);
-+ parser->registerNodeTest($$);
- }
- ;
-@@ -294,6 +294,6 @@
- $$ = new Vector<Predicate*>;
- $$->append(new Predicate($1));
-- PARSER->unregisterParseNode($1);
-- PARSER->registerPredicateVector($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerPredicateVector($$);
- }
- |
-@@ -301,5 +301,5 @@
- {
- $$->append(new Predicate($2));
-- PARSER->unregisterParseNode($2);
-+ parser->unregisterParseNode($2);
- }
- ;
-@@ -316,5 +316,5 @@
- {
- $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- ;
-@@ -324,5 +324,5 @@
- {
- $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- |
-@@ -330,5 +330,5 @@
- {
- $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- ;
-@@ -338,6 +338,6 @@
- {
- $$ = new VariableReference(*$1);
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
-@@ -350,6 +350,6 @@
- {
- $$ = new StringExpression(*$1);
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
-@@ -357,6 +357,6 @@
- {
- $$ = new Number($1->toDouble());
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
-@@ -370,6 +370,6 @@
- if (!$$)
- YYABORT;
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
-@@ -379,7 +379,7 @@
- if (!$$)
- YYABORT;
-- PARSER->deleteString($1);
-- PARSER->deleteExpressionVector($3);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->deleteExpressionVector($3);
-+ parser->registerParseNode($$);
- }
- ;
-@@ -390,6 +390,6 @@
- $$ = new Vector<Expression*>;
- $$->append($1);
-- PARSER->unregisterParseNode($1);
-- PARSER->registerExpressionVector($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerExpressionVector($$);
- }
- |
-@@ -397,5 +397,5 @@
- {
- $$->append($3);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($3);
- }
- ;
-@@ -413,7 +413,7 @@
- $$->addSubExpression($1);
- $$->addSubExpression($3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-@@ -431,7 +431,7 @@
- $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($$);
- }
- |
-@@ -441,8 +441,8 @@
- $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($$);
- }
- ;
-@@ -454,7 +454,7 @@
- {
- $$ = new Filter($1, *$2);
-- PARSER->unregisterParseNode($1);
-- PARSER->deletePredicateVector($2);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->deletePredicateVector($2);
-+ parser->registerParseNode($$);
- }
- ;
-@@ -466,7 +466,7 @@
- {
- $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-@@ -478,7 +478,7 @@
- {
- $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-@@ -490,7 +490,7 @@
- {
- $$ = new EqTestOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-@@ -502,7 +502,7 @@
- {
- $$ = new EqTestOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-@@ -514,7 +514,7 @@
- {
- $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- |
-@@ -522,7 +522,7 @@
- {
- $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-@@ -534,7 +534,7 @@
- {
- $$ = new NumericOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-@@ -547,6 +547,6 @@
- $$ = new Negative;
- $$->addSubExpression($2);
-- PARSER->unregisterParseNode($2);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($2);
-+ parser->registerParseNode($$);
- }
- ;
Added: qwebview.patch
===================================================================
--- qwebview.patch (rev 0)
+++ qwebview.patch 2013-01-09 13:54:26 UTC (rev 174939)
@@ -0,0 +1,21 @@
+--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000
+@@ -1,3 +1,6 @@
++INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include
++LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib
++
+ CONFIG += designer
+ win32|mac: CONFIG+= debug_and_release
+ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
+--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000
++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000
+@@ -2,9 +2,4 @@
+ CONFIG += ordered
+
+ REQUIRES = !CONFIG(static,shared|static)
+-contains(QT_CONFIG, qt3support): SUBDIRS += widgets
+-win32: SUBDIRS += activeqt
+-# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
+ contains(QT_CONFIG, webkit): SUBDIRS += qwebview
+-contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
+-contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
Deleted: unsupported-gcc-flag.patch
===================================================================
--- unsupported-gcc-flag.patch 2013-01-09 13:33:08 UTC (rev 174938)
+++ unsupported-gcc-flag.patch 2013-01-09 13:54:26 UTC (rev 174939)
@@ -1,21 +0,0 @@
---- Source/common.pri~ 2012-09-14 08:08:32.428972687 +0000
-+++ Source/common.pri 2012-09-14 08:08:46.552205324 +0000
-@@ -3,12 +3,12 @@
- contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
- contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
-
--linux-g++ {
--isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
-- message(Using gold linker)
-- QMAKE_LFLAGS+=-fuse-ld=gold
--}
--}
-+#linux-g++ {
-+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
-+# message(Using gold linker)
-+# QMAKE_LFLAGS+=-fuse-ld=gold
-+#}
-+#}
-
- # We use this flag on production branches
- # See https://bugs.webkit.org/show_bug.cgi?id=60824
Added: use-python2.patch
===================================================================
--- use-python2.patch (rev 0)
+++ use-python2.patch 2013-01-09 13:54:26 UTC (rev 174939)
@@ -0,0 +1,57 @@
+--- webkit-qtwebkit-23/Source/JavaScriptCore/DerivedSources.pri~ 2013-01-09 11:29:16.452266719 +0000
++++ webkit-qtwebkit-23/Source/JavaScriptCore/DerivedSources.pri 2013-01-09 11:30:18.188538725 +0000
+@@ -85,14 +85,14 @@
+ retgen.output = RegExpJitTables.h
+ retgen.script = $$PWD/create_regex_tables
+ retgen.input = retgen.script
+-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT}
+ GENERATORS += retgen
+
+ #GENERATOR: "KeywordLookup.h": decision tree used by the lexer
+ klgen.output = KeywordLookup.h
+ klgen.script = $$PWD/KeywordLookupGenerator.py
+ klgen.input = KEYWORDLUT_FILES
+-klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
++klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
+ GENERATORS += klgen
+
+ EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION
+@@ -117,7 +117,7 @@
+ disassembler.input = DISASSEMBLER_FILES
+ disassembler.script = $$PWD/disassembler/udis86/itab.py
+ disassembler.depends = $$DISASSEMBLER_DEPENDENCY
+- disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
++ disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
+ disassembler.CONFIG += no_link
+ GENERATORS += disassembler
+ }
+--- webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri~ 2013-01-09 11:46:01.165612894 +0000
++++ webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri 2013-01-09 11:46:27.465404725 +0000
+@@ -779,7 +779,7 @@
+ inspectorValidate.output = InspectorProtocolVersion.h
+ inspectorValidate.input = INSPECTOR_JSON
+ inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version
+-inspectorValidate.commands = python $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
++inspectorValidate.commands = python2 $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+ inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version
+ inspectorValidate.add_output_to_sources = false
+ GENERATORS += inspectorValidate
+@@ -787,7 +787,7 @@
+ inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp
+ inspectorJSON.input = INSPECTOR_JSON
+ inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py
+-inspectorJSON.commands = python $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
++inspectorJSON.commands = python2 $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
+ inspectorJSON.depends = $$inspectorJSON.script
+ GENERATORS += inspectorJSON
+
+@@ -908,7 +908,7 @@
+ entities.output = HTMLEntityTable.cpp
+ entities.input = HTML_ENTITIES
+ entities.script = $$PWD/html/parser/create-html-entity-table
+-entities.commands = python $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES
++entities.commands = python2 $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES
+ entities.clean = ${QMAKE_FILE_OUT}
+ entities.depends = $$PWD/html/parser/create-html-entity-table
+ GENERATORS += entities
More information about the arch-commits
mailing list