Date: Wednesday, June 19, 2019 @ 12:49:46 Author: arojas Revision: 356560
archrelease: copy trunk to staging-x86_64 Added: qtcreator/repos/staging-x86_64/ qtcreator/repos/staging-x86_64/PKGBUILD (from rev 356558, qtcreator/trunk/PKGBUILD) qtcreator/repos/staging-x86_64/qtcreator-clazy-1.5.patch (from rev 356558, qtcreator/trunk/qtcreator-clazy-1.5.patch) qtcreator/repos/staging-x86_64/qtcreator-preload-plugins.patch (from rev 356558, qtcreator/trunk/qtcreator-preload-plugins.patch) ---------------------------------+ PKGBUILD | 76 ++++++++++++++++++++++++++++++++++++++ qtcreator-clazy-1.5.patch | 45 ++++++++++++++++++++++ qtcreator-preload-plugins.patch | 21 ++++++++++ 3 files changed, 142 insertions(+) Copied: qtcreator/repos/staging-x86_64/PKGBUILD (from rev 356558, qtcreator/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2019-06-19 12:49:46 UTC (rev 356560) @@ -0,0 +1,76 @@ +# 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.9.1 +_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 syntax-highlighting desktop-file-utils) +makedepends=(llvm python patchelf) +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-clazy-1.5.patch + qtcreator-preload-plugins.patch) +sha256sums=('79b8228d0871927837681e6af9ab91e3ea28154cecfba317f9c0e56246b8ad81' + '1f6998fea92b9a157f42cca783839ce95f70ccc667027078b7881cbb253838f0' + '150c444e76ec969fc8765774b648984037829623300d0ce9d41a915b2afa792d') + +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 + sed -e 's|libexec|lib|g' -i src/tools/tools.pro + # use system qbs + rm -r src/shared/qbs + # Adapt to clazy 1.5 plugin rename + patch -p1 -i ../qtcreator-clazy-1.5.patch + # Preload analyzer plugins, 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-preload-plugins.patch +} + +build() { + cd build + + qmake LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr \ + KSYNTAXHIGHLIGHTING_LIB_DIR=/usr/lib KSYNTAXHIGHLIGHTING_INCLUDE_DIR=/usr/include/KF5/KSyntaxHighlighting \ + 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 + +# Link clazy plugin explicitely + patchelf --add-needed ClazyPlugin.so "$pkgdir"/usr/lib/qtcreator/clangbackend +} Copied: qtcreator/repos/staging-x86_64/qtcreator-clazy-1.5.patch (from rev 356558, qtcreator/trunk/qtcreator-clazy-1.5.patch) =================================================================== --- staging-x86_64/qtcreator-clazy-1.5.patch (rev 0) +++ staging-x86_64/qtcreator-clazy-1.5.patch 2019-06-19 12:49:46 UTC (rev 356560) @@ -0,0 +1,45 @@ +diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +index 706c5101a3..dbfaeb8457 100644 +--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp ++++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +@@ -527,14 +528,14 @@ private: + return; + + m_options.append(CppTools::XclangArgs({"-add-plugin", +- "clang-lazy", +- "-plugin-arg-clang-lazy", ++ "clazy", ++ "-plugin-arg-clazy", + "enable-all-fixits", +- "-plugin-arg-clang-lazy", ++ "-plugin-arg-clazy", + "no-autowrite-fixits", +- "-plugin-arg-clang-lazy", ++ "-plugin-arg-clazy", + checks, +- "-plugin-arg-clang-lazy", ++ "-plugin-arg-clazy", + "ignore-included-files"})); + } + +diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp +index a580704243..7a8740a5cc 100644 +--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp ++++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp +@@ -86,12 +87,12 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis + const QString clazyChecks = m_diagnosticConfig.clazyChecks(); + if (!clazyChecks.isEmpty()) { + arguments << XclangArgs({"-add-plugin", +- "clang-lazy", +- "-plugin-arg-clang-lazy", ++ "clazy", ++ "-plugin-arg-clazy", + "enable-all-fixits", +- "-plugin-arg-clang-lazy", ++ "-plugin-arg-clazy", + "no-autowrite-fixits", +- "-plugin-arg-clang-lazy", ++ "-plugin-arg-clazy", + m_diagnosticConfig.clazyChecks()}); + } + Copied: qtcreator/repos/staging-x86_64/qtcreator-preload-plugins.patch (from rev 356558, qtcreator/trunk/qtcreator-preload-plugins.patch) =================================================================== --- staging-x86_64/qtcreator-preload-plugins.patch (rev 0) +++ staging-x86_64/qtcreator-preload-plugins.patch 2019-06-19 12:49:46 UTC (rev 356560) @@ -0,0 +1,21 @@ +diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp +index a580704243..7a8740a5cc 100644 +--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp ++++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp +@@ -76,6 +76,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis + + const ClangDiagnosticConfig::TidyMode tidyMode = m_diagnosticConfig.clangTidyMode(); + if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) { ++ arguments << XclangArgs({"-load", "libclangTidyPlugin.so"}); + arguments << XclangArgs({"-add-plugin", "clang-tidy"}); + if (tidyMode != ClangDiagnosticConfig::TidyMode::File) { + const QString tidyChecks = m_diagnosticConfig.clangTidyChecks(); +@@ -85,7 +86,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis + + const QString clazyChecks = m_diagnosticConfig.clazyChecks(); + if (!clazyChecks.isEmpty()) { +- arguments << XclangArgs({"-add-plugin", ++ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", + "clazy", + "-plugin-arg-clazy", + "enable-all-fixits",