diff options
Diffstat (limited to 'dev-qt/qt-creator')
-rw-r--r-- | dev-qt/qt-creator/Manifest | 8 | ||||
-rw-r--r-- | dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch | 84 | ||||
-rw-r--r-- | dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch | 64 | ||||
-rw-r--r-- | dev-qt/qt-creator/qt-creator-4.12.3.ebuild (renamed from dev-qt/qt-creator/qt-creator-4.12.0.ebuild) | 65 | ||||
-rw-r--r-- | dev-qt/qt-creator/qt-creator-9999.ebuild | 49 |
5 files changed, 241 insertions, 29 deletions
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 240d2b7a73a9..1b11631c8cf5 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,8 +1,10 @@ +AUX qt-creator-4.12.0-dylib-fix.patch 4022 BLAKE2B ea5d2b4a5daabc76515c1777a5df1738800d5cf79e9b52b60bb0d3d1c923b6d0daeb1f1a7e77f1e707aa7948f2a673f637e1e66bd3aa30f47c19ef89351114c5 SHA512 a81ed8b5616f816bc4ade87c159997f33a55c07417b93cbcbfc29f32fb36060370bf05f85cc94ac64297a7b33cf2852b3be2a8c7b99b58914085acd9dc533808 +AUX qt-creator-4.12.0-libclangformat-ide.patch 2463 BLAKE2B a99fc6e1354fde03ddbf60e5115fbec46fc5074353b5512973bb3802bb65d3401a4ac51e41a5d113ffea14faf85b48f334d97f21e210d173b534c6e2fdfec328 SHA512 f08a95d5e0e9201792f5c16e3b2a61e9a54f08a885e214ea237d3e49bad8d2d94a59cbdc35703641a1ed1ee4037f64bf7d6d6bbd4dab11fa153a3ac4ef67e050 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 EBUILD qt-creator-4.10.1.ebuild 6229 BLAKE2B 9681c8465616bfa0d2ae0c1968285603e6840213c4da1fe34de0ef191c394306c8a935d3080919a590c71bbd04deb6e96828eb95ff691c378696c5f21059f953 SHA512 224693d7cfbddb31bc01ccec252c59e79f82f990b4178bde8aa8d2b647bea8b0b283421cc2e0c2e6076b5caaa430e4b4ac8028ff21f87d0d5d9b24031693f67a -EBUILD qt-creator-4.12.0.ebuild 6338 BLAKE2B be92f41a4598ed751dd2d328d360bc8c4913f15d3bb6de6d6130fba2764caff9e87a703885f89e96cc9f5af05edc410f06d5182d380a4d565ee67dcfc54982ee SHA512 40f9da93e455e3cd8d7d89d92a0b1b53310f828df154871a9360e1c4a8d10b315e2f7d01e12abb55b3eb8a8799adeb15dcbde65916292bbfe25337d955035510 +EBUILD qt-creator-4.12.3.ebuild 7157 BLAKE2B b8496055e4c5fd6b97d80e3e9fc779f5789c30f615009c6b48440fef558f3f891630a4b7f17229985cc6148ae5a0beef32b9c960b248e6ae91e57538b8e0b30b SHA512 270cc34fcb6b32edeff23153cbab9ba78a7293cc024cdfd2a1162cf1eb779dcc551295e90a36f5be7d6a89205fbe62b46af5065579c0ed459b18ec8c62204345 EBUILD qt-creator-4.8.2.ebuild 5826 BLAKE2B c3b87e94ae39f69abbefd189fe52dd946dbece17de5a301b3b4a651a683770c5ca58c5f2afcea0237ef18bb0d80e53d69f5078bb0d219f0c114331da5456320a SHA512 7f01324288b26da063d3d1d4d93232f74d0c7a7ad9e481d872a045935265aa1bed200ec24ce2d90469f17bb9da3c7de5aeecb8b8be1d2a04c510c51c533c99c4 -EBUILD qt-creator-9999.ebuild 6358 BLAKE2B 186f2c620c33176dbd83491e9291d55b637f12d07c9b39767ecf4bb2321ca4ad2134831d3c3f789aea36d94e66f6efed896dadd18bf25db055c33b7fbda9a6a6 SHA512 c67d24ea242ffd2a729d36894a6a8511e844ef4a41e1d150a004bac6b23d9b9ff9a6b54f8e96195745c77e3032568a20c4cc36dea966a80094afad57340243e2 +EBUILD qt-creator-9999.ebuild 7157 BLAKE2B b8496055e4c5fd6b97d80e3e9fc779f5789c30f615009c6b48440fef558f3f891630a4b7f17229985cc6148ae5a0beef32b9c960b248e6ae91e57538b8e0b30b SHA512 270cc34fcb6b32edeff23153cbab9ba78a7293cc024cdfd2a1162cf1eb779dcc551295e90a36f5be7d6a89205fbe62b46af5065579c0ed459b18ec8c62204345 MISC metadata.xml 3297 BLAKE2B 02d12b1d65d5791fe108f75d76f01804d363c933b5b50317a2976d5a3099bf36c2a78d40390a6e16e341b462c7b7a86c0da1f1be9ca4e9cb29ea9e24285227dd SHA512 0597fb87fe7f82c0a4502c0299a0b0d6ab981d8923c1db58f0c26102a93507a8ec75005430a2c538a2621c37936b662a6f0acfc2c7168bc2d608cb3ed44db2cf diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch new file mode 100644 index 000000000000..0d4deb2c7956 --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch @@ -0,0 +1,84 @@ +From 1c5faa6dcf16135ee31252d13766d01536a69405 Mon Sep 17 00:00:00 2001 +From: Peter Levine <plevine457@gmail.com> +Date: Tue, 5 May 2020 03:45:35 -0400 +Subject: [PATCH] Fix building against clang configured with + CLANG_LINK_CLANG_DYLIB + +LLVM/Clang upstream only officially supports building shared +components as a single dynamic library (via +LLVM_BUILD_LLVM_DYLIB=ON, CLANG_LINK_CLANG_DYLIB=ON, etc..). +Linux distros like Fedora and Gentoo have followed suit. + +Unfortunately, QT-Creator's src/shared/clang/clang_installation.pri +file assumes clang is built with separate component libraries +and the build fails. + +This change alters the build to check for the existence +of clang component libraries and, if found, link to them, or +otherwise to libclang-cpp. + +Task-number: QTCREATORBUG-23172 +Change-Id: I17df5822d7aeb471227f21f2cf4a71871d6f9b86 +--- + src/shared/clang/clang_installation.pri | 35 +++++++++++++++---------- + 1 file changed, 21 insertions(+), 14 deletions(-) + +diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri +index 08838838bca..c191c57f1c7 100644 +--- a/src/shared/clang/clang_installation.pri ++++ b/src/shared/clang/clang_installation.pri +@@ -204,19 +204,6 @@ 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 +- ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ +- -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ +- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ +- -lclangASTMatchers -lclangAST -lclangLex -lclangBasic +- win32:CLANGFORMAT_LIBS += -lversion +- } +- } +- win32:ALL_CLANG_LIBS += -lversion +- + LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h + !exists($$LIBCLANG_MAIN_HEADER) { + $$llvmWarningOrError(\ +@@ -237,10 +224,30 @@ isEmpty(LLVM_VERSION) { + LIBCLANG_LIBS += $${CLANG_LIB} + + isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { ++ CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h ++ exists($$CLANGFORMAT_MAIN_HEADER) { ++ exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) { ++ CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic ++ ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ ++ -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ ++ -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ ++ -lclangASTMatchers -lclangAST -lclangLex -lclangBasic ++ win32:CLANGFORMAT_LIBS += -lversion ++ win32:ALL_CLANG_LIBS += -lversion ++ } else { ++ CLANGFORMAT_LIBS=-lclang-cpp ++ ALL_CLANG_LIBS=-lclang-cpp ++ } ++ } ++ + QTC_DISABLE_CLANG_REFACTORING=$$(QTC_DISABLE_CLANG_REFACTORING) + isEmpty(QTC_DISABLE_CLANG_REFACTORING) { + !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR} +- LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS ++ exists($${LLVM_LIBDIR}/libclangTooling.so*)|exists($${LLVM_LIBDIR}/libclangTooling.dylib) { ++ LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS ++ } else { ++ LIBTOOLING_LIBS += -lclang-cpp $$LLVM_STATIC_LIBS ++ } + } + } + +-- +2.26.2 + diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch b/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch new file mode 100644 index 000000000000..12c46c89ed0e --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch @@ -0,0 +1,64 @@ +--- a/src/plugins/clangformat/clangformatbaseindenter.h ++++ b/src/plugins/clangformat/clangformatbaseindenter.h +@@ -27,7 +27,7 @@ + + #include <texteditor/indenter.h> + +-#include <clang/Format/Format.h> ++#include <clang/Format/FormatIDE.h> + + namespace ClangFormat { + +--- a/src/plugins/clangformat/clangformatconfigwidget.cpp ++++ b/src/plugins/clangformat/clangformatconfigwidget.cpp +@@ -32,7 +32,7 @@ + #include "ui_clangformatchecks.h" + #include "ui_clangformatconfigwidget.h" + +-#include <clang/Format/Format.h> ++#include <clang/Format/FormatIDE.h> + + #include <coreplugin/icore.h> + #include <cppeditor/cpphighlighter.h> +--- a/src/plugins/clangformat/clangformatplugin.cpp ++++ b/src/plugins/clangformat/clangformatplugin.cpp +@@ -56,7 +56,7 @@ + #include <texteditor/icodestylepreferences.h> + #include <texteditor/texteditorsettings.h> + +-#include <clang/Format/Format.h> ++#include <clang/Format/FormatIDE.h> + + #include <utils/algorithm.h> + +--- a/src/plugins/clangformat/clangformatutils.h ++++ b/src/plugins/clangformat/clangformatutils.h +@@ -27,7 +27,7 @@ + + #include <coreplugin/id.h> + #include <utils/fileutils.h> +-#include <clang/Format/Format.h> ++#include <clang/Format/FormatIDE.h> + + #include <QFile> + +--- a/src/shared/clang/clang_installation.pri ++++ b/src/shared/clang/clang_installation.pri +@@ -227,7 +227,7 @@ + CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h + exists($$CLANGFORMAT_MAIN_HEADER) { + exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) { +- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic ++ CLANGFORMAT_LIBS=-lclangFormatIDE -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic + ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ + -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ + -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ +@@ -235,7 +235,7 @@ + win32:CLANGFORMAT_LIBS += -lversion + win32:ALL_CLANG_LIBS += -lversion + } else { +- CLANGFORMAT_LIBS=-lclang-cpp ++ CLANGFORMAT_LIBS=-lclangFormatIDE -lclang-cpp + ALL_CLANG_LIBS=-lclang-cpp + } + } diff --git a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild index a4ca520e9938..ff58c169e4e0 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 @@ -20,32 +20,38 @@ else MY_P=${PN}-opensource-src-${MY_PV} [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~x86" S=${WORKDIR}/${MY_P} fi -# TODO: unbundle sqlite and KSyntaxHighlighting +# TODO: unbundle sqlite QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt '+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase - cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios +lsp:languageclient - mercurial modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager - +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion - valgrind winrt) + cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios + lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python + qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal + silversearcher subversion valgrind webassembly winrt) IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}" RESTRICT="!test? ( test )" REQUIRED_USE=" - clang? ( test? ( qbs ) ) - qnx? ( remotelinux ) boot2qt? ( remotelinux ) + clang? ( test? ( qbs ) ) + mcu? ( cmake ) python? ( lsp ) + qnx? ( remotelinux ) " # minimum Qt version required QT_PV="5.12.3:5" +BDEPEND=" + >=dev-qt/linguist-tools-${QT_PV} + virtual/pkgconfig + doc? ( >=dev-qt/qdoc-${QT_PV} ) +" CDEPEND=" - >=dev-cpp/yaml-cpp-0.6.2 + >=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-${QT_PV} >=dev-qt/qtcore-${QT_PV} >=dev-qt/qtdeclarative-${QT_PV}[widgets] @@ -59,7 +65,16 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clang? ( >=sys-devel/clang-9.0.1:= ) + kde-frameworks/syntax-highlighting:5 + clang? ( + || ( + ( sys-devel/clang:10 + dev-libs/libclangformat-ide:10 ) + ( sys-devel/clang:9 + dev-libs/libclangformat-ide:9 ) + ) + <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= + ) designer? ( >=dev-qt/designer-${QT_PV} ) help? ( >=dev-qt/qthelp-${QT_PV} @@ -71,9 +86,6 @@ CDEPEND=" systemd? ( sys-apps/systemd:= ) " DEPEND="${CDEPEND} - >=dev-qt/linguist-tools-${QT_PV} - virtual/pkgconfig - doc? ( >=dev-qt/qdoc-${QT_PV} ) test? ( >=dev-qt/qtdeclarative-${QT_PV}[localstorage] >=dev-qt/qtquickcontrols2-${QT_PV} @@ -88,6 +100,7 @@ RDEPEND="${CDEPEND} cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) + qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) @@ -99,6 +112,16 @@ for x in ${PLOCALES}; do done unset x +PATCHES=( + "${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch + "${FILESDIR}"/${PN}-4.12.0-libclangformat-ide.patch +) + +llvm_check_deps() { + has_version -d "sys-devel/clang:${LLVM_SLOT}" && \ + has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}" +} + pkg_setup() { use clang && llvm_pkg_setup } @@ -131,8 +154,8 @@ src_prepare() { sed -i -e '/modelinglib/d' src/libs/libs.pro || die fi if ! use perfprofiler; then - rm -rf src/tools/perfparser || die - if ! use qmlprofiler && ! use ctfvisualizer; then + rm -r src/tools/perfparser || die + if ! use ctfvisualizer && ! use qmlprofiler; then sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die fi fi @@ -169,13 +192,21 @@ src_prepare() { done sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die + # remove bundled syntax-highlighting + rm -r src/libs/3rdparty/syntax-highlighting || die + + # remove bundled yaml-cpp + rm -r src/libs/3rdparty/yaml-cpp || die + # remove bundled qbs - rm -rf src/shared/qbs || die + rm -r src/shared/qbs || die } src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ + KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ + KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \ $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index c6649849153f..ff58c169e4e0 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LLVM_MAX_SLOT=8 +LLVM_MAX_SLOT=10 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" inherit llvm qmake-utils virtualx xdg @@ -20,11 +20,11 @@ else MY_P=${PN}-opensource-src-${MY_PV} [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~x86" S=${WORKDIR}/${MY_P} fi -# TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting +# TODO: unbundle sqlite QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt '+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase @@ -45,7 +45,13 @@ REQUIRED_USE=" # minimum Qt version required QT_PV="5.12.3:5" +BDEPEND=" + >=dev-qt/linguist-tools-${QT_PV} + virtual/pkgconfig + doc? ( >=dev-qt/qdoc-${QT_PV} ) +" CDEPEND=" + >=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-${QT_PV} >=dev-qt/qtcore-${QT_PV} >=dev-qt/qtdeclarative-${QT_PV}[widgets] @@ -59,7 +65,16 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clang? ( sys-devel/clang:8= ) + kde-frameworks/syntax-highlighting:5 + clang? ( + || ( + ( sys-devel/clang:10 + dev-libs/libclangformat-ide:10 ) + ( sys-devel/clang:9 + dev-libs/libclangformat-ide:9 ) + ) + <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= + ) designer? ( >=dev-qt/designer-${QT_PV} ) help? ( >=dev-qt/qthelp-${QT_PV} @@ -71,9 +86,6 @@ CDEPEND=" systemd? ( sys-apps/systemd:= ) " DEPEND="${CDEPEND} - >=dev-qt/linguist-tools-${QT_PV} - virtual/pkgconfig - doc? ( >=dev-qt/qdoc-${QT_PV} ) test? ( >=dev-qt/qtdeclarative-${QT_PV}[localstorage] >=dev-qt/qtquickcontrols2-${QT_PV} @@ -88,6 +100,7 @@ RDEPEND="${CDEPEND} cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) + qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) @@ -99,6 +112,16 @@ for x in ${PLOCALES}; do done unset x +PATCHES=( + "${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch + "${FILESDIR}"/${PN}-4.12.0-libclangformat-ide.patch +) + +llvm_check_deps() { + has_version -d "sys-devel/clang:${LLVM_SLOT}" && \ + has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}" +} + pkg_setup() { use clang && llvm_pkg_setup } @@ -131,7 +154,7 @@ src_prepare() { sed -i -e '/modelinglib/d' src/libs/libs.pro || die fi if ! use perfprofiler; then - rm -rf src/tools/perfparser || die + rm -r src/tools/perfparser || die if ! use ctfvisualizer && ! use qmlprofiler; then sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die fi @@ -169,13 +192,21 @@ src_prepare() { done sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die + # remove bundled syntax-highlighting + rm -r src/libs/3rdparty/syntax-highlighting || die + + # remove bundled yaml-cpp + rm -r src/libs/3rdparty/yaml-cpp || die + # remove bundled qbs - rm -rf src/shared/qbs || die + rm -r src/shared/qbs || die } src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ + KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ + KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \ $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ |