| 1 |
commit: bc68a1d9330ace294ef43e31bca5b5d430b73b39 |
| 2 |
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 25 07:00:06 2020 +0000 |
| 4 |
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 25 07:11:04 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc68a1d9 |
| 7 |
|
| 8 |
dev-qt/qt-creator: rollback change to apply Peter's work |
| 9 |
|
| 10 |
This reverts commit b5b9383e897b618372ae474fedb68517738a0d04. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 13 |
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-qt/qt-creator/Manifest | 2 +- |
| 16 |
.../files/qt-creator-4.12.3-clang-libs.patch | 24 ---------------------- |
| 17 |
.../files/qt-creator-4.12.3-preload-plugins.patch | 13 ------------ |
| 18 |
...ator-4.12.3.ebuild => qt-creator-4.12.0.ebuild} | 9 ++------ |
| 19 |
4 files changed, 3 insertions(+), 45 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest |
| 22 |
index 98c7d26ee6f..d7586825807 100644 |
| 23 |
--- a/dev-qt/qt-creator/Manifest |
| 24 |
+++ b/dev-qt/qt-creator/Manifest |
| 25 |
@@ -1,3 +1,3 @@ |
| 26 |
DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3 |
| 27 |
-DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf |
| 28 |
+DIST qt-creator-opensource-src-4.12.0.tar.xz 32575196 BLAKE2B 193e10a790f35944473c2177ba84e6e15d00effc769b4d63a51a217e4da93a4d6ca0061976d0def31c625a73d49b0adcb40e551d02a70ab7225b40f441d9b6b6 SHA512 9c35ebf095c2874b89af54b06fd190976a27f7e753a23e47db3b26947bdba64e4fe7774ae8b252867cf7f6f0c86b35d773a4012cae6d4aaa9101d7a31973f215 |
| 29 |
DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450 |
| 30 |
|
| 31 |
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 |
| 32 |
deleted file mode 100644 |
| 33 |
index a0cc8c54738..00000000000 |
| 34 |
--- a/dev-qt/qt-creator/files/qt-creator-4.12.3-clang-libs.patch |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,24 +0,0 @@ |
| 37 |
-diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri |
| 38 |
-index 08838838bc..bee3779484 100644 |
| 39 |
---- a/src/shared/clang/clang_installation.pri |
| 40 |
-+++ b/src/shared/clang/clang_installation.pri |
| 41 |
-@@ -131,9 +131,7 @@ defineReplace(extractWarnings) { |
| 42 |
- return($$result) |
| 43 |
- } |
| 44 |
- |
| 45 |
--CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ |
| 46 |
-- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ |
| 47 |
-- -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic |
| 48 |
-+CLANGTOOLING_LIBS=-lclang-cpp |
| 49 |
- win32:CLANGTOOLING_LIBS += -lversion |
| 50 |
- |
| 51 |
- BIN_EXTENSION = |
| 52 |
-@@ -207,7 +205,7 @@ isEmpty(LLVM_VERSION) { |
| 53 |
- isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { |
| 54 |
- CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h |
| 55 |
- exists($$CLANGFORMAT_MAIN_HEADER) { |
| 56 |
-- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic |
| 57 |
-+ CLANGFORMAT_LIBS=-lclang-cpp |
| 58 |
- ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ |
| 59 |
- -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ |
| 60 |
- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ |
| 61 |
|
| 62 |
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 |
| 63 |
deleted file mode 100644 |
| 64 |
index d4ec515fe05..00000000000 |
| 65 |
--- a/dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch |
| 66 |
+++ /dev/null |
| 67 |
@@ -1,13 +0,0 @@ |
| 68 |
-diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp |
| 69 |
-index 166d1c94e0..de0b9cc67b 100644 |
| 70 |
---- a/src/plugins/clangtools/clangtidyclazyrunner.cpp |
| 71 |
-+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp |
| 72 |
-@@ -67,7 +67,7 @@ static QStringList clazyPluginArguments(const ClangDiagnosticConfig diagnosticCo |
| 73 |
- QStringList arguments; |
| 74 |
- |
| 75 |
- if (diagnosticConfig.isClazyEnabled()) { |
| 76 |
-- arguments << XclangArgs({"-add-plugin", "clazy"}); |
| 77 |
-+ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", "clazy"}); |
| 78 |
- if (!diagnosticConfig.clazyChecks().isEmpty()) |
| 79 |
- arguments << XclangArgs({"-plugin-arg-clazy", diagnosticConfig.clazyChecks()}); |
| 80 |
- } |
| 81 |
|
| 82 |
diff --git a/dev-qt/qt-creator/qt-creator-4.12.3.ebuild b/dev-qt/qt-creator/qt-creator-4.12.0.ebuild |
| 83 |
similarity index 97% |
| 84 |
rename from dev-qt/qt-creator/qt-creator-4.12.3.ebuild |
| 85 |
rename to dev-qt/qt-creator/qt-creator-4.12.0.ebuild |
| 86 |
index bfcf6f271e6..a4ca520e993 100644 |
| 87 |
--- a/dev-qt/qt-creator/qt-creator-4.12.3.ebuild |
| 88 |
+++ b/dev-qt/qt-creator/qt-creator-4.12.0.ebuild |
| 89 |
@@ -2,7 +2,7 @@ |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
|
| 92 |
EAPI=7 |
| 93 |
-LLVM_MAX_SLOT=10 |
| 94 |
+LLVM_MAX_SLOT=9 |
| 95 |
PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" |
| 96 |
|
| 97 |
inherit llvm qmake-utils virtualx xdg |
| 98 |
@@ -59,7 +59,7 @@ CDEPEND=" |
| 99 |
>=dev-qt/qtwidgets-${QT_PV} |
| 100 |
>=dev-qt/qtx11extras-${QT_PV} |
| 101 |
>=dev-qt/qtxml-${QT_PV} |
| 102 |
- clang? ( sys-devel/clang:10 ) |
| 103 |
+ clang? ( >=sys-devel/clang-9.0.1:= ) |
| 104 |
designer? ( >=dev-qt/designer-${QT_PV} ) |
| 105 |
help? ( |
| 106 |
>=dev-qt/qthelp-${QT_PV} |
| 107 |
@@ -99,11 +99,6 @@ for x in ${PLOCALES}; do |
| 108 |
done |
| 109 |
unset x |
| 110 |
|
| 111 |
-PATCHES=( |
| 112 |
- "${FILESDIR}/${PN}"-4.12.3-clang-libs.patch |
| 113 |
- "${FILESDIR}/${PN}"-4.12.3-preload-plugins.patch |
| 114 |
-) |
| 115 |
- |
| 116 |
pkg_setup() { |
| 117 |
use clang && llvm_pkg_setup |
| 118 |
} |
Archives