diff options
Diffstat (limited to 'dev-qt/qt-creator')
-rw-r--r-- | dev-qt/qt-creator/Manifest | 4 | ||||
-rw-r--r-- | dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch | 31 | ||||
-rw-r--r-- | dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch | 29 | ||||
-rw-r--r-- | dev-qt/qt-creator/qt-creator-11.0.2.ebuild | 261 |
4 files changed, 0 insertions, 325 deletions
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 4b415717e52c..87d4e5d51ace 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,10 +1,6 @@ AUX qt-creator-11.0.2-musl-no-execinfo.patch 1305 BLAKE2B 14fba3e72188403cf457de46c50960bb69336023e74173a2a67c0e3101cbf8367cc0d0a31118efdaf715a184e558b6f2277fe8025035de482f6913e139660792 SHA512 707d09268cff8981d1baf7fa08c48a2c02edf044a7a76594d545a2a020616090c8b61851dff8d8a8350c024b39be932c9f7bc266e01b87680c7982759b1d96c4 AUX qt-creator-11.0.2-musl-no-malloc-trim.patch 400 BLAKE2B 6933d466e1c93cb71a97dade2f5cc1a1d9aecc4b376a4ccfe5b16bd7b7485f4d8230b00d93b21c8420e74094369f47d84dcb655c22f1327ba69a2b313aeff5b8 SHA512 c0a31f61723964fabdbd3e4256689a6712de5c0dc12a4e0989f1867588fd18a4f6535f30290949f3d3f982b9bb0b454d0b9b81781e3900d859fc40ac5bec1068 -AUX qt-creator-11.0.2-qt653.patch 1173 BLAKE2B 351c8dcdd010a22c2fb182fa81ef31ed0916c6812d1f5a502f71414a2fa248be6f0e4acc19f9b255931873ea1ccd775e4d24c30a4d12bb322dfa651ee90a3712 SHA512 24c5b7dc0e29da8709c37aaf592ed7ebbb556079a693ee3d4acfb743814a8b2c394e5779a53c5d1825f96cffb2ddc13bf43e9eccd302f6ee93df1b51a18722ad -AUX qt-creator-11.0.2-yaml-cpp-0.8.patch 1076 BLAKE2B 798164e6f3e709fbf973443da25cf3f995d9737a7fa26e501965c49209fc857703471f139fdeef46bf33b1a7bd85ec4fe4addb4cae3e63fc7b9ba74a5a92a644 SHA512 6f3c8294e0bb74f35883cb92090f01e5cac1f57cc8fa2f859476c5f0fd25920d118476b04ee19519f0488cca51754707e90883d7b10ecb6c2b91e1ad91a60046 -DIST qt-creator-opensource-src-11.0.2.tar.xz 49828532 BLAKE2B 6028b71e1a7bf5ab953caa6223a2694e625449ab9e0eaa6e0dd8b34c0d64a9a5cea7b06d4aa98015d91defad04bc945db8528f87f5bddc70ba185ca32bb7ee8b SHA512 db123274e0652982f33db60b8f81610f0787357cdc7318ea2bbe105343ff905462c38e29a68f864c48bda51fee6f17859074c172f77dd2379ecc2e7028f5fcd5 DIST qt-creator-opensource-src-11.0.3.tar.xz 49863336 BLAKE2B 60ce53bdc0d3a2167a62cf479e9d3427b3a4f6e3ba5eb0489e0546d80fb30f9bcea1174b67cb36673a7aa2094d5f82a7d8ab34decf47fe0c260893f0a55c9795 SHA512 4d0faab02cb9b123f135b3a436e9f4132f459fd40400b9adab8af0a395b9d999f473f2bbab7cb5353f5a129bfc66e3e8dfe9143412cbd03c385a3d052ef221ca -EBUILD qt-creator-11.0.2.ebuild 7143 BLAKE2B 853d0a5e6c7e00b2696bd5c17edaa3e6a6748d5f74ddd6cbc130921a35248eb5124040a3dbfcf145287ba212e54dbfc7c62d7a8ccd3296810d74e7eff2abe0a3 SHA512 fe285255bcf75082cae8a3f7b9fad6878175e10e97396a3c8c0fa04a18227b98fab3f973aec4b57a8b213484050662d933ef1f99c310bedef5d77361448a8904 EBUILD qt-creator-11.0.3.ebuild 6995 BLAKE2B 2799586894ece42f8138107e6bcca2d8bebc6ccf90740912c98ceee0ab650cac97c14670da8bbf58f92787b3a4d74c45fcca125b289721fad2e1e4bbefa8d5c5 SHA512 61943230eeabcc440928dd9571d1a64ffeb27becd4d90f4e5073d36470fbc0ea4f2380e45c2ccb73d23ad34dc5bd570fa51a85a50ee1ff623b0de1a18d7ebcff EBUILD qt-creator-9999.ebuild 6718 BLAKE2B 4ebca130defe766c781cd16ac8bd03dbd413411372674d5f1205bb9ac4d7b1b4f361f12f2902206dcddcaa7182bd4097cb8c92fdc72cde47992fcfacdc789709 SHA512 89c84a4a77b2d48aa3e190624a04d834d6246287a4bca80b7990137198d1f087e8a33451e4e5e8c6df09eacf275b4c9fc86ede0bbf3cc46ca52292f006354b7b MISC metadata.xml 1242 BLAKE2B b0b082554e88fe15e707583e01c9883ac2c695244328eec8cfdcb948c1cd0f782940c429efaf83828fafd10c05ac468054039e8c73cc8fbf79dde1d5a2e990bc SHA512 7d877389c81c815a2691a6463b2ee122766bcd93f75fffd5faab014e06f901efa77f500bef2c67ece5fb37d5fc41e916668e38e282b72c1825cfec53c3c73e51 diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch deleted file mode 100644 index 7cbfc534bab6..000000000000 --- a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch +++ /dev/null @@ -1,31 +0,0 @@ -Uses private parts of the QtQuick3D api which added a namespace in [1]. - -Update: upstream has done a better fix in [2] (but can stick to the -simple version check until next release). - -[1] https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e -[2] https://github.com/qt-creator/qt-creator/commit/291e3096cd5d0763370238252143c3bb4fe93839 ---- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp -+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp -@@ -803,5 +803,9 @@ - const QMatrix4x4 sceneTransform = parent->sceneTransform() * localTransform; - -+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3)) -+ return QSSGUtils::mat44::getPosition(sceneTransform); -+#else - return mat44::getPosition(sceneTransform); -+#endif - } - ---- a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp -+++ b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp -@@ -738,5 +738,9 @@ - const QMatrix4x4 sceneTransform = parent->sceneTransform() * localTransform; - -+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3)) -+ return QSSGUtils::mat44::getPosition(sceneTransform); -+#else - return mat44::getPosition(sceneTransform); -+#endif - } - diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch deleted file mode 100644 index c06a2733b484..000000000000 --- a/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugs.gentoo.org/914732 -https://bugreports.qt.io/browse/QTCREATORBUG-29537 - -https://github.com/qt-creator/qt-creator/commit/170f9acfb41704b68e2ba98690fd6d5e98addd85 -From: Eike Ziller <eike.ziller@qt.io> -Date: Thu, 24 Aug 2023 13:41:33 +0200 -Subject: [PATCH] ClangTools: Add support for yaml-cpp 0.8 - -They renamed their target from `yaml-cpp` -to `yaml-cpp::yaml-cpp` - -Still support < 0.8 though. ---- a/cmake/Findyaml-cpp.cmake -+++ b/cmake/Findyaml-cpp.cmake -@@ -16,5 +16,13 @@ - find_path(yaml_cpp_include_dir yaml-cpp/yaml.h) - endif() -- set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}") -+ if(TARGET yaml-cpp::yaml-cpp) -+ # yaml-cpp >= 0.8 -+ set_property(TARGET yaml-cpp::yaml-cpp PROPERTY IMPORTED_GLOBAL TRUE) -+ add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp) -+ set(yaml-cpp_TARGET yaml-cpp::yaml-cpp) -+ else() -+ set(yaml-cpp_TARGET yaml-cpp) -+ endif() -+ set_target_properties(${yaml-cpp_TARGET} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}") - else() - if(TARGET yaml-cpp) diff --git a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild b/dev-qt/qt-creator/qt-creator-11.0.2.ebuild deleted file mode 100644 index 02fc953d5706..000000000000 --- a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake flag-o-matic llvm 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" - 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" -SLOT="0" -IUSE=" - +clang +designer doc +help qmldesigner serialterminal - +svg test +tracing webengine -" -RESTRICT="!test? ( test )" - -# 17+ may be usable, but there are many fixes for 17 in next version -LLVM_MAX_SLOT=16 -QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN - -# := is used where Qt's private APIs are used for safety -COMMON_DEPEND=" - >=dev-qt/qt5compat-${QT_PV} - >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml] - >=dev-qt/qtdeclarative-${QT_PV}= - clang? ( - dev-cpp/yaml-cpp:= - <sys-devel/clang-$((LLVM_MAX_SLOT+1)):= - ) - designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) - help? ( - >=dev-qt/qttools-${QT_PV}[assistant] - webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) - ) - qmldesigner? ( - >=dev-qt/qtquick3d-${QT_PV}= - >=dev-qt/qtsvg-${QT_PV} - ) - serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) - svg? ( >=dev-qt/qtsvg-${QT_PV} ) - tracing? ( - app-arch/zstd:= - dev-libs/elfutils - >=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}" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-qt/qttools-${QT_PV}[linguist] - doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch - "${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch - "${FILESDIR}"/${PN}-11.0.2-qt653.patch - "${FILESDIR}"/${P}-yaml-cpp-0.8.patch -) - -pkg_setup() { - python-any-r1_pkg_setup - use clang && llvm_pkg_setup -} - -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 -} - -src_configure() { - # -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_WITH_PCH=no - -DWITH_DOCS=$(usex doc) - -DBUILD_DEVELOPER_DOCS=$(usex doc) - -DWITH_TESTS=$(usex test) - - # TODO?: try to unbundle with =no when syntax-highlighting:6 exists - -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_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 - -DEXTERNAL_XXD=no - ') - - -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) - - -DENABLE_SVG_SUPPORT=$(usex svg) - - -DWITH_QMLDESIGNER=$(usex qmldesigner) - - -Djournald=no # not really useful unless match qtbase (needs systemd) - - # not packaged, but allow using if found - #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes - #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes - ) - - cmake_src_configure -} - -src_test() { - local -x QT_QPA_PLATFORM=offscreen - - local CMAKE_SKIP_TESTS=( - # unknown why these fails, but seems fixed in live - tst_tracing_timelineitemsrenderpass - tst_tracing_timelinenotesrenderpass - tst_tracing_timelineselectionrenderpass - # fails when built with clang, but also seems fixed in live - 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_compile() { - cmake_src_compile - - use doc && cmake_build {qch,html}_docs -} - -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-util/cmake) -- MesonProjectManager (dev-util/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-util/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: -- 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) -- 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 -} |