diff options
Diffstat (limited to 'libre/qtcreator/PKGBUILD')
| -rw-r--r-- | libre/qtcreator/PKGBUILD | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD index 3b84da5b7..49f93c532 100644 --- a/libre/qtcreator/PKGBUILD +++ b/libre/qtcreator/PKGBUILD @@ -14,8 +14,8 @@ pkgname=qtcreator -pkgver=4.7.0 -_clangver=6.0.1 +pkgver=4.7.1 +_clangver=7.0.0 pkgrel=1 pkgrel+=.parabola1 pkgdesc='Lightweight, cross-platform integrated development environment' @@ -26,7 +26,7 @@ url='http://qt-project.org' license=(LGPL) depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 clang=$_clangver qbs) -makedepends=(git mesa llvm) +makedepends=(git mesa llvm python) options=(docs) optdepends=('qt5-doc: integrated Qt documentation' 'qt5-examples: welcome page examples' @@ -38,15 +38,20 @@ optdepends=('qt5-doc: integrated Qt documentation' 'mercurial: mercurial support' 'bzr: bazaar support' 'valgrind: analyze support') - -source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz") +source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz" + qtcreator-clang-plugins.patch qtcreator-clang7.patch + qtcreatorbug-19367a.patch::"http://code.qt.io/cgit/qt-creator/qt-creator.git/patch/?id=807b0f78" + qtcreatorbug-19367b.patch::"http://code.qt.io/cgit/qt-creator/qt-creator.git/patch/?id=813c1685") source+=('0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch' 'libre.patch') -sha256sums=('4b19870bf8d43665deac73a0522a1459d19f5b18b6f52030bb7fbc82d90b759b' +sha256sums=('c98254336953f637015f14b8b4ddb5e274454a5416fd20dd09747a6e50762565' + '6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6' + '88b78c8ebd72cdad8f59bba8172cc5d1f3f9577e2bb31d841d5cabdd76eba36c' + 'a7a00a390fb46f13d53055b1862dcd916deb595dbba20c2340662cab51e5a8c1' + '89a3fff5e398f11367ab060d910098c295968e909fcca3f35d30073cd80cbf03' '56e6876f41ee8909ee197f7ab5a2bb18ad5a7fe26ce490a48cdf062fa199ffc6' '53d119a70047c6b64d8227e65d402d308017cc1d99d8886421bf2da4f7407c80') - prepare() { mkdir -p build @@ -55,9 +60,18 @@ prepare() { # use system qbs rm -r qt-creator-opensource-src-${pkgver}/src/shared/qbs + # Load analyzer plugins on demand, since upstream clang doesn't link to all plugins + # see http://code.qt.io/cgit/clang/clang.git/commit/?id=7f349701d3ea0c47be3a43e265699dddd3fd55cf + # and https://bugs.archlinux.org/task/59492 + cd qt-creator-opensource-src-${pkgver} + patch -p1 -i "$srcdir"/qtcreator-clang-plugins.patch + # Don't use unreleased API when building against clang 7 + patch -p1 -i "$srcdir"/qtcreator-clang7.patch + # https://bugreports.qt.io/browse/QTCREATORBUG-19367 + patch -p1 -i "$srcdir"/qtcreatorbug-19367a.patch + patch -p1 -i "$srcdir"/qtcreatorbug-19367b.patch # remove qt5-webengine support - cd qt-creator-opensource-src-${pkgver} patch -Np1 -i "$srcdir"/libre.patch rm -rv src/plugins/help/webenginehelpviewer.{cpp,h} |