Date: Tuesday, January 20, 2015 @ 13:53:47 Author: andrea Revision: 229607
This is no more needed and it also broke some prl file Modified: qt5/trunk/PKGBUILD ----------+ PKGBUILD | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-20 08:11:55 UTC (rev 229606) +++ PKGBUILD 2015-01-20 12:53:47 UTC (rev 229607) @@ -27,7 +27,7 @@ 'qt5-x11extras' 'qt5-xmlpatterns') pkgver=5.4.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -51,7 +51,8 @@ prepare() { cd ${_pkgfqn} - # Build using Arch {C,LD}FLAGS + # Build qmake using Arch {C,LD}FLAGS + # This also sets default {C,XX,LD}FLAGS for projects built using qmake sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \ qtbase/mkspecs/common/gcc-base.conf sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ @@ -60,7 +61,7 @@ # Use python2 for Python 2.x find . -name '*.py' -exec sed -i \ 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} + - # There are still a lot of relative calls which need a workaround + # in qtwebengine there are still a lot of relative calls which need a workaround mkdir "${srcdir}"/python2-path ln -s /usr/bin/python2 "${srcdir}"/python2-path/python } @@ -139,8 +140,8 @@ "${pkgdir}"/usr/share/licenses/${pkgname}/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/' {} \; + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; # Fix wrong qmake path in pri file sed -i "s|${srcdir}/${_pkgfqn}/qtbase|/usr|" \ @@ -162,7 +163,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt @@ -178,7 +179,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; # Useful symlinks install -d "${pkgdir}"/usr/bin @@ -216,7 +217,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt @@ -232,7 +233,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; # Useful symlinks install -d "${pkgdir}"/usr/bin @@ -267,7 +268,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt @@ -305,7 +306,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt @@ -321,7 +322,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; # Useful symlinks install -d "${pkgdir}"/usr/bin @@ -354,7 +355,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt @@ -369,7 +370,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt @@ -384,7 +385,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt @@ -400,7 +401,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt @@ -441,7 +442,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; # Useful symlinks install -d "${pkgdir}"/usr/bin @@ -465,7 +466,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; # Fix wrong path in pc file perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc @@ -480,7 +481,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt @@ -495,7 +496,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt @@ -522,7 +523,7 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; } package_qt5-x11extras() { @@ -534,8 +535,9 @@ # 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/' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; install -D -m644 LGPL_EXCEPTION.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt } +