diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 9383f6593..d43881e6c 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -4,7 +4,7 @@ # ALARM: Kevin Mihelich # - removed libfbclient, ibase # - no x86/neon optimizations -# - disabled distcc, restricted makeflags to -j2 +# - disabled distcc, restricted makeflags to -j3 # - enabled opengl es2, mesa makedepend for headers highmem=1 @@ -24,7 +24,7 @@ pkgname=('qt5-base' 'qt5-webkit' 'qt5-xmlpatterns') pkgver=5.0.2 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -158,7 +158,7 @@ package_qt5-declarative() { # 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 @@ -196,12 +196,6 @@ package_qt5-jsbackend() { # 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-xmlpatterns() { @@ -215,6 +209,12 @@ package_qt5-xmlpatterns() { # 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() { @@ -224,12 +224,6 @@ package_qt5-translations() { cd ${_pkgfqn}/qttranslations make INSTALL_ROOT="${pkgdir}" install - - # 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-multimedia() { @@ -331,6 +325,12 @@ package_qt5-tools() { # 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() {