[arch-commits] Commit in qtwebkit/repos (14 files)
Andrea Scarpino
andrea at archlinux.org
Tue Jan 15 20:30:20 UTC 2013
Date: Tuesday, January 15, 2013 @ 15:30:20
Author: andrea
Revision: 175164
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
qtwebkit/repos/testing-i686/PKGBUILD
(from rev 175163, qtwebkit/trunk/PKGBUILD)
qtwebkit/repos/testing-i686/enable-accelerated-compositing.patch
(from rev 175163, qtwebkit/trunk/enable-accelerated-compositing.patch)
qtwebkit/repos/testing-i686/qwebview.patch
(from rev 175163, qtwebkit/trunk/qwebview.patch)
qtwebkit/repos/testing-i686/use-python2.patch
(from rev 175163, qtwebkit/trunk/use-python2.patch)
qtwebkit/repos/testing-x86_64/PKGBUILD
(from rev 175163, qtwebkit/trunk/PKGBUILD)
qtwebkit/repos/testing-x86_64/enable-accelerated-compositing.patch
(from rev 175163, qtwebkit/trunk/enable-accelerated-compositing.patch)
qtwebkit/repos/testing-x86_64/qwebview.patch
(from rev 175163, qtwebkit/trunk/qwebview.patch)
qtwebkit/repos/testing-x86_64/use-python2.patch
(from rev 175163, qtwebkit/trunk/use-python2.patch)
Deleted:
qtwebkit/repos/testing-i686/PKGBUILD
qtwebkit/repos/testing-i686/qwebview.patch
qtwebkit/repos/testing-i686/use-python2.patch
qtwebkit/repos/testing-x86_64/PKGBUILD
qtwebkit/repos/testing-x86_64/qwebview.patch
qtwebkit/repos/testing-x86_64/use-python2.patch
-----------------------------------------------------+
testing-i686/PKGBUILD | 111 +++++++++--------
testing-i686/enable-accelerated-compositing.patch | 11 +
testing-i686/qwebview.patch | 42 +++---
testing-i686/use-python2.patch | 114 +++++++++---------
testing-x86_64/PKGBUILD | 111 +++++++++--------
testing-x86_64/enable-accelerated-compositing.patch | 11 +
testing-x86_64/qwebview.patch | 42 +++---
testing-x86_64/use-python2.patch | 114 +++++++++---------
8 files changed, 294 insertions(+), 262 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-01-15 19:02:29 UTC (rev 175163)
+++ testing-i686/PKGBUILD 2013-01-15 20:30:20 UTC (rev 175164)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qtwebkit
-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' 'systemd' 'gstreamer0.10-base')
-makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
-conflicts=('qt<4.8')
-_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 webkit-qtwebkit-23
-
- patch -p1 -i "${srcdir}"/use-python2.patch
-
- export QTDIR=/usr
- Tools/Scripts/build-webkit --qt \
- --makeargs="${MAKEFLAGS}" \
- --prefix=/usr \
- --no-webkit2
-
- cd ../
-
- # Build the QWebView plugin (FS#27914)
- cd qt-everywhere-opensource-src-${_qtver}
- patch -p1 -i "${srcdir}"/qwebview.patch
- cd tools/designer/src/plugins/qwebview
- qmake
- make
-}
-
-package() {
- cd webkit-qtwebkit-23
- make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
-
- cd ../
-
- cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${pkgdir}" install
-}
Copied: qtwebkit/repos/testing-i686/PKGBUILD (from rev 175163, qtwebkit/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-01-15 20:30:20 UTC (rev 175164)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qtwebkit
+pkgver=2.3git20130115
+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' 'systemd' 'gstreamer0.10-base')
+makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
+conflicts=('qt<4.8')
+_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'
+ 'enable-accelerated-compositing.patch')
+sha1sums=('8d74fdb4354d1f1b4f3df0ec7b057a7516350372'
+ 'f5880f11c139d7d8d01ecb8d874535f7d9553198'
+ '315b6ff603f35e5492a036f7082f6aa075dfb607'
+ 'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f'
+ '471032229c61a0f95e142c21370aab6d3f00ff7e')
+
+build() {
+ cd webkit-qtwebkit-23
+
+ patch -p1 -i "${srcdir}"/use-python2.patch
+
+ # Fixed upstream, https://bugs.webkit.org/show_bug.cgi?id=106892
+ patch -p1 -i "${srcdir}"/enable-accelerated-compositing.patch
+
+ export QTDIR=/usr
+ Tools/Scripts/build-webkit --qt \
+ --makeargs="${MAKEFLAGS}" \
+ --prefix=/usr \
+ --no-webkit2
+
+ cd ../
+
+ # Build the QWebView plugin (FS#27914)
+ cd qt-everywhere-opensource-src-${_qtver}
+ patch -p1 -i "${srcdir}"/qwebview.patch
+ cd tools/designer/src/plugins/qwebview
+ qmake
+ make
+}
+
+package() {
+ cd webkit-qtwebkit-23
+ make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
+
+ cd ../
+
+ cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
+ make INSTALL_ROOT="${pkgdir}" install
+}
Copied: qtwebkit/repos/testing-i686/enable-accelerated-compositing.patch (from rev 175163, qtwebkit/trunk/enable-accelerated-compositing.patch)
===================================================================
--- testing-i686/enable-accelerated-compositing.patch (rev 0)
+++ testing-i686/enable-accelerated-compositing.patch 2013-01-15 20:30:20 UTC (rev 175164)
@@ -0,0 +1,11 @@
+Index: trunk/Source/WebCore/html/HTMLCanvasElement.cpp
+===================================================================
+--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139541)
++++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139742)
+@@ -190,5 +190,5 @@
+ Settings* settings = document()->settings();
+ if (settings && settings->webGLEnabled()
+-#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL)
++#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT)
+ && settings->acceleratedCompositingEnabled()
+ #endif
Deleted: testing-i686/qwebview.patch
===================================================================
--- testing-i686/qwebview.patch 2013-01-15 19:02:29 UTC (rev 175163)
+++ testing-i686/qwebview.patch 2013-01-15 20:30:20 UTC (rev 175164)
@@ -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 += ../../../../../../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
Copied: qtwebkit/repos/testing-i686/qwebview.patch (from rev 175163, qtwebkit/trunk/qwebview.patch)
===================================================================
--- testing-i686/qwebview.patch (rev 0)
+++ testing-i686/qwebview.patch 2013-01-15 20:30:20 UTC (rev 175164)
@@ -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: testing-i686/use-python2.patch
===================================================================
--- testing-i686/use-python2.patch 2013-01-15 19:02:29 UTC (rev 175163)
+++ testing-i686/use-python2.patch 2013-01-15 20:30:20 UTC (rev 175164)
@@ -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/testing-i686/use-python2.patch (from rev 175163, qtwebkit/trunk/use-python2.patch)
===================================================================
--- testing-i686/use-python2.patch (rev 0)
+++ testing-i686/use-python2.patch 2013-01-15 20:30:20 UTC (rev 175164)
@@ -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: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-01-15 19:02:29 UTC (rev 175163)
+++ testing-x86_64/PKGBUILD 2013-01-15 20:30:20 UTC (rev 175164)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qtwebkit
-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' 'systemd' 'gstreamer0.10-base')
-makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
-conflicts=('qt<4.8')
-_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 webkit-qtwebkit-23
-
- patch -p1 -i "${srcdir}"/use-python2.patch
-
- export QTDIR=/usr
- Tools/Scripts/build-webkit --qt \
- --makeargs="${MAKEFLAGS}" \
- --prefix=/usr \
- --no-webkit2
-
- cd ../
-
- # Build the QWebView plugin (FS#27914)
- cd qt-everywhere-opensource-src-${_qtver}
- patch -p1 -i "${srcdir}"/qwebview.patch
- cd tools/designer/src/plugins/qwebview
- qmake
- make
-}
-
-package() {
- cd webkit-qtwebkit-23
- make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
-
- cd ../
-
- cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${pkgdir}" install
-}
Copied: qtwebkit/repos/testing-x86_64/PKGBUILD (from rev 175163, qtwebkit/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-01-15 20:30:20 UTC (rev 175164)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qtwebkit
+pkgver=2.3git20130115
+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' 'systemd' 'gstreamer0.10-base')
+makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
+conflicts=('qt<4.8')
+_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'
+ 'enable-accelerated-compositing.patch')
+sha1sums=('8d74fdb4354d1f1b4f3df0ec7b057a7516350372'
+ 'f5880f11c139d7d8d01ecb8d874535f7d9553198'
+ '315b6ff603f35e5492a036f7082f6aa075dfb607'
+ 'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f'
+ '471032229c61a0f95e142c21370aab6d3f00ff7e')
+
+build() {
+ cd webkit-qtwebkit-23
+
+ patch -p1 -i "${srcdir}"/use-python2.patch
+
+ # Fixed upstream, https://bugs.webkit.org/show_bug.cgi?id=106892
+ patch -p1 -i "${srcdir}"/enable-accelerated-compositing.patch
+
+ export QTDIR=/usr
+ Tools/Scripts/build-webkit --qt \
+ --makeargs="${MAKEFLAGS}" \
+ --prefix=/usr \
+ --no-webkit2
+
+ cd ../
+
+ # Build the QWebView plugin (FS#27914)
+ cd qt-everywhere-opensource-src-${_qtver}
+ patch -p1 -i "${srcdir}"/qwebview.patch
+ cd tools/designer/src/plugins/qwebview
+ qmake
+ make
+}
+
+package() {
+ cd webkit-qtwebkit-23
+ make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
+
+ cd ../
+
+ cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
+ make INSTALL_ROOT="${pkgdir}" install
+}
Copied: qtwebkit/repos/testing-x86_64/enable-accelerated-compositing.patch (from rev 175163, qtwebkit/trunk/enable-accelerated-compositing.patch)
===================================================================
--- testing-x86_64/enable-accelerated-compositing.patch (rev 0)
+++ testing-x86_64/enable-accelerated-compositing.patch 2013-01-15 20:30:20 UTC (rev 175164)
@@ -0,0 +1,11 @@
+Index: trunk/Source/WebCore/html/HTMLCanvasElement.cpp
+===================================================================
+--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139541)
++++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139742)
+@@ -190,5 +190,5 @@
+ Settings* settings = document()->settings();
+ if (settings && settings->webGLEnabled()
+-#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL)
++#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT)
+ && settings->acceleratedCompositingEnabled()
+ #endif
Deleted: testing-x86_64/qwebview.patch
===================================================================
--- testing-x86_64/qwebview.patch 2013-01-15 19:02:29 UTC (rev 175163)
+++ testing-x86_64/qwebview.patch 2013-01-15 20:30:20 UTC (rev 175164)
@@ -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 += ../../../../../../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
Copied: qtwebkit/repos/testing-x86_64/qwebview.patch (from rev 175163, qtwebkit/trunk/qwebview.patch)
===================================================================
--- testing-x86_64/qwebview.patch (rev 0)
+++ testing-x86_64/qwebview.patch 2013-01-15 20:30:20 UTC (rev 175164)
@@ -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: testing-x86_64/use-python2.patch
===================================================================
--- testing-x86_64/use-python2.patch 2013-01-15 19:02:29 UTC (rev 175163)
+++ testing-x86_64/use-python2.patch 2013-01-15 20:30:20 UTC (rev 175164)
@@ -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/testing-x86_64/use-python2.patch (from rev 175163, qtwebkit/trunk/use-python2.patch)
===================================================================
--- testing-x86_64/use-python2.patch (rev 0)
+++ testing-x86_64/use-python2.patch 2013-01-15 20:30:20 UTC (rev 175164)
@@ -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