commit: a46b0514f90db503410433e6673fa0edcbfffbb3 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Oct 1 08:48:18 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Oct 1 10:56:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a46b0514
dev-qt/qt-creator: drop 17.0.0 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qt-creator/Manifest | 2 - .../qt-creator/files/qt-creator-17.0.0-qt692.patch | 21 -- dev-qt/qt-creator/qt-creator-17.0.0.ebuild | 316 --------------------- 3 files changed, 339 deletions(-) diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 69055454185f..080590fe23b8 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,4 +1,2 @@ -DIST qt-creator-opensource-src-17.0.0-vendor.tar.xz 508956 BLAKE2B 8901cb3268b65dc8acfc837c0675d778dca6d0edb0e5bc1dd2b85f85e5f496841825bdf1f601c19aca779853062260929bdbcef2e5bb4e8cb7cd3a1eea7050cc SHA512 702c35b0c1289c5b24584b7974ffbaaaf6ded5205451967a63d7a83fc52af5435f1f817a687d29820bdb8825ebe9d306e5fdb06b19b548bb98746244e1aab85c -DIST qt-creator-opensource-src-17.0.0.tar.xz 55713368 BLAKE2B 65a08ea33451a8a05a2399a2d77301a775895e1f17ff04c5d7efd9c34ed5db1d194f957363e54d4ee9e911ee9a132c0683344ae3ca4b6f32ecba04cdc7a03862 SHA512 e77f386c3e112ca2f062242501aa74ac67ced58b30397b6ac1907c9524cea6912185d47866aeb42e9a5e0494fb9b059e3e3784a8628ec0416ca1d23ebe9a7b8d DIST qt-creator-opensource-src-17.0.1-vendor.tar.xz 509276 BLAKE2B d499f0b8da384a305c5be5f9480d7c8af7cd060da803198b69879d06f0923410d2dda4bd84fe615de1afe8f732e94fd0d3e5b077d80dbc2879b724a9a0ffac5f SHA512 96791f9119e2b20c905df406b29533f8712792de8197002f3905b6f175c858e4740fd45314e68133e6f5106b914a3236183cfc9e2937c899e6c599566a7a3516 DIST qt-creator-opensource-src-17.0.1.tar.xz 55741344 BLAKE2B 0d686b955077f970435b5ab11c94802865ac4676a12429e1e3209d3dc1038549456877a045f0c2576f448d7ecf8cd328aa3ca07000e0fe9d5b391357140890ac SHA512 5cba005d239c0ae109a6e5a28d0ea31bf6005734f2d0f72b36470d9eb82c999c4fcbbc7bb9c29e9e228203fde30948465cc07a841a074362f18ea09c739f40d5 diff --git a/dev-qt/qt-creator/files/qt-creator-17.0.0-qt692.patch b/dev-qt/qt-creator/files/qt-creator-17.0.0-qt692.patch deleted file mode 100644 index cf26143a70db..000000000000 --- a/dev-qt/qt-creator/files/qt-creator-17.0.0-qt692.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/qt-creator/qt-creator/commit/04e6e631b26 ---- a/src/libs/utils/stringtable.cpp -+++ b/src/libs/utils/stringtable.cpp -@@ -91,9 +91,16 @@ - } - -+// qtbase/3f61f736266ece40d627dcf6214618a22a009fd1 changed QArrayData::{ref_ → m_ref}; -+// adapt: -+template <typename S> -+auto getQArrayDataRef(const S *s) -> decltype(s->ref_) { return s->ref_.loadRelaxed(); } -+template <typename S> -+auto getQArrayDataRef(const S *s) -> decltype(s->m_ref) { return s->m_ref.loadRelaxed(); } -+ - static inline bool isDetached(const QString &string, int &bytesSaved) - { - if (DebugStringTable) { - QStringPrivate &data_ptr = const_cast<QString&>(string).data_ptr(); -- const int ref = data_ptr->d_ptr()->ref_; -+ const int ref = getQArrayDataRef(data_ptr->d_ptr()); - bytesSaved += (ref - 1) * string.size(); - if (ref > 10) diff --git a/dev-qt/qt-creator/qt-creator-17.0.0.ebuild b/dev-qt/qt-creator/qt-creator-17.0.0.ebuild deleted file mode 100644 index 9fac2c76da5d..000000000000 --- a/dev-qt/qt-creator/qt-creator-17.0.0.ebuild +++ /dev/null @@ -1,316 +0,0 @@ -# Copyright 2023-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( {15..20} ) -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 - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI=( - "https://code.qt.io/qt-creator/qt-creator.git"; - "https://github.com/qt-creator/qt-creator.git"; - ) - EGIT_SUBMODULES=( - perfparser - src/libs/qlitehtml - src/libs/qlitehtml/src/3rdparty/litehtml - ) -else - QTC_PV=${PV/_/-} - QTC_P=${PN}-opensource-src-${QTC_PV} - [[ ${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" -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 -" -REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -QT_PV=6.7.3:6 - -# := is used where Qt's private APIs are used for safety -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? ( - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT}= - llvm-core/llvm:${LLVM_SLOT}= - ') - ) - designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) - help? ( - >=dev-qt/qttools-${QT_PV}[assistant] - webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) - ) - keyring? ( - app-crypt/libsecret - dev-libs/glib:2 - ) - qmldesigner? ( - >=dev-qt/qtquick3d-${QT_PV}= - >=dev-qt/qtsvg-${QT_PV} - >=dev-qt/qtwebsockets-${QT_PV} - webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) - ) - serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) - svg? ( >=dev-qt/qtsvg-${QT_PV} ) - tracing? ( - app-arch/zstd:= - dev-libs/elfutils - >=dev-qt/qtcharts-${QT_PV} - >=dev-qt/qtshadertools-${QT_PV} - ) -" -# qtimageformats for .webp in examples, semi-optfeature but useful in general -RDEPEND=" - ${COMMON_DEPEND} - help? ( >=dev-qt/qtimageformats-${QT_PV} ) - 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] ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-16.0.0-musl-no-execinfo.patch - "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch - "${FILESDIR}"/${P}-qt692.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 - - # needed for finding docs at runtime in PF - 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 - - if use plugin-dev; then #928423 - # cmake --install --component integrates poorly with the cmake - # eclass and the install targets are otherwise missing, so strip - # out EXCLUDE_FROM_ALL until figure out a better solution - find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \ - 's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die - fi -} - -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 - - # temporary workaround for musl-1.2.4 (bug #903611), this ideally - # needs fixing in qtbase as *64 usage comes from its headers' macros - use elibc_musl && append-lfs-flags - - local mycmakeargs=( - -DBUILD_DEVELOPER_DOCS=$(usex doc) - -DBUILD_DOCS_BY_DEFAULT=$(usex doc) - -DBUILD_WITH_PCH=no - -DWITH_DOCS=$(usex doc) - -DWITH_TESTS=$(usex test) - - # sticking to bundled for now until it switches to KF6's - -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes - - # Much can be optional, but do not want to flood users (or maintainers) - # with too many flags. Not to mention that many plugins are merely - # wrappers around still optional tools (e.g. cvs) and any unwanted - # plugins can be disabled at runtime. So optional flags are limited - # to plugins with additional build-time dependencies. - -DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual - -DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing) - -DBUILD_PLUGIN_APPSTATISTICSMONITOR=$(usex tracing) - - -DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang) - -DBUILD_PLUGIN_CLANGFORMAT=$(usex clang) - -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang) - -DCLANGTOOLING_LINK_CLANG_DYLIB=yes - - -DBUILD_PLUGIN_DESIGNER=$(usex designer) - - -DBUILD_PLUGIN_HELP=$(usex help) - -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) - -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 && - cmake_use_find_package webengine Qt6WebEngineWidgets) - - -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) - -DENABLE_SVG_SUPPORT=$(usex svg) - -DWITH_QMLDESIGNER=$(usex qmldesigner) - - $(usev !cmdbridge-server -DGO_BIN=GO_BIN-NOTFOUND) #945925 - -DUPX_BIN=UPX_BIN-NOTFOUND #961623 - - # meant to be in sync with qtbase[journald], but think(?) not worth - # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays - -Djournald=no - - # not packaged, but allow using if found - #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes - #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes - - # for bundled qtkeychain (no switch to unbundle right now) - # reminder: if ever unbundled/optional, qtbase[dbus] can be removed - -DLIBSECRET_SUPPORT=$(usex keyring) - ) - - cmake_src_configure -} - -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) - tst_process - # skipping same tests+label as upstream's CI by default - # `grep ctest .github/workflows/build_cmake.yml` - tst_perfdata - ) - - cmake_src_test --label-exclude exclude_from_precheck -} - -src_install() { - cmake_src_install - - if use doc; then - dodoc -r "${BUILD_DIR}"/doc/html - dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch - docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch - fi - - local DISABLE_AUTOFORMATTING=yes - local DOC_CONTENTS="\ -Some plugins (if used) may need optional extra dependencies/USE. - -This list provides associations with Gentoo's packages (if exists) -ordered as in Qt Creator's Help -> About Plugins (not exhaustive). - -dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or -else the example tab will be empty alongside missing documentation. - -Build Systems: -- CMakeProjectManager (dev-build/cmake) -- MesonProjectManager (dev-build/meson) -- QbsProjectManager (dev-util/qbs) - -C++: -- Beautifier (dev-util/astyle and/or dev-util/uncrustify) -- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics) -- ClangFormat (USE=clang) - -Code Analyzer: -- ClangTools (USE=clang) -- Cppcheck (dev-util/cppcheck) -- CtfVisualizer (USE=tracing) -- PerfProfiler (USE=tracing) -- Valgrind (dev-debug/valgrind) - -Core: -- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\") - -Device Support: -- Android (virtual/jdk, will also want the unpackaged Qt for Android) - -Other Languages: -- Nim (dev-lang/nim) -- Python (dev-lang/python) - -Qt Creator: -- Designer (USE=designer) - -Qt Quick: -- Insight (USE=qmldesigner) -- QmlDesigner (USE=qmldesigner) -- QmlProfiler (USE=tracing) - -Utilities: -- AppStatisticsMonitor (USE=tracing) -- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used) -- Conan (dev-util/conan) -- Docker (app-containers/docker) -- Haskell (dev-lang/ghc) -- ScreenRecorder (media-video/ffmpeg) -- SerialTerminal (USE=serialterminal) -- SilverSearcher (sys-apps/the_silver_searcher) -- StudioWelcome (USE=qmldesigner) - -Version Control: -- CVS (dev-vcs/cvs) -- Fossil (dev-vcs/fossil) -- Git (dev-vcs/git) -- Mercurial (dev-vcs/mercurial) -- Subversion (dev-vcs/subversion)" - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - readme.gentoo_print_elog -}
