[arch-commits] Commit in qt/kde-unstable (PKGBUILD use-python2.patch)
Andrea Scarpino
andrea at nymeria.archlinux.org
Sun Feb 10 15:13:14 UTC 2013
Date: Sunday, February 10, 2013 @ 16:13:14
Author: andrea
Revision: 177895
Bump version; ship qtwebkit from the same tarball
Modified:
qt/kde-unstable/PKGBUILD
qt/kde-unstable/use-python2.patch
-------------------+
PKGBUILD | 54 +++++++++++++++++++-----------------
use-python2.patch | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 105 insertions(+), 25 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-02-10 14:55:58 UTC (rev 177894)
+++ PKGBUILD 2013-02-10 15:13:14 UTC (rev 177895)
@@ -7,8 +7,9 @@
pkgname=('qtbase'
'qtdeclarative'
'qtmultimedia'
+ 'qt-addons'
'qttools'
- 'qt-addons')
+ 'qtwebkit')
pkgver=5.0.1
pkgrel=1
arch=('i686' 'x86_64')
@@ -18,7 +19,7 @@
'mesa' 'libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc' 'libfbclient'
- 'python2' 'ruby')
+ 'python2' 'ruby' 'gperf')
groups=('qt5')
options=('!libtool')
_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
@@ -29,7 +30,7 @@
'f1837a03fd0ebbd2da58975845f278e3'
'480fea1ed076992b688373c8db274be0'
'5595c24d5bb942c21e3a4d299e6d0bf1'
- 'cbbb52e740308bd7e431418160c781bf')
+ 'ec3133b093550f16a21bb91e5f0f2943')
build() {
cd ${_pkgfqn}
@@ -43,6 +44,9 @@
# Use python2 for Python 2.x
patch -p1 -i "${srcdir}"/use-python2.patch
+ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ $(find . -name '*.py')
./configure -confirm-license -opensource \
-prefix /usr \
@@ -80,12 +84,11 @@
cd ${_pkgfqn}/qtbase
make INSTALL_ROOT="${pkgdir}" install
- cd ../..
- cd ${_pkgfqn}/qttranslations
+ cd ../../${_pkgfqn}/qttranslations
make INSTALL_ROOT="${pkgdir}" install
- cd ../..
+ cd "${srcdir}"
install -p -D -m644 ${_pkgfqn}/qtbase/src/widgets/dialogs/images/qtlogo-64.png \
"${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
@@ -99,7 +102,7 @@
package_qtdeclarative() {
pkgdesc=('A cross-platform application and UI framework (Qt QML)')
- depends=('qt-addons')
+ depends=('qtbase' 'qt-addons')
conflicts=('qt' 'qt-private-headers')
cd ${_pkgfqn}/qtdeclarative
@@ -112,7 +115,7 @@
package_qtmultimedia() {
pkgdesc=('A cross-platform application and UI framework (Qt Multimedia)')
- depends=('libpulse' 'gstreamer0.10-base' 'qtdeclarative')
+ depends=('qtbase' 'libpulse' 'gstreamer0.10-base' 'qtdeclarative')
cd ${_pkgfqn}/qtmultimedia
make INSTALL_ROOT="${pkgdir}" install
@@ -124,37 +127,30 @@
package_qt-addons() {
pkgdesc=('A cross-platform application and UI framework (Qt Add-ons Modules)')
- depends=('qtbase' 'libtiff')
+ depends=('qtbase' 'qtwebkit' 'libtiff')
conflicts=('qt')
cd ${_pkgfqn}/qtgraphicaleffects
make INSTALL_ROOT="${pkgdir}" install
- cd ../..
- cd ${_pkgfqn}/qtimageformats
- make INSTALL_ROOT="${pkgdir}" install
- cd ../..
+ cd ../../${_pkgfqn}/qtimageformats
+ make INSTALL_ROOT="${pkgdir}" install
- cd ${_pkgfqn}/qtjsbackend
+ cd ../../${_pkgfqn}/qtjsbackend
make INSTALL_ROOT="${pkgdir}" install
- cd ../..
- cd ${_pkgfqn}/qtquick1
+ cd ../../${_pkgfqn}/qtquick1
make INSTALL_ROOT="${pkgdir}" install
- cd ../..
- cd ${_pkgfqn}/qtscript
+ cd ../../${_pkgfqn}/qtscript
make INSTALL_ROOT="${pkgdir}" install
- cd ../..
- cd ${_pkgfqn}/qtsvg
+ cd ../../${_pkgfqn}/qtsvg
make INSTALL_ROOT="${pkgdir}" install
- cd ../..
- cd ${_pkgfqn}/qtxmlpatterns
+ cd ../../${_pkgfqn}/qtxmlpatterns
make INSTALL_ROOT="${pkgdir}" install
- cd ../..
-
+
# Fix wrong path in prl files
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
@@ -162,7 +158,7 @@
package_qttools() {
pkgdesc=('A cross-platform application and UI framework (Development Tools)')
- depends=('qtbase' 'desktop-file-utils')
+ depends=('qtbase' 'qtwebkit' 'desktop-file-utils')
optdepends=('qt-doc: documentation')
conflicts=('qt')
install='qttools.install'
@@ -191,3 +187,11 @@
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
}
+
+package_qtwebkit() {
+ pkgdesc=('An open source web browser engine (Qt port of WebKit)')
+ depends=('qtbase' 'qtdeclarative' 'gstreamer0.10-base' 'icu')
+
+ cd ${_pkgfqn}/qtwebkit
+ make INSTALL_ROOT="${pkgdir}" install
+}
Modified: use-python2.patch
===================================================================
--- use-python2.patch 2013-02-10 14:55:58 UTC (rev 177894)
+++ use-python2.patch 2013-02-10 15:13:14 UTC (rev 177895)
@@ -18,3 +18,79 @@
v8_js2c_experimental.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN}
v8_js2c_experimental.output = $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp
v8_js2c_experimental.input = V8_EXPERIMENTAL_LIBRARY_FILES
+--- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/JavaScriptCore/DerivedSources.pri~ 2013-01-09 11:29:16.452266719 +0000
++++ qt-everywhere-opensource-src-5.0.0/qtwebkit/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
+ }
+--- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/WebCore/DerivedSources.pri~ 2013-01-09 11:46:01.165612894 +0000
++++ qt-everywhere-opensource-src-5.0.0/qtwebkit/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
+--- qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri~ 2013-02-10 13:48:49.800319915 +0000
++++ qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri 2013-02-10 13:49:09.966867900 +0000
+@@ -120,14 +120,14 @@
+ $$PWD/Scripts/webkit2/model.py \
+ $$PWD/Scripts/webkit2/parser.py
+
+-message_header_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
++message_header_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+ message_header_generator.input = MESSAGE_RECEIVERS
+ message_header_generator.depends = $$SCRIPTS
+ message_header_generator.output_function = message_header_generator_output
+ message_header_generator.add_output_to_sources = false
+ GENERATORS += message_header_generator
+
+-message_receiver_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
++message_receiver_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+ message_receiver_generator.input = MESSAGE_RECEIVERS
+ message_receiver_generator.depends = $$SCRIPTS
+ message_receiver_generator.output_function = message_receiver_generator_output
More information about the arch-commits
mailing list