Date: Thursday, July 4, 2013 @ 17:18:06 Author: andrea Revision: 189681
Upstream release; move qt5-doc in a separate PKGBUILD Modified: qt5/trunk/PKGBUILD qt5/trunk/use-python2.patch Deleted: qt5/trunk/qt5-base.install -------------------+ PKGBUILD | 125 ++++++++++++++++++++++++++++------------------------ qt5-base.install | 11 ---- use-python2.patch | 11 ++++ 3 files changed, 80 insertions(+), 67 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-07-04 14:55:33 UTC (rev 189680) +++ PKGBUILD 2013-07-04 15:18:06 UTC (rev 189681) @@ -4,20 +4,23 @@ pkgbase=qt5 pkgname=('qt5-base' 'qt5-declarative' - 'qt5-doc' '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.0.2 -pkgrel=2 +pkgver=5.1.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -26,27 +29,23 @@ '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') + 'libmng' 'openal' 'gtk2' 'libxkbcommon') groups=('qt' 'qt5') options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz" +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' 'gcc48.patch') -md5sums=('2cab3518d86fe8f0638c7faea8b46397' + 'use-python2.patch') +md5sums=('44a507beebef73eb364b5a2ec7bbe090' 'b2897dd6a2967bccf8f10e397aafee55' '9638a78e502719ef8fe5f8d10d0361a9' '188da8f4c87316e730ebf1c6217bf5a0' '322b419b16c75d4de0ee7ad0a246caa1' - 'd6ab43fb371be494e3bfd9b210c40bf1' - '7927028e2374321c78a76df858e723d6') + '92831f79144d5cb8121915423ba47575') -build() { +prepare() { cd ${_pkgfqn} - export QTDIR="${srcdir}"/${_pkgfqn} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - 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 @@ -56,13 +55,15 @@ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') +} - # GCC 4.8 fixes - cd qtbase - patch -p1 -i "${srcdir}"/gcc48.patch - cd ../ +build() { + cd ${_pkgfqn} - ./configure -confirm-license -opensource \ + 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 \ @@ -83,30 +84,17 @@ -reduce-relocations make - - # build docs - make docs - - # build examples - for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ - qtwebkit-examples-and-demos qtxmlpatterns; do - cd ${m}/examples - ${QTDIR}/qtbase/bin/qmake - make - cd ../../ - done } 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' - 'hicolor-icon-theme' 'xdg-utils' 'icu' 'qtchooser') + 'icu' 'qtchooser' 'libxkbcommon') optdepends=('postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' 'libfbclient: Firebird/iBase driver') - install='qt5-base.install' conflicts=('qt') cd ${_pkgfqn}/qtbase @@ -150,26 +138,6 @@ done } -package_qt5-doc() { - pkgdesc='A cross-platform application and UI framework (Documentation and Examples)' - depends=('qt5-base') - conflicts=('qt-doc') - replaces=('qt-doc') - provides=('qt-doc') - options=('docs') - groups=() - - cd ${_pkgfqn} - make INSTALL_ROOT="${pkgdir}" install_docs - - for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ - qtwebkit-examples-and-demos qtxmlpatterns; do - cd ${m}/examples - make INSTALL_ROOT="${pkgdir}" install - cd ../../ - done -} - package_qt5-jsbackend() { pkgdesc='A cross-platform application and UI framework (QtV8)' depends=('qt5-base') @@ -259,6 +227,14 @@ 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') @@ -272,6 +248,30 @@ -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') @@ -287,7 +287,8 @@ package_qt5-tools() { pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)' - depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations') + depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations' 'hicolor-icon-theme' + 'xdg-utils') optdepends=('qt5-doc: documentation') install='qt5-tools.install' conflicts=('qt') @@ -308,9 +309,9 @@ "${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/qdbusviwer.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/qdbusviwer-128.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 \ @@ -329,7 +330,7 @@ package_qt5-webkit() { pkgdesc='A cross-platform application and UI framework (QtWebKit)' - depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite') + depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite' 'qt5-sensors') cd ${_pkgfqn}/qtwebkit make INSTALL_ROOT="${pkgdir}" install @@ -341,3 +342,15 @@ # 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/' {} \; +} Deleted: qt5-base.install =================================================================== --- qt5-base.install 2013-07-04 14:55:33 UTC (rev 189680) +++ qt5-base.install 2013-07-04 15:18:06 UTC (rev 189681) @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Modified: use-python2.patch =================================================================== --- use-python2.patch 2013-07-04 14:55:33 UTC (rev 189680) +++ use-python2.patch 2013-07-04 15:18:06 UTC (rev 189681) @@ -105,3 +105,14 @@ 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',