From 9ce301832a2b75303b5e1a81ba3545354949733c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Wed, 14 Dec 2016 13:40:06 +0000 Subject: [PATCH] extra/qtcreator to 4.2.0-1 --- extra/qtcreator/PKGBUILD | 34 ++++++++------------- extra/qtcreator/qt-creator_llvmincdir.patch | 12 -------- 2 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 extra/qtcreator/qt-creator_llvmincdir.patch diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD index 88ab62e9b..a6b26b405 100644 --- a/extra/qtcreator/PKGBUILD +++ b/extra/qtcreator/PKGBUILD @@ -10,16 +10,18 @@ # - patch distributed botan version for ARM # - drop valgrind optdepend +buildarch=28 + pkgname=qtcreator -pkgver=4.1.0 -_pkgver=v4.1.0 -pkgrel=4 +pkgver=4.2.0 +_pkgver=v4.2.0 +pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') url='http://qt-project.org' license=('LGPL') depends=('qt5-tools' 'qt5-declarative' 'qt5-script' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'qt5-webkit' 'clang') -makedepends=('git' 'mesa') +makedepends=('git' 'mesa' 'llvm') options=('docs') optdepends=('qt5-doc: integrated Qt documentation' 'qt5-examples: welcome page examples' @@ -30,25 +32,15 @@ optdepends=('qt5-doc: integrated Qt documentation' 'git: git support' 'mercurial: mercurial support' 'bzr: bazaar support') -source=("git://code.qt.io/qt-creator/qt-creator.git#tag=${_pkgver}" - "git://code.qt.io/qt-labs/qbs.git" - 'qt-creator_llvmincdir.patch' +source=("http://download.qt.io/official_releases/qtcreator/4.2/${pkgver}/qt-creator-opensource-src-${pkgver}.tar.xz" 'qtcreator.desktop' '0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch') -md5sums=('SKIP' - 'SKIP' - '800c94165c547b64012a207d9830250a' - '49924cb71a664d079b8283a7173bc14f') +sha512sums=('1801611d8db10041332d728a2af6b0c57b28b3ab9847a8875edb788d3b0fe6570103a408a7f52c989e40949743263d444e5db49d290860f2e7231f463fa86f7a' + '10552f2f77e816bccf21f31ba00bca10607df9c355f5efcbcca337e52a8a7e3cb66da6336b717de5f810dc74d3f175ba81eef04f55e08892bb39ddc66e27dad4' + 'af0a0d5a2fadcfce14def65be73c99bff8227794b9ad2be333713c89e226e2c6b43802a802b6e30f3e6c1b4b77f31183bffdcca3404d9686f15fa84dfc64d1a1') prepare() { - cd qt-creator - git submodule init - git config submodule.qbs.url $srcdir/qbs - git submodule update - - # Fix build with GCC 6 (patch from Fedora) - # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Q5SWCUUMWQ4EMS7CU2CBOZHV3WZYOOTT/ - patch -Np1 -i ../qt-creator_llvmincdir.patch + cd qt-creator-opensource-src-${pkgver} git apply ../0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch } @@ -57,7 +49,7 @@ build() { [[ -d build ]] && rm -r build mkdir build && cd build - LLVM_INSTALL_DIR=/usr qmake CONFIG+=journald -r ../qt-creator/qtcreator.pro + LLVM_INSTALL_DIR=/usr qmake CONFIG+=journald -r ../qt-creator-opensource-src-${pkgver}/qtcreator.pro make make docs -j1 } @@ -75,5 +67,5 @@ package() { chmod +x "${pkgdir}"/usr/bin/qtcreator install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop - install -Dm644 ${srcdir}/qt-creator/LICENSE.GPL3-EXCEPT ${pkgdir}/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT + install -Dm644 ${srcdir}/qt-creator-opensource-src-${pkgver}/LICENSE.GPL3-EXCEPT ${pkgdir}/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT } diff --git a/extra/qtcreator/qt-creator_llvmincdir.patch b/extra/qtcreator/qt-creator_llvmincdir.patch deleted file mode 100644 index 90e29f1bf..000000000 --- a/extra/qtcreator/qt-creator_llvmincdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN qt-creator-opensource-src-3.6.0/src/tools/clangbackend/clangbackend.pro qt-creator-opensource-src-3.6.0-new/src/tools/clangbackend/clangbackend.pro ---- qt-creator-opensource-src-3.6.0/src/tools/clangbackend/clangbackend.pro 2015-12-11 13:45:01.000000000 +0100 -+++ qt-creator-opensource-src-3.6.0-new/src/tools/clangbackend/clangbackend.pro 2016-02-08 23:04:03.654903983 +0100 -@@ -10,7 +10,7 @@ QT += core network - QT -= gui - - LIBS += $$LLVM_LIBS --INCLUDEPATH += $$LLVM_INCLUDEPATH -+#INCLUDEPATH += $$LLVM_INCLUDEPATH - - SOURCES += clangbackendmain.cpp -