Date: Friday, October 4, 2019 @ 17:19:45 Author: arojas Revision: 363801
clang 9.0.0 rebuild Added: qtcreator/trunk/qtcreator-clang-9.patch Modified: qtcreator/trunk/PKGBUILD -------------------------+ PKGBUILD | 12 ++++++++---- qtcreator-clang-9.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-04 16:55:20 UTC (rev 363800) +++ PKGBUILD 2019-10-04 17:19:45 UTC (rev 363801) @@ -8,8 +8,8 @@ pkgname=qtcreator pkgver=4.10.0 -_clangver=8.0.1 -pkgrel=1 +_clangver=9.0.0 +pkgrel=2 pkgdesc='Lightweight, cross-platform integrated development environment' arch=(x86_64) url='https://www.qt.io' @@ -29,9 +29,11 @@ 'valgrind: analyze support' 'perf: performer analyzer') source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"; - qtcreator-preload-plugins.patch) + qtcreator-preload-plugins.patch + qtcreator-clang-9.patch) sha256sums=('8f5d3abc522d8b8879adfa098e037f751b4311173f5f443fd1b5800f5feb0f8a' - '150c444e76ec969fc8765774b648984037829623300d0ce9d41a915b2afa792d') + '150c444e76ec969fc8765774b648984037829623300d0ce9d41a915b2afa792d' + '1d66eb008e84459f6570e6e72acedcf80d2f0bb82650df3b733f7ca0a3f08a3d') prepare() { mkdir -p build @@ -46,6 +48,8 @@ # see http://code.qt.io/cgit/clang/clang.git/commit/?id=7f349701d3ea0c47be3a43e265699dddd3fd55cf # and https://bugs.archlinux.org/task/59492 patch -p1 -i ../qtcreator-preload-plugins.patch + # Fix build with clang 9 (Fedora) + patch -p1 -i ../qtcreator-clang-9.patch } build() { Added: qtcreator-clang-9.patch =================================================================== --- qtcreator-clang-9.patch (rev 0) +++ qtcreator-clang-9.patch 2019-10-04 17:19:45 UTC (rev 363801) @@ -0,0 +1,12 @@ +diff -rupN qt-creator-opensource-src-4.10.0/src/plugins/clangformat/clangformatutils.cpp qt-creator-opensource-src-4.10.0-new/src/plugins/clangformat/clangformatutils.cpp +--- qt-creator-opensource-src-4.10.0/src/plugins/clangformat/clangformatutils.cpp 2019-09-03 16:36:38.000000000 +0200 ++++ qt-creator-opensource-src-4.10.0-new/src/plugins/clangformat/clangformatutils.cpp 2019-09-25 13:33:27.230835047 +0200 +@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcSty + style.AllowShortBlocksOnASingleLine = false; + style.AllowShortCaseLabelsOnASingleLine = false; + style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; +- style.AllowShortIfStatementsOnASingleLine = false; ++ style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never; + style.AllowShortLoopsOnASingleLine = false; + style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None; + style.AlwaysBreakBeforeMultilineStrings = false;
