Date: Wednesday, August 21, 2013 @ 14:19:54 Author: andrea Revision: 193502
archrelease: copy trunk to staging-i686 Added: qt5/repos/staging-i686/ qt5/repos/staging-i686/PKGBUILD (from rev 193501, qt5/trunk/PKGBUILD) qt5/repos/staging-i686/assistant.desktop (from rev 193501, qt5/trunk/assistant.desktop) qt5/repos/staging-i686/bison3.patch (from rev 193501, qt5/trunk/bison3.patch) qt5/repos/staging-i686/designer.desktop (from rev 193501, qt5/trunk/designer.desktop) qt5/repos/staging-i686/linguist.desktop (from rev 193501, qt5/trunk/linguist.desktop) qt5/repos/staging-i686/qdbusviewer.desktop (from rev 193501, qt5/trunk/qdbusviewer.desktop) qt5/repos/staging-i686/qt5-tools.install (from rev 193501, qt5/trunk/qt5-tools.install) qt5/repos/staging-i686/use-python2.patch (from rev 193501, qt5/trunk/use-python2.patch) ---------------------+ PKGBUILD | 362 ++++++++++++++++++++++++++++++++++++++++++++++++++ assistant.desktop | 8 + bison3.patch | 38 +++++ designer.desktop | 10 + linguist.desktop | 9 + qdbusviewer.desktop | 9 + qt5-tools.install | 12 + use-python2.patch | 118 ++++++++++++++++ 8 files changed, 566 insertions(+) Copied: qt5/repos/staging-i686/PKGBUILD (from rev 193501, qt5/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2013-08-21 12:19:54 UTC (rev 193502) @@ -0,0 +1,362 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> + +pkgbase=qt5 +pkgname=('qt5-base' + 'qt5-declarative' + 'qt5-graphicaleffects' + 'qt5-imageformats' + 'qt5-jsbackend' + 'qt5-multimedia' + 'qt5-quick1' + 'qt5-quickcontrols' + 'qt5-script' + 'qt5-sensors' + 'qt5-serialport' + 'qt5-svg' + 'qt5-tools' + 'qt5-translations' + 'qt5-webkit' + 'qt5-x11extras' + 'qt5-xmlpatterns') +pkgver=5.1.0 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL' 'FDL' 'custom') +makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' + 'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins' + 'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' + 'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' + 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' + 'libmng' 'openal' 'gtk2' 'libxkbcommon') +groups=('qt' 'qt5') +options=('!libtool') +_pkgfqn="qt-everywhere-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' + 'use-python2.patch' + 'bison3.patch') +md5sums=('44a507beebef73eb364b5a2ec7bbe090' + 'b2897dd6a2967bccf8f10e397aafee55' + '9638a78e502719ef8fe5f8d10d0361a9' + '188da8f4c87316e730ebf1c6217bf5a0' + '322b419b16c75d4de0ee7ad0a246caa1' + '92831f79144d5cb8121915423ba47575' + '6b162cd2bc104f0ae83ca039401be7bf') + +prepare() { + cd ${_pkgfqn} + + sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf + + # 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') + + # Fix build with bison 3.x + cd qtwebkit + patch -p1 -i "${srcdir}"/bison3.patch +} + +build() { + cd ${_pkgfqn} + + export QTDIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + + PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \ + -prefix /usr \ + -bindir /usr/lib/qt/bin \ + -docdir /usr/share/doc/qt \ + -headerdir /usr/include/qt \ + -archdatadir /usr/lib/qt \ + -datadir /usr/share/qt \ + -sysconfdir /etc/xdg \ + -examplesdir /usr/share/doc/qt/examples \ + -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \ + -system-sqlite \ + -openssl-linked \ + -nomake docs \ + -nomake examples \ + -nomake tests \ + -no-rpath \ + -optimized-qmake \ + -dbus-linked \ + -reduce-relocations + + make +} + +package_qt5-base() { + pkgdesc='A cross-platform application and UI framework' + depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' + 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image' + 'icu' 'qtchooser' 'libxkbcommon') + optdepends=('postgresql-libs: PostgreSQL driver' + 'libmariadbclient: MariaDB driver' + 'unixodbc: ODBC driver' + 'libfbclient: Firebird/iBase driver') + conflicts=('qt') + + cd ${_pkgfqn}/qtbase + make INSTALL_ROOT="${pkgdir}" install + + cd "${srcdir}" + install -D -m644 ${_pkgfqn}/qtbase/LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt + + # 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/' {} \; + + # Fix wrong qmake path in pri file + sed -i "s|${srcdir}/${_pkgfqn}/qtbase|/usr|" \ + "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap.pri + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done +} + +package_qt5-declarative() { + pkgdesc='A cross-platform application and UI framework (QtQml, QtQuick)' + depends=('qt5-jsbackend' 'qt5-xmlpatterns') + conflicts=('qt') + + cd ${_pkgfqn}/qtdeclarative + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done +} + +package_qt5-jsbackend() { + pkgdesc='A cross-platform application and UI framework (QtV8)' + depends=('qt5-base') + + cd ${_pkgfqn}/qtjsbackend + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; +} + +package_qt5-xmlpatterns() { + pkgdesc='A cross-platform application and UI framework (QtXmlPatterns)' + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qtxmlpatterns + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done +} + +package_qt5-translations() { + pkgdesc='A cross-platform application and UI framework (Translations)' + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qttranslations + make INSTALL_ROOT="${pkgdir}" install +} + +package_qt5-multimedia() { + pkgdesc='A cross-platform application and UI framework (QtMultimedia)' + depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal') + conflicts=('qt') + + cd ${_pkgfqn}/qtmultimedia + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; +} + +package_qt5-graphicaleffects() { + pkgdesc='A cross-platform application and UI framework (QtGraphicalEffects)' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtgraphicaleffects + make INSTALL_ROOT="${pkgdir}" install +} + +package_qt5-imageformats() { + pkgdesc='A cross-platform application and UI framework (Images plugins)' + depends=('qt5-base' 'libtiff' 'libmng') + conflicts=('qt') + + cd ${_pkgfqn}/qtimageformats + make INSTALL_ROOT="${pkgdir}" install +} + +package_qt5-quick1() { + pkgdesc='A cross-platform application and UI framework (QtDeclarative)' + depends=('qt5-webkit' 'qt5-script') + conflicts=('qt') + + cd ${_pkgfqn}/qtquick1 + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done +} + +package_qt5-quickcontrols() { + pkgdesc='A cross-platform application and UI framework (QtQuick)' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtquickcontrols + make INSTALL_ROOT="${pkgdir}" install +} + +package_qt5-script() { + pkgdesc='A cross-platform application and UI framework (QtScript)' + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qtscript + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; +} + +package_qt5-sensors() { + pkgdesc='A cross-platform application and UI framework (QtSensors)' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtsensors + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; +} + +package_qt5-serialport() { + pkgdesc='A cross-platform application and UI framework (QtSerialPort)' + depends=('qt5-base') + + cd ${_pkgfqn}/qtserialport + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; +} + +package_qt5-svg() { + pkgdesc='A cross-platform application and UI framework (QtSvg)' + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qtsvg + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; +} + +package_qt5-tools() { + pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)' + depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations' 'hicolor-icon-theme' + 'xdg-utils') + optdepends=('qt5-doc: documentation') + install='qt5-tools.install' + conflicts=('qt') + + cd ${_pkgfqn}/qttools + make INSTALL_ROOT="${pkgdir}" install + + # install missing icons and desktop files + for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" + done + + install -D -m644 src/assistant/assistant/images/assistant.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" + install -D -m644 src/assistant/assistant/images/assistant-128.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png" + install -D -m644 src/designer/src/designer/images/designer.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/qdbusviewer.png" + install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/qdbusviewer.png" + install -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}"/{linguist,designer,assistant,qdbusviewer}.desktop \ + "${pkgdir}/usr/share/applications/" + + # 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/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done +} + +package_qt5-webkit() { + pkgdesc='A cross-platform application and UI framework (QtWebKit)' + depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite' 'qt5-sensors') + + cd ${_pkgfqn}/qtwebkit + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; + + # Fix wrong path in pc file + perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc +} + +package_qt5-x11extras() { + pkgdesc='A cross-platform application and UI framework (QtX11Extras)' + depends=('qt5-base') + + cd ${_pkgfqn}/qtx11extras + make INSTALL_ROOT="${pkgdir}" install + + # 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/' {} \; +} Copied: qt5/repos/staging-i686/assistant.desktop (from rev 193501, qt5/trunk/assistant.desktop) =================================================================== --- staging-i686/assistant.desktop (rev 0) +++ staging-i686/assistant.desktop 2013-08-21 12:19:54 UTC (rev 193502) @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Qt Assistant +Comment=Shows Qt documentation and examples +Exec=/usr/lib/qt/bin/assistant +Icon=assistant +Terminal=false +Type=Application +Categories=Qt;Development;Documentation; Copied: qt5/repos/staging-i686/bison3.patch (from rev 193501, qt5/trunk/bison3.patch) =================================================================== --- staging-i686/bison3.patch (rev 0) +++ staging-i686/bison3.patch 2013-08-21 12:19:54 UTC (rev 193502) @@ -0,0 +1,38 @@ +From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jen...@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.turco...@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 + Copied: qt5/repos/staging-i686/designer.desktop (from rev 193501, qt5/trunk/designer.desktop) =================================================================== --- staging-i686/designer.desktop (rev 0) +++ staging-i686/designer.desktop 2013-08-21 12:19:54 UTC (rev 193502) @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt applications +Exec=/usr/lib/qt/bin/designer +Icon=designer +MimeType=application/x-designer; +Terminal=false +Type=Application +Categories=Qt;Development; Copied: qt5/repos/staging-i686/linguist.desktop (from rev 193501, qt5/trunk/linguist.desktop) =================================================================== --- staging-i686/linguist.desktop (rev 0) +++ staging-i686/linguist.desktop 2013-08-21 12:19:54 UTC (rev 193502) @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt Linguist +Comment=Add translations to Qt applications +Exec=/usr/lib/qt/bin/linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Type=Application +Categories=Qt;Development; Copied: qt5/repos/staging-i686/qdbusviewer.desktop (from rev 193501, qt5/trunk/qdbusviewer.desktop) =================================================================== --- staging-i686/qdbusviewer.desktop (rev 0) +++ staging-i686/qdbusviewer.desktop 2013-08-21 12:19:54 UTC (rev 193502) @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt QDbusViewer +GenericName=D-Bus Debugger +Comment=Debug D-Bus applications +Exec=/usr/lib/qt/bin/qdbusviewer +Icon=qdbusviewer +Terminal=false +Type=Application +Categories=Qt;Development;Debugger; Copied: qt5/repos/staging-i686/qt5-tools.install (from rev 193501, qt5/trunk/qt5-tools.install) =================================================================== --- staging-i686/qt5-tools.install (rev 0) +++ staging-i686/qt5-tools.install 2013-08-21 12:19:54 UTC (rev 193502) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: qt5/repos/staging-i686/use-python2.patch (from rev 193501, qt5/trunk/use-python2.patch) =================================================================== --- staging-i686/use-python2.patch (rev 0) +++ staging-i686/use-python2.patch 2013-08-21 12:19:54 UTC (rev 193502) @@ -0,0 +1,118 @@ +--- qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri~ 2013-01-11 06:50:55.241495644 +0000 ++++ qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri 2013-01-11 06:51:29.987894356 +0000 +@@ -303,7 +303,7 @@ + V8_EXPERIMENTAL_LIBRARY_FILES = \ + $$V8SRC/proxy.js \ + +-v8_js2c.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off ++v8_js2c.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off + v8_js2c.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN} + v8_js2c.output = $$V8_GENERATED_SOURCES_DIR/libraries.cpp + v8_js2c.input = V8_LIBRARY_FILES +@@ -314,7 +314,7 @@ + v8_js2c.name = generating[v8] ${QMAKE_FILE_IN} + silent:v8_js2c.commands = @echo generating[v8] ${QMAKE_FILE_IN} && $$v8_js2c.commands + +-v8_js2c_experimental.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off ++v8_js2c_experimental.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off + 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 +--- qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~ 2013-04-11 08:05:15.149214600 +0000 ++++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf 2013-04-11 08:05:28.829105110 +0000 +@@ -116,7 +116,7 @@ + production_build:blackberry { + addReasonForSkippingBuild("Build not supported on BB10 yet.") + } +- requiredPrograms = gperf python perl bison ruby flex ++ requiredPrograms = gperf python2 perl bison ruby flex + for(program, requiredPrograms): \ + !programExistsInPath($$program): \ + addReasonForSkippingBuild("Missing $$program from PATH") +--- qt-everywhere-opensource-src-5.1.0/qtjsbackend/src/3rdparty/v8/src/d8.gyp.old 2013-07-03 19:22:34.536705691 +0000 ++++ qt-everywhere-opensource-src-5.1.0/qtjsbackend/src/3rdparty/v8/src/d8.gyp 2013-07-03 19:22:25.606770334 +0000 +@@ -99,7 +99,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', + ], + 'action': [ +- 'python', ++ 'python2', + '../tools/js2c.py', + '<@(_outputs)', + 'D8',