feedc0de/qtcreator-arch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Clang plugin patch

Browse Source
This commit is contained in:
Rodrigo Bezerra
2019-05-03 17:13:22 -03:00
parent 38a0ccfda2
commit 2e53efd6e2
3 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.SRCINFO
View File

@@ -1,6 +1,6 @@
pkgbase = qtcreator-git pkgbase = qtcreator-git
pkgdesc = Lightweight, cross-platform integrated development environment pkgdesc = Lightweight, cross-platform integrated development environment
pkgver = v4.9.0.rc1.r328.ged87b74a59 pkgver = v4.9.0.r473.g1de548d1cb
pkgrel = 1 pkgrel = 1
url = https://www.qt.io url = https://www.qt.io
arch = x86_64 arch = x86_64
@@ -38,7 +38,7 @@ pkgbase = qtcreator-git
source = qtcreator-clang-plugins.patch source = qtcreator-clang-plugins.patch
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
sha256sums = 955e2ec0de1ea0fd2994d04dfb9a04e74513e4f3fe189e76dd4a256fd9c864eb sha256sums = 26382c282c36aa6716af2deadae864ed21ffba0dd568f9b8f8f8048ce304f436
pkgname = qtcreator-git pkgname = qtcreator-git

4
PKGBUILD
View File

@@ -8,7 +8,7 @@
# Contributor: Tobias Hunger <tobias dot hunger at gmail dot com> # Contributor: Tobias Hunger <tobias dot hunger at gmail dot com>
pkgname=qtcreator-git pkgname=qtcreator-git
pkgver=v4.9.0.rc1.r328.ged87b74a59 pkgver=v4.9.0.r473.g1de548d1cb
pkgrel=1 pkgrel=1
pkgdesc='Lightweight, cross-platform integrated development environment' pkgdesc='Lightweight, cross-platform integrated development environment'
arch=('x86_64') arch=('x86_64')
@@ -36,7 +36,7 @@ source=('git+https://code.qt.io/qt-creator/qt-creator.git'
'qtcreator-clang-plugins.patch') 'qtcreator-clang-plugins.patch')
sha256sums=('SKIP' sha256sums=('SKIP'
'SKIP' 'SKIP'
'955e2ec0de1ea0fd2994d04dfb9a04e74513e4f3fe189e76dd4a256fd9c864eb') '26382c282c36aa6716af2deadae864ed21ffba0dd568f9b8f8f8048ce304f436')
pkgver() { pkgver() {
cd qt-creator cd qt-creator

48
qtcreator-clang-plugins.patch
View File

@@ -1,47 +1,43 @@
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp diff '--color=auto' --unified --recursive --text qt-creator.orig/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp qt-creator.new/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 706c5101a3..0f7af62dba 100644 --- qt-creator.orig/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp 2019-05-03 16:09:59.000000000 -0300
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +++ qt-creator.new/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp 2019-05-03 15:57:36.000000000 -0300
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp @@ -511,6 +511,7 @@
@@ -511,6 +511,7 @@ private:
if (tidyMode == Mode::Disabled) if (tidyMode == Mode::Disabled)
return; return;
+ m_options.append(CppTools::XclangArgs({"-load", "libclangTidyPlugin.so"})); + m_options.append(CppTools::XclangArgs({"-load", "libclangTidyPlugin.so"}));
m_options.append(CppTools::XclangArgs({"-add-plugin", "clang-tidy"})); m_options.append(CppTools::XclangArgs({"-add-plugin", "clang-tidy"}));
if (tidyMode == Mode::File) if (tidyMode == Mode::File)
@@ -526,8 +527,8 @@ private: @@ -526,8 +527,8 @@
if (checks.isEmpty()) if (checks.isEmpty())
return; return;
- m_options.append(CppTools::XclangArgs({"-add-plugin", - m_options.append(CppTools::XclangArgs({"-add-plugin",
- "clang-lazy", - "clazy",
+ m_options.append(CppTools::XclangArgs({"-load", "ClazyPlugin.so", + m_options.append(CppTools::XclangArgs({"-load", "ClazyPlugin.so",
+ "-add-plugin", "clazy", + "-add-plugin", "clazy",
"-plugin-arg-clang-lazy", "-plugin-arg-clazy",
"enable-all-fixits", "enable-all-fixits",
"-plugin-arg-clang-lazy", "-plugin-arg-clazy",
diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp diff '--color=auto' --unified --recursive --text qt-creator.orig/src/plugins/clangtools/clangtidyclazyrunner.cpp qt-creator.new/src/plugins/clangtools/clangtidyclazyrunner.cpp
index a580704243..42c4319240 100644 --- qt-creator.orig/src/plugins/clangtools/clangtidyclazyrunner.cpp 2019-05-03 16:09:59.000000000 -0300
--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp +++ qt-creator.new/src/plugins/clangtools/clangtidyclazyrunner.cpp 2019-05-03 16:02:39.000000000 -0300
+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp @@ -76,6 +76,7 @@
@@ -76,6 +76,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
const ClangDiagnosticConfig::TidyMode tidyMode = m_diagnosticConfig.clangTidyMode(); const ClangDiagnosticConfig::TidyMode tidyMode = m_diagnosticConfig.clangTidyMode();
if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) { if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) {
+ arguments << XclangArgs({"-load", "libclangTidyPlugin.so"}); + arguments << XclangArgs({"-load", "libclangTidyPlugin.so"});
arguments << XclangArgs({"-add-plugin", "clang-tidy"}); arguments << XclangArgs({"-add-plugin", "clang-tidy"});
if (tidyMode != ClangDiagnosticConfig::TidyMode::File) { if (tidyMode != ClangDiagnosticConfig::TidyMode::File) {
const QString tidyChecks = m_diagnosticConfig.clangTidyChecks(); const QString tidyChecks = m_diagnosticConfig.clangTidyChecks();
@@ -85,8 +86,9 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis @@ -85,7 +86,8 @@
const QString clazyChecks = m_diagnosticConfig.clazyChecks(); const QString clazyChecks = m_diagnosticConfig.clazyChecks();
if (!clazyChecks.isEmpty()) { if (!clazyChecks.isEmpty()) {
- arguments << XclangArgs({"-add-plugin", - arguments << XclangArgs({"-add-plugin",
- "clang-lazy",
+ arguments << XclangArgs({"-load", "ClazyPlugin.so", + arguments << XclangArgs({"-load", "ClazyPlugin.so",
+ "-add-plugin", + "-add-plugin",
+ "clazy", "clazy",
"-plugin-arg-clang-lazy", "-plugin-arg-clazy",
"enable-all-fixits", "enable-all-fixits",
"-plugin-arg-clang-lazy",