diff options
Diffstat (limited to 'dev-qt/qt-creator/qt-creator-9999.ebuild')
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-9999.ebuild | 49 |
1 files changed, 40 insertions, 9 deletions
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 \ |