Date: Wednesday, December 10, 2014 @ 17:54:25 Author: andrea Revision: 227406
Enable WEBP, GeoClue and Bluez 5 support Modified: qt5/trunk/PKGBUILD qt5/trunk/use-python2.patch -------------------+ PKGBUILD | 22 ++++++++++++---------- use-python2.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-12-10 14:44:46 UTC (rev 227405) +++ PKGBUILD 2014-12-10 16:54:25 UTC (rev 227406) @@ -32,11 +32,12 @@ 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' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs' 'gstreamer0.10-base-plugins' 'libmng' + 'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-bad' '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' - 'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz') + 'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' 'libmng' + 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'bluez-libs' + 'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz' 'libwebp' 'leveldb' + 'geoclue') groups=('qt' 'qt5') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz" @@ -47,7 +48,7 @@ '9638a78e502719ef8fe5f8d10d0361a9' '188da8f4c87316e730ebf1c6217bf5a0' '322b419b16c75d4de0ee7ad0a246caa1' - '767fc585e6a7ae3fad5272663c3d0e9d') + '23ebafd7ad91897e870e84e281266f46') prepare() { cd ${_pkgfqn} @@ -143,7 +144,7 @@ package_qt5-connectivity() { pkgdesc='Provides access to Bluetooth hardware' - depends=('qt5-declarative') + depends=('qt5-declarative' 'bluez-libs') cd ${_pkgfqn}/qtconnectivity make INSTALL_ROOT="${pkgdir}" install @@ -273,7 +274,7 @@ package_qt5-imageformats() { pkgdesc='Plugins for additional image formats: TIFF, MNG, TGA, WBMP' - depends=('qt5-base' 'jasper' 'libmng') + depends=('qt5-base' 'jasper' 'libmng' 'libwebp') conflicts=('qt') cd ${_pkgfqn}/qtimageformats @@ -285,7 +286,7 @@ package_qt5-location() { pkgdesc='Provides access to position, satellite and area monitoring classes' - depends=('qt5-declarative') + depends=('qt5-declarative' 'geoclue') cd ${_pkgfqn}/qtlocation make INSTALL_ROOT="${pkgdir}" install @@ -442,7 +443,8 @@ package_qt5-webkit() { pkgdesc='Classes for a WebKit2 based implementation and a new QML API' - depends=('qt5-sensors' 'qt5-location' 'qt5-webchannel' 'gst-plugins-base' 'libxslt' 'libxcomposite') + depends=('qt5-sensors' 'qt5-location' 'qt5-webchannel' 'gst-plugins-base' 'libxslt' + 'libxcomposite' 'libwebp') optdepends=('gst-plugins-good: Webm codec support') license=('GPL3' 'LGPL' 'FDL') @@ -474,7 +476,7 @@ package_qt5-webchannel() { pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients' - depends=('qt5-base') + depends=('qt5-declarative') cd ${_pkgfqn}/qtwebchannel make INSTALL_ROOT="${pkgdir}" install Modified: use-python2.patch =================================================================== --- use-python2.patch 2014-12-10 14:44:46 UTC (rev 227405) +++ use-python2.patch 2014-12-10 16:54:25 UTC (rev 227406) @@ -86,3 +86,43 @@ QMAKE_EXTRA_COMPILERS += retgen # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf +--- qt-everywhere-opensource-src-5.4.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf.old 2014-12-10 16:47:11.582370503 +0000 ++++ qt-everywhere-opensource-src-5.4.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf 2014-12-10 16:47:54.888779281 +0000 +@@ -15,8 +15,8 @@ + } + + defineTest(isPythonVersionSupported) { +- python_major_version = $$system('python -c "import sys; print sys.version_info.major"') +- python_minor_version = $$system('python -c "import sys; print sys.version_info.minor"') ++ python_major_version = $$system('python2 -c "import sys; print sys.version_info.major"') ++ python_minor_version = $$system('python2 -c "import sys; print sys.version_info.minor"') + greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): return(true) + warning("Using Python version "$$python_major_version"."$$python_minor_version", but at least Python version 2.7 is required to build Qt WebEngine.") + return(false) +@@ -69,7 +69,7 @@ + input = $$1 + for (file, input): \ + infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_) +- mocables = $$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$infiles") ++ mocables = $$system("python2 $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$infiles") + mocables = $$replace(mocables, $$_PRO_FILE_PWD_/, '') + return($$mocables) + } +@@ -78,7 +78,7 @@ + input = $$1 + for (file, input): \ + infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_) +- return($$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-included-moc-files $$infiles")) ++ return($$system("python2 $$QTWEBENGINE_ROOT/tools/buildscripts/find-included-moc-files $$infiles")) + } + + defineReplace(mocOutput) { +@@ -136,7 +136,7 @@ + win32: out = $$system_path($${out}.exe) + + # If we did not find ninja, then we bootstrap it. +- !exists($$out): system("python $$dirname(out)/bootstrap.py") ++ !exists($$out): system("python2 $$dirname(out)/bootstrap.py") + } + return($$out) + }