From 347ea765c4e77b637f835df45887f83414ed0d5f Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sat, 16 Aug 2014 18:35:55 +0000 Subject: [PATCH] extra/qtcreator to 3.1.2-3 --- extra/qtcreator/PKGBUILD | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD index 8d8d2991c..26d6004eb 100644 --- a/extra/qtcreator/PKGBUILD +++ b/extra/qtcreator/PKGBUILD @@ -12,7 +12,7 @@ pkgname=qtcreator pkgver=3.1.2 _pkgver=v3.1.2 -pkgrel=1 +pkgrel=3 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') url='http://qt-project.org' @@ -40,11 +40,11 @@ md5sums=('SKIP' '7d71e58bdb7a918adb779b0e527fbba5') prepare() { - cd qt-creator - git submodule init - git config submodule.qbs.url $srcdir/qbs - git submodule update - patch -p1 -i "${srcdir}"/botan-upgrade.patch + cd qt-creator + git submodule init + git config submodule.qbs.url $srcdir/qbs + git submodule update + patch -p1 -i "${srcdir}"/botan-upgrade.patch } build() { @@ -62,6 +62,12 @@ package() { make INSTALL_ROOT="${pkgdir}/usr/" install make INSTALL_ROOT="${pkgdir}/usr/" install_docs + # Workaround for FS#40583 + mv "${pkgdir}"/usr/bin/qtcreator "${pkgdir}"/usr/bin/qtcreator-bin + echo "#!/bin/sh" > "${pkgdir}"/usr/bin/qtcreator + echo "QT_LOGGING_TO_CONSOLE=1 qtcreator-bin \$@" >> "${pkgdir}"/usr/bin/qtcreator + chmod +x "${pkgdir}"/usr/bin/qtcreator + install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop install -Dm644 ${srcdir}/qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT }