# HG changeset patch # User gabriel # Date 1635545291 -3600 # Node ID 261f7eadb5ac643a86e8dbc3cdb481ec986b72bb # Parent abb6a36085ad3dd6cb928cdd4ea10beed3f9bb19 Remove qt-creator from overlay diff -r abb6a36085ad -r 261f7eadb5ac dev-qt/qt-creator/Manifest --- a/dev-qt/qt-creator/Manifest Sat Aug 07 16:31:38 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -AUX qt-creator-4.14.0-libclangformat-ide.patch 3155 BLAKE2B cbc0367e3ac6a6ad5e91b2fbaff7d1f7775e2bb0ee99dbc97918d0f744af9fed6d83dc24cfdb59bd78cbf7a1716463e008a342b8df1389d1ab3f2929d8f73bb8 SHA512 e55956f112832f4e119b9cbc6efa72d8ccef2030e1b4f42cd8057fbffc7646ef493540560b1c5a0b70268d38c144ad845ad5412be466513f87094a77280e4569 -DIST qt-creator-opensource-src-4.14.0.tar.xz 43452172 BLAKE2B 6f37191ba952a42aee40ec38bdcc9f8ce61178b207aa4bb5ae23866229b4511f2cf24af9d086628ecb65b8c10bb6056bf3c2f2b787ff60afafaf12ac4e5ee90d SHA512 7cf74d3f6a25a55cb6b0eca584b41727f8ee467f2901ab27d1f5de40d0d7635c560af87d38e2a17a168ea74755d28928c911aa7d07e1684160dfa7df1c4e27e9 -EBUILD qt-creator-4.14.0.ebuild 7241 BLAKE2B b77186363ec09d5ebf1dbe3551ff3b4e853ca326e1fef08b5c0fbe74d67f7ff19cb587c12371407aacfab50b8b3e9cb2275b28165fa2aa8f8ebb475e61d5f094 SHA512 cd883a9c12c70a8ff6e03e28c45688282a9d51704a68c7cdc2bca65a76437d1192cd9215c9467a4b92dcaefc63b83cc2d92786037fcaf9a5e2f916da4b0f0a8f diff -r abb6a36085ad -r 261f7eadb5ac dev-qt/qt-creator/files/qt-creator-4.14.0-libclangformat-ide.patch --- a/dev-qt/qt-creator/files/qt-creator-4.14.0-libclangformat-ide.patch Sat Aug 07 16:31:38 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -diff --git a/src/plugins/clangformat/clangformatbaseindenter.h b/src/plugins/clangformat/clangformatbaseindenter.h -index 00dc3e9c..2c1cf48f 100644 ---- a/src/plugins/clangformat/clangformatbaseindenter.h -+++ b/src/plugins/clangformat/clangformatbaseindenter.h -@@ -27,7 +27,7 @@ - - #include - --#include -+#include - - namespace ClangFormat { - -diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp -index f1fa2c82..b2e552e9 100644 ---- 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 -+#include - - #include - #include -diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp -index 9b76a086..840efe1f 100644 ---- a/src/plugins/clangformat/clangformatplugin.cpp -+++ b/src/plugins/clangformat/clangformatplugin.cpp -@@ -56,7 +56,7 @@ - #include - #include - --#include -+#include - - #include - -diff --git a/src/plugins/clangformat/clangformatutils.h b/src/plugins/clangformat/clangformatutils.h -index 74fd84c9..c455d25f 100644 ---- a/src/plugins/clangformat/clangformatutils.h -+++ b/src/plugins/clangformat/clangformatutils.h -@@ -28,7 +28,7 @@ - #include - #include - --#include -+#include - - #include - -diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri -index 28c2d0d..52a5442 100644 ---- a/src/shared/clang/clang_installation.pri -+++ b/src/shared/clang/clang_installation.pri -@@ -204,14 +204,14 @@ isEmpty(LLVM_VERSION) { - CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h - exists($$CLANGFORMAT_MAIN_HEADER) { - exists($$LLVM_LIBDIR/*clangBasic*) { -- 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 \ - -lclangASTMatchers -lclangAST -lclangLex -lclangBasic - win32:CLANGFORMAT_LIBS += -lversion - } else { -- CLANGFORMAT_LIBS = -lclang-cpp -+ CLANGFORMAT_LIBS = -lclangFormatIDE -lclang-cpp - ALL_CLANG_LIBS = -lclang-cpp - } - } diff -r abb6a36085ad -r 261f7eadb5ac dev-qt/qt-creator/qt-creator-4.14.0.ebuild --- a/dev-qt/qt-creator/qt-creator-4.14.0.ebuild Sat Aug 07 16:31:38 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,237 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -LLVM_MAX_SLOT=11 -PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" - -inherit llvm qmake-utils virtualx xdg - -DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" -HOMEPAGE="https://doc.qt.io/qtcreator/" -LICENSE="GPL-3" -SLOT="0" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git" -else - MY_PV=${PV/_/-} - 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" - S=${WORKDIR}/${MY_P} -fi - -# TODO: unbundle sqlite - -QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal beautifier boot2qt - '+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase - 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=" - boot2qt? ( remotelinux ) - clang? ( test? ( qbs ) ) - mcu? ( cmake ) - python? ( lsp ) - qnx? ( remotelinux ) -" - -# minimum Qt version required -QT_PV="5.14.0: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] - >=dev-qt/qtgui-${QT_PV} - >=dev-qt/qtnetwork-${QT_PV}[ssl] - >=dev-qt/qtprintsupport-${QT_PV} - >=dev-qt/qtquickcontrols-${QT_PV} - >=dev-qt/qtscript-${QT_PV} - >=dev-qt/qtsql-${QT_PV}[sqlite] - >=dev-qt/qtsvg-${QT_PV} - >=dev-qt/qtwidgets-${QT_PV} - >=dev-qt/qtx11extras-${QT_PV} - >=dev-qt/qtxml-${QT_PV} - kde-frameworks/syntax-highlighting:5 - clang? ( - || ( - ( sys-devel/clang:11 - dev-libs/libclangformat-ide:11 ) - ( sys-devel/clang:10 - dev-libs/libclangformat-ide:10 ) - ( sys-devel/clang:9 - dev-libs/libclangformat-ide:9 ) - ) - =dev-qt/designer-${QT_PV} ) - help? ( - >=dev-qt/qthelp-${QT_PV} - webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] ) - ) - perfprofiler? ( dev-libs/elfutils ) - qbs? ( >=dev-util/qbs-1.13.1 ) - serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) - systemd? ( sys-apps/systemd:= ) -" -DEPEND="${CDEPEND} - test? ( - >=dev-qt/qtdeclarative-${QT_PV}[localstorage] - >=dev-qt/qtquickcontrols2-${QT_PV} - >=dev-qt/qttest-${QT_PV} - >=dev-qt/qtxmlpatterns-${QT_PV}[qml] - ) -" -RDEPEND="${CDEPEND} - sys-devel/gdb[python] - autotools? ( sys-devel/autoconf ) - cmake? ( dev-util/cmake ) - cppcheck? ( dev-util/cppcheck ) - 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 ) -" -# qt translations must also be installed or qt-creator translations won't be loaded -for x in ${PLOCALES}; do - IUSE+=" l10n_${x}" - RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )" -done -unset x - -PATCHES=( - "${FILESDIR}"/${PN}-4.14.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 -} - -src_prepare() { - default - - # disable unwanted plugins - for plugin in "${QTC_PLUGINS[@]#[+-]}"; do - if ! use ${plugin%:*}; then - einfo "Disabling ${plugin%:*} plugin" - sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \ - src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin" - fi - done - sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die - - # avoid building unused support libraries and tools - if ! use clang; then - sed -i -e '/clangsupport/d' src/libs/libs.pro || die - sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die - fi - if ! use glsl; then - sed -i -e '/glsl/d' src/libs/libs.pro || die - fi - if ! use lsp; then - sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die - fi - if ! use modeling; then - sed -i -e '/modelinglib/d' src/libs/libs.pro || die - fi - if ! use perfprofiler; 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 - if ! use qmldesigner; then - sed -i -e '/qml2puppet/d' src/tools/tools.pro || die - sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die - fi - if ! use valgrind; then - sed -i -e '/valgrindfake/d' src/tools/tools.pro || die - sed -i -e '/valgrind/d' tests/auto/auto.pro || die - fi - - # automagic dep on qtwebengine - if ! use webengine; then - sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die - fi - - # disable broken or unreliable tests - sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die - sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die - sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die - sed -i -e 's/\//' tests/auto/qml/codemodel/codemodel.pro || die - - # do not install test binaries - sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die - - # fix path to some clang headers - sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die - - # fix translations - local lang languages= - for lang in ${PLOCALES}; do - use l10n_${lang} && languages+=" ${lang/-/_}" - 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 -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 \ - CONFIG+=qbs_enable_project_file_updates \ - $(use systemd && echo CONFIG+=journald) \ - $(use test && echo BUILD_TESTS=1) -} - -src_test() { - cd tests/auto && virtx default -} - -src_install() { - emake INSTALL_ROOT="${ED}/usr" install - - dodoc dist/{changes-*,known-issues} - - # install documentation - if use doc; then - emake docs - # don't use ${PF} or the doc will not be found - insinto /usr/share/doc/qtcreator - doins share/doc/qtcreator/qtcreator{,-dev}.qch - docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch - fi -}