Date: Wednesday, December 10, 2014 @ 14:23:56 Author: andrea Revision: 227395
Upstream release Modified: qt5/trunk/PKGBUILD qt5/trunk/use-python2.patch -------------------+ PKGBUILD | 54 ++++++++++++++++++++++++++++++++++++++++++++++------ use-python2.patch | 10 ++++----- 2 files changed, 53 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-12-10 12:36:46 UTC (rev 227394) +++ PKGBUILD 2014-12-10 13:23:56 UTC (rev 227395) @@ -19,12 +19,15 @@ 'qt5-svg' 'qt5-tools' 'qt5-translations' + 'qt5-wayland' + 'qt5-webchannel' + 'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras' 'qt5-xmlpatterns') -pkgver=5.3.2 -pkgrel=2 +pkgver=5.4.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -36,15 +39,15 @@ 'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz') groups=('qt' 'qt5') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("http://download.qt-project.org/official_releases/qt/5.3/${pkgver}/single/${_pkgfqn}.tar.xz" +source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' 'use-python2.patch') -md5sums=('c4e893678e3d8388ab04d059523d1d78' +md5sums=('21843b00ecde8956217faab391bc007b' 'b2897dd6a2967bccf8f10e397aafee55' '9638a78e502719ef8fe5f8d10d0361a9' '188da8f4c87316e730ebf1c6217bf5a0' '322b419b16c75d4de0ee7ad0a246caa1' - 'a378deccf363bd6079da459c89aff7b9') + '767fc585e6a7ae3fad5272663c3d0e9d') prepare() { cd ${_pkgfqn} @@ -439,7 +442,7 @@ package_qt5-webkit() { pkgdesc='Classes for a WebKit2 based implementation and a new QML API' - depends=('qt5-sensors' 'qt5-location' 'gst-plugins-base' 'libxslt' 'libxcomposite') + depends=('qt5-sensors' 'qt5-location' 'qt5-webchannel' 'gst-plugins-base' 'libxslt' 'libxcomposite') optdepends=('gst-plugins-good: Webm codec support') license=('GPL3' 'LGPL' 'FDL') @@ -454,6 +457,45 @@ perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc } +package_qt5-wayland() { + pkgdesc='Provides APIs for Wayland' + depends=('qt5-base' 'libxcomposite' 'libxkbcommon') + + cd ${_pkgfqn}/qtwayland + 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/' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +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') + + cd ${_pkgfqn}/qtwebchannel + 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/' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-webengine() { + pkgdesc='Provides support for web applications using the Chromium browser project' + depends=('qt5-base') + license=('LGPL') + + cd ${_pkgfqn}/qtwebengine + make INSTALL_ROOT="${pkgdir}" install +} + package_qt5-websockets() { pkgdesc='Provides WebSocket communication compliant with RFC 6455' depends=('qt5-declarative') Modified: use-python2.patch =================================================================== --- use-python2.patch 2014-12-10 12:36:46 UTC (rev 227394) +++ use-python2.patch 2014-12-10 13:23:56 UTC (rev 227395) @@ -55,12 +55,12 @@ disassembler.CONFIG += no_link GENERATORS += disassembler } ---- qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~ 2013-11-29 16:59:04.859875494 +0000 -+++ qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Tools/qmake/mkspecs/features/configure.prf 2013-11-29 16:59:40.539638968 +0000 -@@ -116,7 +116,7 @@ - production_build:blackberry|qnx { - addReasonForSkippingBuild("Build not supported on BB10/QNX yet.") +--- qt-everywhere-opensource-src-5.4.0/qtwebkit/Tools/qmake/mkspecs/features/configure.prf.old 2014-12-10 11:27:25.875352161 +0000 ++++ qt-everywhere-opensource-src-5.4.0/qtwebkit/Tools/qmake/mkspecs/features/configure.prf 2014-12-10 11:27:39.008643049 +0000 +@@ -125,7 +125,7 @@ + addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") } + winrt: addReasonForSkippingBuild("QtWebKit is not supported on Windows Phone/Windows RT") - requiredPrograms = gperf python perl bison ruby flex + requiredPrograms = gperf python2 perl bison ruby flex for(program, requiredPrograms): \