diff options
author | Jason A. Donenfeld <zx2c4@gentoo.org> | 2020-06-25 01:00:06 -0600 |
---|---|---|
committer | Jason A. Donenfeld <zx2c4@gentoo.org> | 2020-06-25 01:11:04 -0600 |
commit | bc68a1d9330ace294ef43e31bca5b5d430b73b39 (patch) | |
tree | 936f73c720b9a31781bad2dc118867288632bc62 /dev-qt/qt-creator/files | |
parent | app-arch/pet2tgz: remove old (diff) | |
download | gentoo-bc68a1d9330ace294ef43e31bca5b5d430b73b39.tar.gz gentoo-bc68a1d9330ace294ef43e31bca5b5d430b73b39.tar.bz2 gentoo-bc68a1d9330ace294ef43e31bca5b5d430b73b39.zip |
dev-qt/qt-creator: rollback change to apply Peter's work
This reverts commit b5b9383e897b618372ae474fedb68517738a0d04.
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>
Diffstat (limited to 'dev-qt/qt-creator/files')
-rw-r--r-- | dev-qt/qt-creator/files/qt-creator-4.12.3-clang-libs.patch | 24 | ||||
-rw-r--r-- | dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch | 13 |
2 files changed, 0 insertions, 37 deletions
diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.3-clang-libs.patch b/dev-qt/qt-creator/files/qt-creator-4.12.3-clang-libs.patch deleted file mode 100644 index a0cc8c54738b..000000000000 --- a/dev-qt/qt-creator/files/qt-creator-4.12.3-clang-libs.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri -index 08838838bc..bee3779484 100644 ---- a/src/shared/clang/clang_installation.pri -+++ b/src/shared/clang/clang_installation.pri -@@ -131,9 +131,7 @@ defineReplace(extractWarnings) { - return($$result) - } - --CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ -- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ -- -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic -+CLANGTOOLING_LIBS=-lclang-cpp - win32:CLANGTOOLING_LIBS += -lversion - - BIN_EXTENSION = -@@ -207,7 +205,7 @@ isEmpty(LLVM_VERSION) { - isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { - CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h - exists($$CLANGFORMAT_MAIN_HEADER) { -- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic -+ CLANGFORMAT_LIBS=-lclang-cpp - ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ - -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ - -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch b/dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch deleted file mode 100644 index d4ec515fe055..000000000000 --- a/dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp -index 166d1c94e0..de0b9cc67b 100644 ---- a/src/plugins/clangtools/clangtidyclazyrunner.cpp -+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp -@@ -67,7 +67,7 @@ static QStringList clazyPluginArguments(const ClangDiagnosticConfig diagnosticCo - QStringList arguments; - - if (diagnosticConfig.isClazyEnabled()) { -- arguments << XclangArgs({"-add-plugin", "clazy"}); -+ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", "clazy"}); - if (!diagnosticConfig.clazyChecks().isEmpty()) - arguments << XclangArgs({"-plugin-arg-clazy", diagnosticConfig.clazyChecks()}); - } |