[arch-commits] Commit in qtwebkit/repos (16 files)
Andrea Scarpino
andrea at archlinux.org
Fri Sep 26 12:01:31 UTC 2014
Date: Friday, September 26, 2014 @ 14:01:31
Author: andrea
Revision: 223174
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
qtwebkit/repos/extra-i686/PKGBUILD
(from rev 223173, qtwebkit/trunk/PKGBUILD)
qtwebkit/repos/extra-i686/qwebview.patch
(from rev 223173, qtwebkit/trunk/qwebview.patch)
qtwebkit/repos/extra-i686/use-python2.patch
(from rev 223173, qtwebkit/trunk/use-python2.patch)
qtwebkit/repos/extra-x86_64/PKGBUILD
(from rev 223173, qtwebkit/trunk/PKGBUILD)
qtwebkit/repos/extra-x86_64/qwebview.patch
(from rev 223173, qtwebkit/trunk/qwebview.patch)
qtwebkit/repos/extra-x86_64/use-python2.patch
(from rev 223173, qtwebkit/trunk/use-python2.patch)
Deleted:
qtwebkit/repos/extra-i686/PKGBUILD
qtwebkit/repos/extra-i686/bison3.patch
qtwebkit/repos/extra-i686/gst-1.patch
qtwebkit/repos/extra-i686/qwebview.patch
qtwebkit/repos/extra-i686/use-python2.patch
qtwebkit/repos/extra-x86_64/PKGBUILD
qtwebkit/repos/extra-x86_64/bison3.patch
qtwebkit/repos/extra-x86_64/gst-1.patch
qtwebkit/repos/extra-x86_64/qwebview.patch
qtwebkit/repos/extra-x86_64/use-python2.patch
--------------------------------+
/PKGBUILD | 132 +++++++++++++++++++++++++++++++++++++++
/qwebview.patch | 42 ++++++++++++
/use-python2.patch | 114 +++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 66 -------------------
extra-i686/bison3.patch | 38 -----------
extra-i686/gst-1.patch | 65 -------------------
extra-i686/qwebview.patch | 21 ------
extra-i686/use-python2.patch | 57 ----------------
extra-x86_64/PKGBUILD | 66 -------------------
extra-x86_64/bison3.patch | 38 -----------
extra-x86_64/gst-1.patch | 65 -------------------
extra-x86_64/qwebview.patch | 21 ------
extra-x86_64/use-python2.patch | 57 ----------------
13 files changed, 288 insertions(+), 494 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-09-26 12:01:22 UTC (rev 223173)
+++ extra-i686/PKGBUILD 2014-09-26 12:01:31 UTC (rev 223174)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qtwebkit
-pkgver=2.3.3
-pkgrel=2
-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=('qt4' 'systemd' 'gst-plugins-base-libs')
-makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
-conflicts=('qt<4.8')
-_qtver=4.8.6
-source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- "http://download.qt-project.org/official_releases/qt/4.8/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
- 'use-python2.patch'
- 'bison3.patch'
- 'qwebview.patch'
- 'gst-1.patch')
-sha1sums=('64f3ab7f8e53b5b971a3a6577fc61db0cc2ea31f'
- 'ddf9c20ca8309a116e0466c42984238009525da6'
- '315b6ff603f35e5492a036f7082f6aa075dfb607'
- 'd2c6182512e4bcbdf30a9e9d513c52fe4b16d9f2'
- '88ed73e6bd7ea9c6d227ceaed0ff2f1cf0200667'
- '4b4ce9465ea9b107de7a93ce57afce43a2a1877f')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/use-python2.patch
- patch -p1 -i "${srcdir}"/bison3.patch
- patch -p1 -i "${srcdir}"/gst-1.patch
-
- cd ../qt-everywhere-opensource-src-${_qtver}
- patch -p1 -i "${srcdir}"/qwebview.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- OPTS="--no-webkit2"
- if [ "${CARCH}" = "i686" ]; then
- # FS#33418
- OPTS="${OPTS} --no-force-sse2"
- fi
-
- export QTDIR=/usr
- export PATH="/usr/lib/qt4/bin:$PATH"
- Tools/Scripts/build-webkit --qt \
- --makeargs="${MAKEFLAGS}" \
- --prefix=/usr \
- ${OPTS}
-
- # Build the QWebView plugin (FS#27914)
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- qmake-qt4
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
-
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${pkgdir}" install
-}
Copied: qtwebkit/repos/extra-i686/PKGBUILD (from rev 223173, qtwebkit/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-09-26 12:01:31 UTC (rev 223174)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qtwebkit
+pkgver=2.3.4
+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=('qt4' 'systemd' 'gst-plugins-base-libs')
+makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
+conflicts=('qt<4.8')
+_qtver=4.8.6
+source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+ "http://download.qt-project.org/official_releases/qt/4.8/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
+ 'use-python2.patch'
+ 'qwebview.patch')
+sha1sums=('31bc60de1cf26bb0766d539b4d564651ddbb0650'
+ 'ddf9c20ca8309a116e0466c42984238009525da6'
+ '315b6ff603f35e5492a036f7082f6aa075dfb607'
+ 'c3df6107233f466a032e36681cee07f16536657c')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/use-python2.patch
+
+ cd ../qt-everywhere-opensource-src-${_qtver}
+ patch -p1 -i "${srcdir}"/qwebview.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ OPTS="--no-webkit2"
+ if [ "${CARCH}" = "i686" ]; then
+ # FS#33418
+ OPTS="${OPTS} --no-force-sse2"
+ fi
+
+ export QTDIR=/usr
+ export PATH="/usr/lib/qt4/bin:$PATH"
+ Tools/Scripts/build-webkit --qt \
+ --makeargs="${MAKEFLAGS}" \
+ --prefix=/usr \
+ ${OPTS}
+
+ # Build the QWebView plugin (FS#27914)
+ cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
+ qmake-qt4
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
+
+ cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
+ make INSTALL_ROOT="${pkgdir}" install
+
+ # Fix wrong libs path in pkgconfig file
+ perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/QtWebKit.pc
+
+ # Fix wrong path in prl file
+ sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' "${pkgdir}"/usr/lib/libQtWebKit.prl
+}
Deleted: extra-i686/bison3.patch
===================================================================
--- extra-i686/bison3.patch 2014-09-26 12:01:22 UTC (rev 223173)
+++ extra-i686/bison3.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -1,38 +0,0 @@
-From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen at digia.com>
-Date: Fri, 16 Aug 2013 18:27:07 +0200
-Subject: [PATCH] ANGLE doesn't build with bison 3.0
-
-https://bugs.webkit.org/show_bug.cgi?id=119798
-
-Reviewed by Antti Koivisto.
-
-Make glslang.y compatible with bison 3.0
-by using %lex-param to set YYLEX_PARAM.
-
-* src/compiler/glslang.y:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-Task-number: QTBUG-32913
-Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
-Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte at digia.com>
----
- Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-index 3cad335..b41e95a 100644
---- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {YYLEX_PARAM}
-
- %union {
- struct {
---
-1.7.1
-
Deleted: extra-i686/gst-1.patch
===================================================================
--- extra-i686/gst-1.patch 2014-09-26 12:01:22 UTC (rev 223173)
+++ extra-i686/gst-1.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -1,65 +0,0 @@
-diff -urNB webkit-qtwebkit-23/Source/WebCore/WebCore.pri new/Source/WebCore/WebCore.pri
---- webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-15 16:46:12.000000000 +0100
-+++ new/Source/WebCore/WebCore.pri 2013-02-21 15:46:00.298855975 +0100
-@@ -197,8 +197,10 @@
-
- contains(DEFINES, WTF_USE_GSTREAMER=1) {
- DEFINES += ENABLE_GLIB_SUPPORT=1
-- PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
--}
-+ DEFINES += GST_API_VERSION=1.0
-+ DEFINES += GST_API_VERSION_1
-+ PKGCONFIG += glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-base-1.0 gstreamer-pbutils-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 gstreamer-audio-1.0
-+ }
-
- contains(DEFINES, ENABLE_VIDEO=1) {
- contains(DEFINES, WTF_USE_QTKIT=1) {
-@@ -233,7 +235,7 @@
- contains(DEFINES, WTF_USE_GSTREAMER=1) {
- DEFINES += WTF_USE_WEBAUDIO_GSTREAMER=1
- INCLUDEPATH += $$SOURCE_DIR/platform/audio/gstreamer
-- PKGCONFIG += gstreamer-audio-0.10 gstreamer-fft-0.10
-+ PKGCONFIG += gstreamer-audio-1.0 gstreamer-fft-1.0
- }
- }
-
-diff -urNB webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h new/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
---- webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2013-02-15 16:46:12.000000000 +0100
-+++ new/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2013-02-21 15:46:00.298855975 +0100
-@@ -157,7 +157,7 @@
- virtual void needTouchEvents(bool) { }
- #endif
-
--#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
-+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && !defined(GST_API_VERSION_1)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
- virtual bool supportsFullscreenForNode(const Node*);
- virtual void enterFullscreenForNode(Node*);
- virtual void exitFullscreenForNode(Node*);
-diff -urNB webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h new/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
---- webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h 2013-02-15 16:46:12.000000000 +0100
-+++ new/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h 2013-02-21 15:52:57.400847675 +0100
-@@ -106,10 +106,10 @@
- private:
- ChromeClientQt* m_chromeClient;
- HTMLVideoElement* m_videoElement;
--#if USE(QT_MULTIMEDIA)
-+#if USE(QT_MULTIMEDIA) && !defined(GST_API_VERSION_1)
- QWebFullScreenVideoHandler* m_FullScreenVideoHandler;
- #endif
--#if USE(GSTREAMER)
-+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
- GStreamerFullScreenVideoHandler* m_FullScreenVideoHandlerGStreamer;
- #endif
- #if USE(QTKIT)
-diff -urNB webkit-qtwebkit-23/Tools/qmake/mkspecs/features/features.prf new/Tools/qmake/mkspecs/features/features.prf
---- webkit-qtwebkit-23/Tools/qmake/mkspecs/features/features.prf 2013-02-15 16:46:12.000000000 +0100
-+++ new/Tools/qmake/mkspecs/features/features.prf 2013-02-21 15:46:00.297855972 +0100
-@@ -186,7 +186,7 @@
- DEFINES += WTF_USE_QTKIT=1
- }
- } else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
-- !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'): {
-+ !contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
- DEFINES += ENABLE_VIDEO=1
- DEFINES += WTF_USE_GSTREAMER=1
- } else {
Deleted: extra-i686/qwebview.patch
===================================================================
--- extra-i686/qwebview.patch 2014-09-26 12:01:22 UTC (rev 223173)
+++ extra-i686/qwebview.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -1,21 +0,0 @@
---- 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 += ../../../../../../qtwebkit-2.3.3/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.3/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
Copied: qtwebkit/repos/extra-i686/qwebview.patch (from rev 223173, qtwebkit/trunk/qwebview.patch)
===================================================================
--- extra-i686/qwebview.patch (rev 0)
+++ extra-i686/qwebview.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -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 += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
++LIBS += -L../../../../../../qtwebkit-2.3.4/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: extra-i686/use-python2.patch
===================================================================
--- extra-i686/use-python2.patch 2014-09-26 12:01:22 UTC (rev 223173)
+++ extra-i686/use-python2.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -1,57 +0,0 @@
---- 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
Copied: qtwebkit/repos/extra-i686/use-python2.patch (from rev 223173, qtwebkit/trunk/use-python2.patch)
===================================================================
--- extra-i686/use-python2.patch (rev 0)
+++ extra-i686/use-python2.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-09-26 12:01:22 UTC (rev 223173)
+++ extra-x86_64/PKGBUILD 2014-09-26 12:01:31 UTC (rev 223174)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qtwebkit
-pkgver=2.3.3
-pkgrel=2
-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=('qt4' 'systemd' 'gst-plugins-base-libs')
-makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
-conflicts=('qt<4.8')
-_qtver=4.8.6
-source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- "http://download.qt-project.org/official_releases/qt/4.8/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
- 'use-python2.patch'
- 'bison3.patch'
- 'qwebview.patch'
- 'gst-1.patch')
-sha1sums=('64f3ab7f8e53b5b971a3a6577fc61db0cc2ea31f'
- 'ddf9c20ca8309a116e0466c42984238009525da6'
- '315b6ff603f35e5492a036f7082f6aa075dfb607'
- 'd2c6182512e4bcbdf30a9e9d513c52fe4b16d9f2'
- '88ed73e6bd7ea9c6d227ceaed0ff2f1cf0200667'
- '4b4ce9465ea9b107de7a93ce57afce43a2a1877f')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/use-python2.patch
- patch -p1 -i "${srcdir}"/bison3.patch
- patch -p1 -i "${srcdir}"/gst-1.patch
-
- cd ../qt-everywhere-opensource-src-${_qtver}
- patch -p1 -i "${srcdir}"/qwebview.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- OPTS="--no-webkit2"
- if [ "${CARCH}" = "i686" ]; then
- # FS#33418
- OPTS="${OPTS} --no-force-sse2"
- fi
-
- export QTDIR=/usr
- export PATH="/usr/lib/qt4/bin:$PATH"
- Tools/Scripts/build-webkit --qt \
- --makeargs="${MAKEFLAGS}" \
- --prefix=/usr \
- ${OPTS}
-
- # Build the QWebView plugin (FS#27914)
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- qmake-qt4
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
-
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${pkgdir}" install
-}
Copied: qtwebkit/repos/extra-x86_64/PKGBUILD (from rev 223173, qtwebkit/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-09-26 12:01:31 UTC (rev 223174)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qtwebkit
+pkgver=2.3.4
+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=('qt4' 'systemd' 'gst-plugins-base-libs')
+makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
+conflicts=('qt<4.8')
+_qtver=4.8.6
+source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+ "http://download.qt-project.org/official_releases/qt/4.8/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
+ 'use-python2.patch'
+ 'qwebview.patch')
+sha1sums=('31bc60de1cf26bb0766d539b4d564651ddbb0650'
+ 'ddf9c20ca8309a116e0466c42984238009525da6'
+ '315b6ff603f35e5492a036f7082f6aa075dfb607'
+ 'c3df6107233f466a032e36681cee07f16536657c')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/use-python2.patch
+
+ cd ../qt-everywhere-opensource-src-${_qtver}
+ patch -p1 -i "${srcdir}"/qwebview.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ OPTS="--no-webkit2"
+ if [ "${CARCH}" = "i686" ]; then
+ # FS#33418
+ OPTS="${OPTS} --no-force-sse2"
+ fi
+
+ export QTDIR=/usr
+ export PATH="/usr/lib/qt4/bin:$PATH"
+ Tools/Scripts/build-webkit --qt \
+ --makeargs="${MAKEFLAGS}" \
+ --prefix=/usr \
+ ${OPTS}
+
+ # Build the QWebView plugin (FS#27914)
+ cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
+ qmake-qt4
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
+
+ cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
+ make INSTALL_ROOT="${pkgdir}" install
+
+ # Fix wrong libs path in pkgconfig file
+ perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/QtWebKit.pc
+
+ # Fix wrong path in prl file
+ sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' "${pkgdir}"/usr/lib/libQtWebKit.prl
+}
Deleted: extra-x86_64/bison3.patch
===================================================================
--- extra-x86_64/bison3.patch 2014-09-26 12:01:22 UTC (rev 223173)
+++ extra-x86_64/bison3.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -1,38 +0,0 @@
-From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen at digia.com>
-Date: Fri, 16 Aug 2013 18:27:07 +0200
-Subject: [PATCH] ANGLE doesn't build with bison 3.0
-
-https://bugs.webkit.org/show_bug.cgi?id=119798
-
-Reviewed by Antti Koivisto.
-
-Make glslang.y compatible with bison 3.0
-by using %lex-param to set YYLEX_PARAM.
-
-* src/compiler/glslang.y:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-Task-number: QTBUG-32913
-Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
-Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte at digia.com>
----
- Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-index 3cad335..b41e95a 100644
---- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {YYLEX_PARAM}
-
- %union {
- struct {
---
-1.7.1
-
Deleted: extra-x86_64/gst-1.patch
===================================================================
--- extra-x86_64/gst-1.patch 2014-09-26 12:01:22 UTC (rev 223173)
+++ extra-x86_64/gst-1.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -1,65 +0,0 @@
-diff -urNB webkit-qtwebkit-23/Source/WebCore/WebCore.pri new/Source/WebCore/WebCore.pri
---- webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-15 16:46:12.000000000 +0100
-+++ new/Source/WebCore/WebCore.pri 2013-02-21 15:46:00.298855975 +0100
-@@ -197,8 +197,10 @@
-
- contains(DEFINES, WTF_USE_GSTREAMER=1) {
- DEFINES += ENABLE_GLIB_SUPPORT=1
-- PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
--}
-+ DEFINES += GST_API_VERSION=1.0
-+ DEFINES += GST_API_VERSION_1
-+ PKGCONFIG += glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-base-1.0 gstreamer-pbutils-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 gstreamer-audio-1.0
-+ }
-
- contains(DEFINES, ENABLE_VIDEO=1) {
- contains(DEFINES, WTF_USE_QTKIT=1) {
-@@ -233,7 +235,7 @@
- contains(DEFINES, WTF_USE_GSTREAMER=1) {
- DEFINES += WTF_USE_WEBAUDIO_GSTREAMER=1
- INCLUDEPATH += $$SOURCE_DIR/platform/audio/gstreamer
-- PKGCONFIG += gstreamer-audio-0.10 gstreamer-fft-0.10
-+ PKGCONFIG += gstreamer-audio-1.0 gstreamer-fft-1.0
- }
- }
-
-diff -urNB webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h new/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
---- webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2013-02-15 16:46:12.000000000 +0100
-+++ new/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2013-02-21 15:46:00.298855975 +0100
-@@ -157,7 +157,7 @@
- virtual void needTouchEvents(bool) { }
- #endif
-
--#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
-+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && !defined(GST_API_VERSION_1)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
- virtual bool supportsFullscreenForNode(const Node*);
- virtual void enterFullscreenForNode(Node*);
- virtual void exitFullscreenForNode(Node*);
-diff -urNB webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h new/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
---- webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h 2013-02-15 16:46:12.000000000 +0100
-+++ new/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h 2013-02-21 15:52:57.400847675 +0100
-@@ -106,10 +106,10 @@
- private:
- ChromeClientQt* m_chromeClient;
- HTMLVideoElement* m_videoElement;
--#if USE(QT_MULTIMEDIA)
-+#if USE(QT_MULTIMEDIA) && !defined(GST_API_VERSION_1)
- QWebFullScreenVideoHandler* m_FullScreenVideoHandler;
- #endif
--#if USE(GSTREAMER)
-+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
- GStreamerFullScreenVideoHandler* m_FullScreenVideoHandlerGStreamer;
- #endif
- #if USE(QTKIT)
-diff -urNB webkit-qtwebkit-23/Tools/qmake/mkspecs/features/features.prf new/Tools/qmake/mkspecs/features/features.prf
---- webkit-qtwebkit-23/Tools/qmake/mkspecs/features/features.prf 2013-02-15 16:46:12.000000000 +0100
-+++ new/Tools/qmake/mkspecs/features/features.prf 2013-02-21 15:46:00.297855972 +0100
-@@ -186,7 +186,7 @@
- DEFINES += WTF_USE_QTKIT=1
- }
- } else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
-- !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'): {
-+ !contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
- DEFINES += ENABLE_VIDEO=1
- DEFINES += WTF_USE_GSTREAMER=1
- } else {
Deleted: extra-x86_64/qwebview.patch
===================================================================
--- extra-x86_64/qwebview.patch 2014-09-26 12:01:22 UTC (rev 223173)
+++ extra-x86_64/qwebview.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -1,21 +0,0 @@
---- 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 += ../../../../../../qtwebkit-2.3.3/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.3/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
Copied: qtwebkit/repos/extra-x86_64/qwebview.patch (from rev 223173, qtwebkit/trunk/qwebview.patch)
===================================================================
--- extra-x86_64/qwebview.patch (rev 0)
+++ extra-x86_64/qwebview.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -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 += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
++LIBS += -L../../../../../../qtwebkit-2.3.4/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: extra-x86_64/use-python2.patch
===================================================================
--- extra-x86_64/use-python2.patch 2014-09-26 12:01:22 UTC (rev 223173)
+++ extra-x86_64/use-python2.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -1,57 +0,0 @@
---- 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
Copied: qtwebkit/repos/extra-x86_64/use-python2.patch (from rev 223173, qtwebkit/trunk/use-python2.patch)
===================================================================
--- extra-x86_64/use-python2.patch (rev 0)
+++ extra-x86_64/use-python2.patch 2014-09-26 12:01:31 UTC (rev 223174)
@@ -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