diff options
Diffstat (limited to 'dev-qt/qt-creator')
-rw-r--r-- | dev-qt/qt-creator/Manifest | 10 | ||||
-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/metadata.xml | 2 | ||||
-rw-r--r-- | dev-qt/qt-creator/qt-creator-4.15.1.ebuild (renamed from dev-qt/qt-creator/qt-creator-4.12.3-r1.ebuild) | 67 | ||||
-rw-r--r-- | dev-qt/qt-creator/qt-creator-9999.ebuild | 32 |
6 files changed, 48 insertions, 211 deletions
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index b1eb91009b88..8deacc5f8da0 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,6 +1,4 @@ -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.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf -EBUILD qt-creator-4.12.3-r1.ebuild 7155 BLAKE2B 78fbe0ed1cf7497b8dfca2daf319c8eeb611ea7ddd6c1180b6d4cc423cc54d2dd75da4e06901e2a87c452c2837bdc1464e153173e5dc76dcfd0bee385e5a9ae3 SHA512 368d001f344b01ebd64d295c2e78174856ac38c7876830e88e1789a8b85b1f9031b4261820e4d399bf2f8cf9e42f9c4bcf5c4d2b1e47003e604c640e1998d277 -EBUILD qt-creator-9999.ebuild 7424 BLAKE2B 88b5592ba3003bffbd5a95e120f07bd55dcbd586825aa2bda64c8d6784dcbeb799727082719c9409540daf2540d7c7937573160aadde3e6e435b6f6e053c46fc SHA512 5fe24a20fe577c7cfc9f2839792962c6ebc6969d874a8d88614131e7ba9e657912eb9207c5646d3d0559f7a2abbb979e92a0aa127ccbffefdadf1e61ebe448f5 -MISC metadata.xml 3518 BLAKE2B 4153006d68c5a4689e66f39cbaa9762ff1787f88676dc88878e38f5b8376bd28714b78f86449f037eb52cd81b0b91273516e852c34a5460fb0a7081adf0c1e67 SHA512 2cb8d121b8fc6685bcb9fb09c7f39487ba067ba8b5aad8b0f82b0b512290436bcf57b587505f856dd729a1e0bee9f4fc94b5fd28735f255b1cae5ae1e79f44ba +DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a SHA512 a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3 +EBUILD qt-creator-4.15.1.ebuild 7181 BLAKE2B 1d374ac5b14917b315654aa2d3d24d54b1d1855ee895e6f3ab666395d6b09661f21e2af602ecb43748e388cb7010286e125929e0e972aa1757f689a60b304e1e SHA512 72ea5019db3cb5e74d7058e8eeb3ccb4024a7e6a85b12c624db25ee3cb9aea906f0e903a6bbe9a1fa794e086ff0b94cc53b39e362cf720cf44e11399e408c419 +EBUILD qt-creator-9999.ebuild 7181 BLAKE2B 1d374ac5b14917b315654aa2d3d24d54b1d1855ee895e6f3ab666395d6b09661f21e2af602ecb43748e388cb7010286e125929e0e972aa1757f689a60b304e1e SHA512 72ea5019db3cb5e74d7058e8eeb3ccb4024a7e6a85b12c624db25ee3cb9aea906f0e903a6bbe9a1fa794e086ff0b94cc53b39e362cf720cf44e11399e408c419 +MISC metadata.xml 3398 BLAKE2B 5274f806e032611e6066b4cb70c259ad0f6f1c4e41d00eebe30b570783bcbb864f5f6ad753861ad55d2b5805c6602f5c9c69c8bc3d39627271d41b7be5c0c135 SHA512 8499cfcc0d6bf2ba33418f0af29d8ec2695a93937d73d182828445f310e6505f435c7d208ea653866cf30dc2df8e58e210aa3b008c2560c6d3bf06ae62fd0f65 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 deleted file mode 100644 index 0d4deb2c7956..000000000000 --- a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch +++ /dev/null @@ -1,84 +0,0 @@ -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 deleted file mode 100644 index 12c46c89ed0e..000000000000 --- a/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- 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/metadata.xml b/dev-qt/qt-creator/metadata.xml index f1b1bb3d0251..c9357db9d2db 100644 --- a/dev-qt/qt-creator/metadata.xml +++ b/dev-qt/qt-creator/metadata.xml @@ -25,7 +25,6 @@ <flag name="designer">Enable designer for QtWidgets-based UIs</flag> <flag name="glsl">Build the GLSL editor plugin</flag> <flag name="help">Enable the integrated documentation viewer</flag> - <flag name="ios">Build plugin for Apple iOS devices</flag> <flag name="lsp">Add support for the Language Server Protocol (LSP)</flag> <flag name="mcu">Build plugin for MCU devices</flag> <flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag> @@ -47,7 +46,6 @@ <flag name="valgrind">Enable integration with <pkg>dev-util/valgrind</pkg></flag> <flag name="webassembly">Build WebAssembly plugin</flag> <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag> - <flag name="winrt">Build plugin for WinRT devices</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qt-creator/qt-creator-4.12.3-r1.ebuild b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild index 5e676fcc1ce9..bfc4e05275dc 100644 --- a/dev-qt/qt-creator/qt-creator-4.12.3-r1.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild @@ -2,15 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LLVM_MAX_SLOT=10 -PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" +LLVM_MAX_SLOT=12 +PLOCALES="cs da de fr hr 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 @@ -20,30 +18,31 @@ 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" S=${WORKDIR}/${MY_P} + KEYWORDS="~amd64 ~arm ~x86" fi -# 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 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[@]%:*}" +LICENSE="GPL-3" +SLOT="0" +QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt + '+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck + ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial + modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner + +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher + subversion valgrind webassembly) +IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}" RESTRICT="!test? ( test )" REQUIRED_USE=" boot2qt? ( remotelinux ) clang? ( test? ( qbs ) ) mcu? ( cmake ) python? ( lsp ) + qmldesigner? ( qmljs ) qnx? ( remotelinux ) " # minimum Qt version required -QT_PV="5.12.3:5" +QT_PV="5.14:5" BDEPEND=" >=dev-qt/linguist-tools-${QT_PV} @@ -51,7 +50,6 @@ BDEPEND=" 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] @@ -67,11 +65,10 @@ CDEPEND=" >=dev-qt/qtxml-${QT_PV} kde-frameworks/syntax-highlighting:5 clang? ( + >=dev-cpp/yaml-cpp-0.6.2:= || ( - ( sys-devel/clang:10 - dev-libs/libclangformat-ide:10 ) - ( sys-devel/clang:9 - dev-libs/libclangformat-ide:9 ) + sys-devel/clang:12 + sys-devel/clang:11 ) <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= ) @@ -81,7 +78,6 @@ CDEPEND=" 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:= ) " @@ -95,11 +91,13 @@ DEPEND="${CDEPEND} " RDEPEND="${CDEPEND} sys-devel/gdb[python] - cmake? ( dev-util/cmake ) + autotools? ( sys-devel/autoconf ) + cmake? ( >=dev-util/cmake-3.14 ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) + qbs? ( >=dev-util/qbs-1.18 ) qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) @@ -112,14 +110,8 @@ 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}" + has_version -d "sys-devel/clang:${LLVM_SLOT}" } pkg_setup() { @@ -137,12 +129,13 @@ src_prepare() { src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin" fi done - sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die + sed -i -re '/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die + sed -i -re '/clang(pchmanager|refactoring)backend/d' src/tools/tools.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 + sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die + sed -i -e '/clangbackend/d' src/tools/tools.pro || die fi if ! use glsl; then sed -i -e '/glsl/d' src/libs/libs.pro || die @@ -160,9 +153,13 @@ src_prepare() { fi fi if ! use qmldesigner; then + sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die sed -i -e '/qml2puppet/d' src/tools/tools.pro || die sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die fi + if ! use qmljs; then + sed -i -e '/qmleditorwidgets/d' src/libs/libs.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 @@ -183,7 +180,7 @@ src_prepare() { 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 + sed -i -e "/^CLANG_INCLUDE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die # fix translations local lang languages= @@ -200,6 +197,8 @@ src_prepare() { # remove bundled qbs rm -r src/shared/qbs || die + + # TODO: unbundle sqlite } src_configure() { @@ -209,8 +208,6 @@ src_configure() { 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) } diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index e9e7c228800a..bfc4e05275dc 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -2,15 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LLVM_MAX_SLOT=10 -PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" +LLVM_MAX_SLOT=12 +PLOCALES="cs da de fr hr 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 @@ -20,12 +18,12 @@ 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 ~x86" S=${WORKDIR}/${MY_P} + KEYWORDS="~amd64 ~arm ~x86" fi -# TODO: unbundle sqlite - +LICENSE="GPL-3" +SLOT="0" QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial @@ -69,10 +67,8 @@ CDEPEND=" clang? ( >=dev-cpp/yaml-cpp-0.6.2:= || ( - ( sys-devel/clang:10 - dev-libs/libclangformat-ide:10 ) - ( sys-devel/clang:9 - dev-libs/libclangformat-ide:9 ) + sys-devel/clang:12 + sys-devel/clang:11 ) <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= ) @@ -101,7 +97,7 @@ RDEPEND="${CDEPEND} cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) - qbs? ( >=dev-util/qbs-1.15 ) + qbs? ( >=dev-util/qbs-1.18 ) qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) @@ -114,14 +110,8 @@ 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}" + has_version -d "sys-devel/clang:${LLVM_SLOT}" } pkg_setup() { @@ -190,7 +180,7 @@ src_prepare() { 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 + sed -i -e "/^CLANG_INCLUDE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die # fix translations local lang languages= @@ -207,6 +197,8 @@ src_prepare() { # remove bundled qbs rm -r src/shared/qbs || die + + # TODO: unbundle sqlite } src_configure() { |