commit: b5b9383e897b618372ae474fedb68517738a0d04 Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> AuthorDate: Thu Jun 25 06:12:58 2020 +0000 Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> CommitDate: Thu Jun 25 06:19:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b9383e
dev-qt/qt-creator: build with clang 10 and bump to 4.12.3 Closes: https://bugs.gentoo.org/723644 Closes: https://bugs.gentoo.org/722306 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org> dev-qt/qt-creator/Manifest | 2 +- .../files/qt-creator-4.12.3-clang-libs.patch | 24 ++++++++++++++++++++++ .../files/qt-creator-4.12.3-preload-plugins.patch | 13 ++++++++++++ ...ator-4.12.0.ebuild => qt-creator-4.12.3.ebuild} | 9 ++++++-- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index d7586825807..98c7d26ee6f 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,3 +1,3 @@ DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3 -DIST qt-creator-opensource-src-4.12.0.tar.xz 32575196 BLAKE2B 193e10a790f35944473c2177ba84e6e15d00effc769b4d63a51a217e4da93a4d6ca0061976d0def31c625a73d49b0adcb40e551d02a70ab7225b40f441d9b6b6 SHA512 9c35ebf095c2874b89af54b06fd190976a27f7e753a23e47db3b26947bdba64e4fe7774ae8b252867cf7f6f0c86b35d773a4012cae6d4aaa9101d7a31973f215 +DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450 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 new file mode 100644 index 00000000000..a0cc8c54738 --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-4.12.3-clang-libs.patch @@ -0,0 +1,24 @@ +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 new file mode 100644 index 00000000000..d4ec515fe05 --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch @@ -0,0 +1,13 @@ +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()}); + } diff --git a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild similarity index 97% rename from dev-qt/qt-creator/qt-creator-4.12.0.ebuild rename to dev-qt/qt-creator/qt-creator-4.12.3.ebuild index a4ca520e993..bfcf6f271e6 100644 --- a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LLVM_MAX_SLOT=9 +LLVM_MAX_SLOT=10 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" inherit llvm qmake-utils virtualx xdg @@ -59,7 +59,7 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clang? ( >=sys-devel/clang-9.0.1:= ) + clang? ( sys-devel/clang:10 ) designer? ( >=dev-qt/designer-${QT_PV} ) help? ( >=dev-qt/qthelp-${QT_PV} @@ -99,6 +99,11 @@ for x in ${PLOCALES}; do done unset x +PATCHES=( + "${FILESDIR}/${PN}"-4.12.3-clang-libs.patch + "${FILESDIR}/${PN}"-4.12.3-preload-plugins.patch +) + pkg_setup() { use clang && llvm_pkg_setup }
