diff options
Diffstat (limited to 'dev-qt/qt-creator')
| -rw-r--r-- | dev-qt/qt-creator/Manifest | 3 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-18.0.1.ebuild (renamed from dev-qt/qt-creator/qt-creator-17.0.2.ebuild) | 54 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-9999.ebuild | 40 |
3 files changed, 16 insertions, 81 deletions
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 4756661cbab4..a17860624d2c 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,4 +1,3 @@ -DIST qt-creator-opensource-src-17.0.2-vendor.tar.xz 509064 BLAKE2B 961adde1b6d093cbbcbba4d3794d2f1aeb0dd2c701c30a38abbb65531b8af9d215f223a95ef2ce1b79f401fd663844548586c394e46ebb321ba93b5d9d8303b1 SHA512 f4972a9e286f0d3edfc7d7ed7ed6db8022ec720be94ba310f2f142ccbcadfda262405725f8d6cf9695f719f26e7c3eb5386e07c8fdd05fab5a1dc6d55cfbdf26 -DIST qt-creator-opensource-src-17.0.2.tar.xz 55745020 BLAKE2B bbaf4c14c61fed188342a8a1fc09409f41464e06f7256194670f3eba018776f3bbd4af8c839efd9f2e39c8b420cd95db1fb9f418b75996f39df74a2d8f3e8434 SHA512 db444e723d0b05436a3c7c00861b4da4ce751a3ae70af274f48bb339789172f49f265e6094d68170114a72c22bb7432eb1bb697d1d563ff69b9fcdd48cdfcb28 DIST qt-creator-opensource-src-18.0.0-vendor.tar.xz 510428 BLAKE2B a189b7e467ba0f9297b510a76d7261596cb19d52530129b40417577d3653892190734bc54fa3d95317bb31e367b255d7a9320f40c3d24ea69b9400eeadb4890f SHA512 3fcf4573ae1b2c7d77a8503fbd7d47182bc78a3baa0769ec9261cb6f88e259a1efef6a5f6500959f11a0c9cb503f684e1ee6da999fe434c26d74aabce91d97c7 DIST qt-creator-opensource-src-18.0.0.tar.xz 56167564 BLAKE2B 45f3a0284e1ce3c91c8c69075afd39a3108d1c7082ad25c39d32a99c1ff009799d4485b0602d11d03c610f6fdb0d823606cff495c641ea8bca115cd265ce93fb SHA512 180bb491947b2b57d5420fdda3bc184b22e1158b6f6e292ada294b7c32b4d3696cb99674b92a75682d405eb573d96ecebbf5d80db90de1d7748aaca59ebb4781 +DIST qt-creator-opensource-src-18.0.1.tar.xz 56192968 BLAKE2B fad37e224753bceec96f8583c6801eaa26d2355f16402d695551933b662fef2cf9b00ff0bea54bb04ce3d572155fb6465defed7ffafb76f999b0123d8391b57e SHA512 0f293afe2464fd71b49a8dbd0c8e9e020ff403a55509db43d75ac71a367fac43d86d1655541d28dcda7ab999d54df35668a1092a2b71e3e7f96aec7c81a11ee2 diff --git a/dev-qt/qt-creator/qt-creator-17.0.2.ebuild b/dev-qt/qt-creator/qt-creator-18.0.1.ebuild index 9471ab42a13e..212f80f6d01a 100644 --- a/dev-qt/qt-creator/qt-creator-17.0.2.ebuild +++ b/dev-qt/qt-creator/qt-creator-18.0.1.ebuild @@ -6,8 +6,7 @@ EAPI=8 LLVM_COMPAT=( {15..21} ) LLVM_OPTIONAL=1 PYTHON_COMPAT=( python3_{11..14} ) -inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing -inherit python-any-r1 readme.gentoo-r1 xdg +inherit cmake flag-o-matic llvm-r2 python-any-r1 readme.gentoo-r1 xdg if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -26,21 +25,19 @@ else [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development SRC_URI=" https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz - cmdbridge-server? ( https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz ) " S=${WORKDIR}/${QTC_P} - KEYWORDS="amd64" + KEYWORDS="~amd64" fi DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="https://www.qt.io/product/development-tools" LICENSE="GPL-3" -LICENSE+=" BSD MIT" # go SLOT="0" IUSE=" - +clang cmdbridge-server designer doc +help keyring plugin-dev - qmldesigner serialterminal +svg test +tracing webengine + +clang designer doc +help keyring plugin-dev qmldesigner + serialterminal +svg test +tracing webengine " REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -51,7 +48,6 @@ QT_PV=6.7.3:6 COMMON_DEPEND=" app-arch/libarchive:= dev-cpp/yaml-cpp:= - >=dev-qt/qt5compat-${QT_PV} >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,ssl,widgets,xml] >=dev-qt/qtdeclarative-${QT_PV}= clang? ( @@ -91,12 +87,9 @@ RDEPEND=" qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) " DEPEND="${COMMON_DEPEND}" -# intentionally skipping := on go (unlike go-module.eclass) given not -# worth a massive rebuild every time for the minor go usage BDEPEND=" ${PYTHON_DEPS} >=dev-qt/qttools-${QT_PV}[linguist] - cmdbridge-server? ( >=dev-lang/go-1.21.7 ) doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] ) " @@ -105,22 +98,6 @@ PATCHES=( "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch ) -# written in Go, use PREBUILT rather than FLAGS_IGNORED given the -# the different arch versions confuse portage's checks -QA_PREBUILT="usr/libexec/qtcreator/cmdbridge-*" - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - if use cmdbridge-server; then - cd -- "${S}"/src/libs/gocmdbridge/server || die - edo go mod vendor - fi - else - default - fi -} - src_prepare() { cmake_src_prepare @@ -128,9 +105,6 @@ src_prepare() { sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ -i cmake/QtCreatorAPIInternal.cmake || die - # avoid stripping for Go, use sed to avoid rebases as may be there forever - sed -i 's/-s -w //' src/libs/gocmdbridge/server/CMakeLists.txt || die - # avoid building manual tests (aka not ran) for nothing (bug #950010) sed -i '/add_subdirectory(manual)/d' tests/CMakeLists.txt || die @@ -146,11 +120,6 @@ src_prepare() { src_configure() { use clang && llvm_chost_setup - if use cmdbridge-server; then - go-env_set_compile_environment - export GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie" - fi - # -Werror=lto-type-mismatch issues, needs looking into filter-lto @@ -186,11 +155,9 @@ src_configure() { -DBUILD_PLUGIN_HELP=$(usex help) -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) + # TODO?: unbundle litehtml, but support for latest releases + # tend to lag behind and bundled may work out better for now -DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine)) - # TODO?: package litehtml, but support for latest releases seem - # to lag behind and bundled may work out better for now - # https://bugreports.qt.io/browse/QTCREATORBUG-29169 - $(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes) # help shouldn't use with the above, but qmldesigner is automagic $(use help || use qmldesigner && @@ -200,8 +167,8 @@ src_configure() { -DENABLE_SVG_SUPPORT=$(usex svg) -DWITH_QMLDESIGNER=$(usex qmldesigner) - $(usev !cmdbridge-server -DGO_BIN=GO_BIN-NOTFOUND) #945925 - -DUPX_BIN=UPX_BIN-NOTFOUND #961623 + # cmdbridge-server is a hardly used maintenance burden (bug #967488) + -DBUILD_EXECUTABLE_CMDBRIDGE=no # meant to be in sync with qtbase[journald], but think(?) not worth # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays @@ -223,9 +190,8 @@ src_test() { local -x QT_QPA_PLATFORM=offscreen local CMAKE_SKIP_TESTS=( - # tst_Process::recursiveBlockingProcess() broke in 17.0.0, not really looked - # into yet but does not seem to cause visible issues, skip for now (unknown - # if it passes upstream given their CI is failing to run tests right now) + # broke since 17.0.0 and hasn't really been looked into yet, + # does not seem to cause visible problems so skipping for now tst_process # skipping same tests+label as upstream's CI by default # `grep ctest .github/workflows/build_cmake.yml` diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 7aeefd19a5f0..d14294cf75ab 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -6,8 +6,7 @@ EAPI=8 LLVM_COMPAT=( {15..21} ) LLVM_OPTIONAL=1 PYTHON_COMPAT=( python3_{11..14} ) -inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing -inherit python-any-r1 readme.gentoo-r1 xdg +inherit cmake flag-o-matic llvm-r2 python-any-r1 readme.gentoo-r1 xdg if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -26,7 +25,6 @@ else [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development SRC_URI=" https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz - cmdbridge-server? ( https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz ) " S=${WORKDIR}/${QTC_P} KEYWORDS="~amd64" @@ -36,11 +34,10 @@ DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="https://www.qt.io/product/development-tools" LICENSE="GPL-3" -LICENSE+=" BSD MIT" # go SLOT="0" IUSE=" - +clang cmdbridge-server designer doc +help keyring plugin-dev - qmldesigner serialterminal +svg test +tracing webengine + +clang designer doc +help keyring plugin-dev qmldesigner + serialterminal +svg test +tracing webengine " REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -90,12 +87,9 @@ RDEPEND=" qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) " DEPEND="${COMMON_DEPEND}" -# intentionally skipping := on go (unlike go-module.eclass) given not -# worth a massive rebuild every time for the minor go usage BDEPEND=" ${PYTHON_DEPS} >=dev-qt/qttools-${QT_PV}[linguist] - cmdbridge-server? ( >=dev-lang/go-1.21.7 ) doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] ) " @@ -104,22 +98,6 @@ PATCHES=( "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch ) -# written in Go, use PREBUILT rather than FLAGS_IGNORED given the -# the different arch versions confuse portage's checks -QA_PREBUILT="usr/libexec/qtcreator/cmdbridge-*" - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - if use cmdbridge-server; then - cd -- "${S}"/src/libs/gocmdbridge/server || die - edo go mod vendor - fi - else - default - fi -} - src_prepare() { cmake_src_prepare @@ -127,9 +105,6 @@ src_prepare() { sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ -i cmake/QtCreatorAPIInternal.cmake || die - # avoid stripping for Go, use sed to avoid rebases as may be there forever - sed -i 's/-s -w //' src/libs/gocmdbridge/server/CMakeLists.txt || die - # avoid building manual tests (aka not ran) for nothing (bug #950010) sed -i '/add_subdirectory(manual)/d' tests/CMakeLists.txt || die @@ -145,11 +120,6 @@ src_prepare() { src_configure() { use clang && llvm_chost_setup - if use cmdbridge-server; then - go-env_set_compile_environment - export GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie" - fi - # -Werror=lto-type-mismatch issues, needs looking into filter-lto @@ -197,8 +167,8 @@ src_configure() { -DENABLE_SVG_SUPPORT=$(usex svg) -DWITH_QMLDESIGNER=$(usex qmldesigner) - -DBUILD_EXECUTABLE_CMDBRIDGE=$(usex cmdbridge-server) #945925 - $(usev cmdbridge-server -DUPX_BIN=UPX_BIN-NOTFOUND) #961623 + # cmdbridge-server is a hardly used maintenance burden (bug #967488) + -DBUILD_EXECUTABLE_CMDBRIDGE=no # meant to be in sync with qtbase[journald], but think(?) not worth # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays |