Date: Tuesday, March 26, 2019 @ 03:16:33 Author: foutrelis Revision: 349224
archrelease: copy trunk to staging-x86_64 Added: qtcreator/repos/staging-x86_64/ qtcreator/repos/staging-x86_64/PKGBUILD (from rev 349223, qtcreator/trunk/PKGBUILD) qtcreator/repos/staging-x86_64/qtcreator-clang-plugins.patch (from rev 349223, qtcreator/trunk/qtcreator-clang-plugins.patch) -------------------------------+ PKGBUILD | 65 ++++++++++++++++++++++++++++++++++++++++ qtcreator-clang-plugins.patch | 44 +++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) Copied: qtcreator/repos/staging-x86_64/PKGBUILD (from rev 349223, qtcreator/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2019-03-26 03:16:33 UTC (rev 349224) @@ -0,0 +1,65 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Imanol Celaya <ornitorrin...@archlinux-es.org> +# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> +# Contributor: Dan Vratil <prog...@progdansoft.com> +# Contributor: thotypous <matiasΘarchlinux-br·org> +# Contributor: delor <bartekpiech gmail com> + +pkgname=qtcreator +pkgver=4.8.2 +_clangver=8.0.0 +pkgrel=2 +pkgdesc='Lightweight, cross-platform integrated development environment' +arch=(x86_64) +url='https://www.qt.io' +license=(LGPL) +depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine clang=$_clangver qbs clazy) +makedepends=(git mesa llvm python) +options=(docs) +optdepends=('qt5-doc: integrated Qt documentation' + 'qt5-examples: welcome page examples' + 'qt5-translations: for other languages' + 'gdb: debugger' + 'cmake: cmake project support' + 'x11-ssh-askpass: ssh support' + 'git: git support' + 'mercurial: mercurial support' + 'bzr: bazaar support' + 'valgrind: analyze support') +source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz" + qtcreator-clang-plugins.patch) +sha256sums=('a8257daf39f6025c8523285dc73fd6b66645f3ff071e112b484325966eee0c92' + '34ea74698ddff9925e06bff6b4c995bf93488d1104e8cc517bcfdd621effb428') + +prepare() { + mkdir -p build + + cd qt-creator-opensource-src-$pkgver + # fix hardcoded libexec path + sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qtcreator.pri + # use system qbs + rm -r 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 + patch -p1 -i ../qtcreator-clang-plugins.patch +} + +build() { + cd build + + qmake LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I \ + DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES "$srcdir"/qt-creator-opensource-src-$pkgver/qtcreator.pro + make + make docs +} + +package() { + cd build + + make INSTALL_ROOT="$pkgdir/usr/" install + make INSTALL_ROOT="$pkgdir/usr/" install_docs + + install -Dm644 "$srcdir"/qt-creator-opensource-src-$pkgver/LICENSE.GPL3-EXCEPT "$pkgdir"/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT +} Copied: qtcreator/repos/staging-x86_64/qtcreator-clang-plugins.patch (from rev 349223, qtcreator/trunk/qtcreator-clang-plugins.patch) =================================================================== --- staging-x86_64/qtcreator-clang-plugins.patch (rev 0) +++ staging-x86_64/qtcreator-clang-plugins.patch 2019-03-26 03:16:33 UTC (rev 349224) @@ -0,0 +1,44 @@ +diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +index 25054f14ec..b0e17c3260 100644 +--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp ++++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +@@ -524,6 +524,7 @@ private: + if (tidyMode == Mode::Disabled) + return; + ++ addXclangArg("-load", "libclangTidyPlugin.so"); + addXclangArg("-add-plugin", "clang-tidy"); + + if (tidyMode == Mode::File) +@@ -539,7 +540,8 @@ private: + if (checks.isEmpty()) + return; + +- addXclangArg("-add-plugin", "clang-lazy"); ++ addXclangArg("-load", "ClazyPlugin.so"); ++ addXclangArg("-add-plugin", "clazy"); + addXclangArg("-plugin-arg-clang-lazy", "enable-all-fixits"); + addXclangArg("-plugin-arg-clang-lazy", "no-autowrite-fixits"); + addXclangArg("-plugin-arg-clang-lazy", checks); +diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp +index d91724392e..75e1692f49 100644 +--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp ++++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp +@@ -83,6 +83,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis + + const ClangDiagnosticConfig::TidyMode tidyMode = m_diagnosticConfig.clangTidyMode(); + if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) { ++ addXclangArg(arguments, QString("-load"), QString("libclangTidyPlugin.so")); + addXclangArg(arguments, QString("-add-plugin"), QString("clang-tidy")); + if (tidyMode != ClangDiagnosticConfig::TidyMode::File) { + const QString tidyChecks = m_diagnosticConfig.clangTidyChecks(); +@@ -92,7 +93,8 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis + + const QString clazyChecks = m_diagnosticConfig.clazyChecks(); + if (!clazyChecks.isEmpty()) { +- addXclangArg(arguments, QString("-add-plugin"), QString("clang-lazy")); ++ addXclangArg(arguments, QString("-load"), QString("ClazyPlugin.so")); ++ addXclangArg(arguments, QString("-add-plugin"), QString("clazy")); + addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), QString("enable-all-fixits")); + addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), QString("no-autowrite-fixits")); + addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), m_diagnosticConfig.clazyChecks());