Date: Thursday, June 16, 2016 @ 10:36:28 Author: arojas Revision: 270008
archrelease: copy trunk to extra-i686, extra-x86_64 Added: qt5-declarative/repos/extra-i686/PKGBUILD (from rev 270007, qt5-declarative/trunk/PKGBUILD) qt5-declarative/repos/extra-x86_64/PKGBUILD (from rev 270007, qt5-declarative/trunk/PKGBUILD) Deleted: qt5-declarative/repos/extra-i686/PKGBUILD qt5-declarative/repos/extra-x86_64/PKGBUILD -----------------------+ /PKGBUILD | 116 ++++++++++++++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 52 --------------------- extra-x86_64/PKGBUILD | 52 --------------------- 3 files changed, 116 insertions(+), 104 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-06-16 10:35:41 UTC (rev 270007) +++ extra-i686/PKGBUILD 2016-06-16 10:36:28 UTC (rev 270008) @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=qt5-declarative -_qtver=5.6.1 -pkgver=${_qtver/-/} -pkgrel=1 -arch=('i686' 'x86_64') -url='http://qt-project.org/' -license=('GPL3' 'LGPL' 'FDL' 'custom') -pkgdesc='Classes for QML and JavaScript languages' -depends=('qt5-xmlpatterns') -makedepends=('python2') -conflicts=('qt') -groups=('qt' 'qt5') -_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" -source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -md5sums=('ea2a2602b8a91f2618a36be09bcd79e9') - -prepare() { - mkdir -p build - - # Use python2 for Python 2.x - find -name '*.pro' -o -name '*.pri' | xargs sed -i -e 's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g' -} - -build() { - cd build - - export PYTHON=python2 - qmake ../${_pkgfqn} - make -} - -package() { - cd build - 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 - - # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - find "$pkgdir/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; - - install -d "$pkgdir"/usr/share/licenses - ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} -} Copied: qt5-declarative/repos/extra-i686/PKGBUILD (from rev 270007, qt5-declarative/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-06-16 10:36:28 UTC (rev 270008) @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt5-declarative +_qtver=5.6.1 +pkgver=${_qtver/-/} +pkgrel=2 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL' 'FDL' 'custom') +pkgdesc='Classes for QML and JavaScript languages' +depends=('qt5-xmlpatterns') +makedepends=('python2') +conflicts=('qt') +groups=('qt' 'qt5') +_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" + qtbug-53761.patch::"https://github.com/qtproject/qtdeclarative/commit/210617de.patch") +md5sums=('ea2a2602b8a91f2618a36be09bcd79e9' + '74b1125f718ef3f98d7bde2659b1a194') + +prepare() { + mkdir -p build + + # Use python2 for Python 2.x + find -name '*.pro' -o -name '*.pri' | xargs sed -i -e 's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g' + + # https://bugreports.qt.io/browse/QTBUG-53761 + cd ${_pkgfqn} + patch -p1 -i ../qtbug-53761.patch +} + +build() { + cd build + + export PYTHON=python2 + qmake ../${_pkgfqn} + make +} + +package() { + cd build + 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 + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "$pkgdir/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-06-16 10:35:41 UTC (rev 270007) +++ extra-x86_64/PKGBUILD 2016-06-16 10:36:28 UTC (rev 270008) @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=qt5-declarative -_qtver=5.6.1 -pkgver=${_qtver/-/} -pkgrel=1 -arch=('i686' 'x86_64') -url='http://qt-project.org/' -license=('GPL3' 'LGPL' 'FDL' 'custom') -pkgdesc='Classes for QML and JavaScript languages' -depends=('qt5-xmlpatterns') -makedepends=('python2') -conflicts=('qt') -groups=('qt' 'qt5') -_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" -source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -md5sums=('ea2a2602b8a91f2618a36be09bcd79e9') - -prepare() { - mkdir -p build - - # Use python2 for Python 2.x - find -name '*.pro' -o -name '*.pri' | xargs sed -i -e 's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g' -} - -build() { - cd build - - export PYTHON=python2 - qmake ../${_pkgfqn} - make -} - -package() { - cd build - 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 - - # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - find "$pkgdir/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; - - install -d "$pkgdir"/usr/share/licenses - ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} -} Copied: qt5-declarative/repos/extra-x86_64/PKGBUILD (from rev 270007, qt5-declarative/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-06-16 10:36:28 UTC (rev 270008) @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt5-declarative +_qtver=5.6.1 +pkgver=${_qtver/-/} +pkgrel=2 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL' 'FDL' 'custom') +pkgdesc='Classes for QML and JavaScript languages' +depends=('qt5-xmlpatterns') +makedepends=('python2') +conflicts=('qt') +groups=('qt' 'qt5') +_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" + qtbug-53761.patch::"https://github.com/qtproject/qtdeclarative/commit/210617de.patch") +md5sums=('ea2a2602b8a91f2618a36be09bcd79e9' + '74b1125f718ef3f98d7bde2659b1a194') + +prepare() { + mkdir -p build + + # Use python2 for Python 2.x + find -name '*.pro' -o -name '*.pri' | xargs sed -i -e 's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g' + + # https://bugreports.qt.io/browse/QTBUG-53761 + cd ${_pkgfqn} + patch -p1 -i ../qtbug-53761.patch +} + +build() { + cd build + + export PYTHON=python2 + qmake ../${_pkgfqn} + make +} + +package() { + cd build + 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 + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "$pkgdir/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} +}