Date: Thursday, September 20, 2018 @ 14:32:37 Author: arojas Revision: 335118
clang 7 rebuild Added: qtcreator/trunk/qtcreator-clang7.patch Modified: qtcreator/trunk/PKGBUILD ------------------------+ PKGBUILD | 11 +++++++---- qtcreator-clang7.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-20 13:21:30 UTC (rev 335117) +++ PKGBUILD 2018-09-20 14:32:37 UTC (rev 335118) @@ -8,8 +8,8 @@ pkgname=qtcreator pkgver=4.7.1 -_clangver=6.0.1 -pkgrel=1 +_clangver=7.0.0 +pkgrel=2 pkgdesc='Lightweight, cross-platform integrated development environment' arch=(x86_64) url='http://qt-project.org' @@ -28,9 +28,10 @@ 'bzr: bazaar support' 'valgrind: analyze support') source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"; - qtcreator-clang-plugins.patch) + qtcreator-clang-plugins.patch qtcreator-clang7.patch) sha256sums=('c98254336953f637015f14b8b4ddb5e274454a5416fd20dd09747a6e50762565' - '6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6') + '6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6' + '88b78c8ebd72cdad8f59bba8172cc5d1f3f9577e2bb31d841d5cabdd76eba36c') prepare() { mkdir -p build @@ -44,6 +45,8 @@ # see http://code.qt.io/cgit/clang/clang.git/commit/?id=7f349701d3ea0c47be3a43e265699dddd3fd55cf # and https://bugs.archlinux.org/task/59492 patch -p1 -i ../qtcreator-clang-plugins.patch + # Don't use unreleased API when building against clang 7 + patch -p1 -i ../qtcreator-clang7.patch } build() { Added: qtcreator-clang7.patch =================================================================== --- qtcreator-clang7.patch (rev 0) +++ qtcreator-clang7.patch 2018-09-20 14:32:37 UTC (rev 335118) @@ -0,0 +1,13 @@ +diff --git a/src/tools/clangbackend/source/clangbackend_global.h b/src/tools/clangbackend/source/clangbackend_global.h +index 658e2e8fb1..5c27224ae4 100644 +--- a/src/tools/clangbackend/source/clangbackend_global.h ++++ b/src/tools/clangbackend/source/clangbackend_global.h +@@ -52,7 +52,7 @@ enum class PreferredTranslationUnit + #endif + + // CLANG-UPGRADE-CHECK: Remove IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED once we require clang >= 7.0 +-#if defined(CINDEX_VERSION_HAS_SKIPWARNINGSFROMINCLUDEDFILES_BACKPORTED) || CINDEX_VERSION_MINOR >= 46 ++#if defined(CINDEX_VERSION_HAS_SKIPWARNINGSFROMINCLUDEDFILES_BACKPORTED) + # define IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED + #endif +
