Date: Saturday, December 19, 2020 @ 00:24:10 Author: arojas Revision: 404510
Fix clang include paths (FS#69027) Added: qtcreator/trunk/qtcreator-fix-clang-paths.patch Modified: qtcreator/trunk/PKGBUILD ---------------------------------+ PKGBUILD | 10 +++++++--- qtcreator-fix-clang-paths.patch | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-19 00:03:04 UTC (rev 404509) +++ PKGBUILD 2020-12-19 00:24:10 UTC (rev 404510) @@ -9,7 +9,7 @@ pkgname=qtcreator pkgver=4.14.0 _clangver=11.0.0 -pkgrel=2 +pkgrel=3 pkgdesc='Lightweight, cross-platform integrated development environment' arch=(x86_64) url='https://www.qt.io' @@ -29,8 +29,10 @@ 'bzr: bazaar support' 'valgrind: analyze support' 'perf: performer analyzer') -source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz";) -sha256sums=('d240109351e96446ff149cbd56341ec02ba37bfa50462a85e4d02dfe6b21201e') +source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"; + qtcreator-fix-clang-paths.patch) +sha256sums=('d240109351e96446ff149cbd56341ec02ba37bfa50462a85e4d02dfe6b21201e' + 'eaaa001d3b2705ca2bdfafca5ffce7919baed8726c50113ae03e1d97da5b8c8d') prepare() { cd qt-creator-opensource-src-$pkgver @@ -41,6 +43,8 @@ sed -e 's|clangFormat|clang-cpp|' -i src/plugins/clangformat/CMakeLists.txt # Fix libexec path sed -e 's|libexec/qtcreator|lib/qtcreator|' -i cmake/QtCreatorAPIInternal.cmake +# Fix clang include path + patch -p1 -i ../qtcreator-fix-clang-paths.patch } build() { Added: qtcreator-fix-clang-paths.patch =================================================================== --- qtcreator-fix-clang-paths.patch (rev 0) +++ qtcreator-fix-clang-paths.patch 2020-12-19 00:24:10 UTC (rev 404510) @@ -0,0 +1,15 @@ +diff --git a/src/libs/clangsupport/CMakeLists.txt b/src/libs/clangsupport/CMakeLists.txt +index dcaa464710..01cf7580b7 100644 +--- a/src/libs/clangsupport/CMakeLists.txt ++++ b/src/libs/clangsupport/CMakeLists.txt +@@ -5,8 +5,8 @@ add_qtc_library(ClangSupport + PUBLIC_DEPENDS Utils Sqlite Qt5::Core Qt5::Network + PUBLIC_DEFINES + CLANG_VERSION="${CLANG_VERSION}" +- CLANG_INCLUDE_DIR="${IDE_LIBEXEC_PATH}/clang/lib/clang/${CLANG_VERSION}/include" +- CLANG_BINDIR="${IDE_LIBEXEC_PATH}/clang/bin" ++ CLANG_INCLUDE_DIR="/usr/lib/clang/${CLANG_VERSION}/include" ++ CLANG_BINDIR="/usr/bin" + DEFINES CLANGSUPPORT_BUILD_LIB + PUBLIC_INCLUDES + "${CMAKE_CURRENT_LIST_DIR}"
