* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2023-09-26 8:06 Ionen Wolkens
0 siblings, 0 replies; 12+ messages in thread
From: Ionen Wolkens @ 2023-09-26 8:06 UTC (permalink / raw
To: gentoo-commits
commit: 95fef56ce3e655745b52a9bd19da12f63b004b77
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 07:26:54 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 08:06:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95fef56c
dev-qt/qt-creator: fix build with yaml-cpp-0.8
Closes: https://bugs.gentoo.org/914732
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/qt-creator-11.0.2-yaml-cpp-0.8.patch | 29 ++++++++++++++++++++++
dev-qt/qt-creator/qt-creator-11.0.2.ebuild | 1 +
2 files changed, 30 insertions(+)
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
new file mode 100644
index 000000000000..c06a2733b484
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch
@@ -0,0 +1,29 @@
+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
index 2d43880f115f..20bd6be0b986 100644
--- a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
@@ -84,6 +84,7 @@ 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() {
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2025-02-21 17:36 Ionen Wolkens
0 siblings, 0 replies; 12+ messages in thread
From: Ionen Wolkens @ 2025-02-21 17:36 UTC (permalink / raw
To: gentoo-commits
commit: f3ff2e72d7be20008d7f9a1967f83dee69203930
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 16:14:26 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 17:34:49 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ff2e72
dev-qt/qt-creator: drop 15.0.0-r1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qt-creator/Manifest | 2 -
.../files/qt-creator-14.0.1-clang19.patch | 24 --
dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild | 298 ---------------------
3 files changed, 324 deletions(-)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index be4e63ea08b8..77e62a70703e 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,2 @@
-DIST qt-creator-opensource-src-15.0.0-vendor.tar.xz 509332 BLAKE2B 7c417a0fc14eb3b8e27aec73afa362cea43008107a68290c8fc17631fb06d24f89d7454e191a68ba199bd349142b3f1ae1ddbdff0af6bc69b6d53f61227236c0 SHA512 52fb8b585f8821919550622710b76ab7376668c8cae76ea9880d34b281f052972b3c08192ce8e994f51d86de33c247d27bf3252194dd17c1a7b37e8d5e68d42d
-DIST qt-creator-opensource-src-15.0.0.tar.xz 53254544 BLAKE2B bf295974a904c182f37321a8e7e06704906d9db34f3c96d3e7b1ac2aad2807c106f271e480e9ef7c72f98413fd6faca3c6d9e47d47b62736ce88f4722857be05 SHA512 0a003a17bec60b34c4dc4ac700125dc62be9d2cf50e9044b61cc926b1d7cfa1e8303b98f9ae25abca07cb893398c25f61c3ec28029efe50e88339e5d984d1279
DIST qt-creator-opensource-src-15.0.1-vendor.tar.xz 508860 BLAKE2B c5a7eef8250c6f21b482a262dee912f704573e96400291a81b61251c7cb19139748761f56bea0a832830dadbd3035729d040b92ba00eb3f1c96c0eace220387a SHA512 a334182b844e98c238fbe271fea6a169de54cd7b12dd9dea3a3d165bf1c0286fafd980e0e4e842db0b65298d92214abe618f94081756beafd2bd64398aa4d788
DIST qt-creator-opensource-src-15.0.1.tar.xz 53250336 BLAKE2B f59160c113122d5c10935c7d088f57d36b41245587faf996244b6edde2b200536616247f8edaf0096f5e91750045c02b66bbcb68ee232b5e02e947e891ab6292 SHA512 fb3d75187607c57438beb9ec65c932e3abfd15566d8d11d612b7aa087b9df44d12d18138fbd61ece61ebc29be6d14d1ded3cd1deb1d946bd7d96f2ef2060f853
diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch b/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch
deleted file mode 100644
index e296f5bf68be..000000000000
--- a/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/937600
-
-qt-creator has a workaround for clang (formerly) lacking an implementation
-for __cpp_template_template_args, but the workaround causes issues now that
-it is available.
-
-https://github.com/llvm/llvm-project/pull/89807
-https://github.com/qt-creator/qt-creator/commit/d400dce35d817afd719ffadf8c8f43c8814c05c1
---- a/src/libs/utils/algorithm.h
-+++ b/src/libs/utils/algorithm.h
-@@ -259,5 +259,5 @@
- typename ResultContainer = C<Result>>
- Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function);
--#ifdef Q_CC_CLANG
-+#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args)
- // "Matching of template template-arguments excludes compatible templates"
- // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0522r0.html (P0522R0)
-@@ -810,5 +810,5 @@
- }
-
--#ifdef Q_CC_CLANG
-+#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args)
- template<template<typename, typename> class C, // result container type
- typename SC, // input container type
diff --git a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
deleted file mode 100644
index 7bdeffec0681..000000000000
--- a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..19} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-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.5.4:6
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
- dev-cpp/yaml-cpp:=
- >=dev-qt/qt5compat-${QT_PV}
- >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,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}
- )
- 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}-15.0.0-musl-no-execinfo.patch
- "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
- "${FILESDIR}"/${PN}-14.0.1-clang19.patch
-)
-
-QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
-
-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
-
- 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)
-
- -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
- -DENABLE_SVG_SUPPORT=$(usex svg)
- $(usev !cmdbridge-server -DGO_BIN=GO_BIN-NOTFOUND) #945925
- -DWITH_QMLDESIGNER=$(usex qmldesigner)
-
- # 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=(
- # 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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2024-11-04 16:15 Ionen Wolkens
0 siblings, 0 replies; 12+ messages in thread
From: Ionen Wolkens @ 2024-11-04 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 1f01d84a8483050c1ea47ec5fe5f1997cc744173
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 4 15:22:24 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 4 16:13:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f01d84a
dev-qt/qt-creator: drop 14.0.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qt-creator/Manifest | 1 -
.../qt-creator-14.0.1-sol2-clang19-gcc15.patch | 18 --
dev-qt/qt-creator/qt-creator-14.0.1.ebuild | 270 ---------------------
3 files changed, 289 deletions(-)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 8799c32d4cd0..20893f37849d 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-14.0.1.tar.xz 52495220 BLAKE2B a93111abdc39550c18c8ecae9bbb8c645a06be373b179bca47dac4b9e9907c9a7d9c8b13a6cc834c656cd7d7e5a849a6512f8b48055ecc8ea32a0f56f6439176 SHA512 5ceacce80cd5cdef99606ca371134e5e8a5897b67ff1a52d202449e74e817bce22ee31b029b6f8643e19700742ddd8e616a48f005aae0720f200c3b03f8eab9a
DIST qt-creator-opensource-src-14.0.2.tar.xz 52423044 BLAKE2B 491b00aa9900b45e8e0dea33d4a7c99f543cf3b526931121b87d51828292b1e7e422e890c69cb904a2d5ca3c20de5fa60d87a889c0036a9624c1825b63efe57f SHA512 45b7c1aef062f59446b162006f22fcba17a99f02008624ab332ae5109a31ec55caa3548f7b61a4feb04793fa049b2a67c4a3c37aa3d3e2f3eced31bd11a48ab2
diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch b/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch
deleted file mode 100644
index 29e600ca33ef..000000000000
--- a/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/938486
-https://bugs.gentoo.org/937600
-https://bugs.gentoo.org/936924
-https://bugreports.qt.io/browse/QTCREATORBUG-31517
-https://github.com/ThePhD/sol2/commit/d805d027e0a0a7222e936926139f06e23828ce9f
-https://codereview.qt-project.org/c/qt-creator/qt-creator/+/587620
---- a/src/libs/3rdparty/sol2/include/sol/sol.hpp
-+++ b/src/libs/3rdparty/sol2/include/sol/sol.hpp
-@@ -6818,7 +6818,8 @@
- static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
-
- *this = nullopt;
-- this->construct(std::forward<Args>(args)...);
-+ new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...);
-+ return **this;
- }
-
- /// Swaps this optional with the other.
diff --git a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
deleted file mode 100644
index 57312a5304e4..000000000000
--- a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 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 keyring plugin-dev qmldesigner
- serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.5.4:6
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
- dev-cpp/yaml-cpp:=
- >=dev-qt/qt5compat-${QT_PV}
- >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
- >=dev-qt/qtdeclarative-${QT_PV}=
- clang? (
- $(llvm_gen_dep '
- sys-devel/clang:${LLVM_SLOT}=
- sys-devel/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}
- )
- 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,qtattributionsscanner] )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
- "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
- "${FILESDIR}"/${PN}-14.0.1-clang19.patch
- "${FILESDIR}"/${PN}-14.0.1-sol2-clang19-gcc15.patch
-)
-
-pkg_setup() {
- python-any-r1_pkg_setup
- use clang && llvm-r1_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
-
- 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() {
- # -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_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)
-
- -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-
- -DENABLE_SVG_SUPPORT=$(usex svg)
-
- -DWITH_QMLDESIGNER=$(usex qmldesigner)
-
- # 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=(
- # 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:
-- 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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2024-06-06 13:20 Ionen Wolkens
0 siblings, 0 replies; 12+ messages in thread
From: Ionen Wolkens @ 2024-06-06 13:20 UTC (permalink / raw
To: gentoo-commits
commit: 96318f6a311cde6753dfb2ed05b4260b75a7a95d
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 12:47:51 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 13:18:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96318f6a
dev-qt/qt-creator: drop 13.0.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qt-creator/Manifest | 1 -
.../qt-creator/files/qt-creator-13.0.0-qt671.patch | 29 ---
dev-qt/qt-creator/qt-creator-13.0.0.ebuild | 269 ---------------------
3 files changed, 299 deletions(-)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 93d4e63c470d..d93d9286c577 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-13.0.0.tar.xz 52032860 BLAKE2B 63f1fbb5209c77b9fc9df9385e94808d7ea040de4af6305c16ac4ad540771ebc78b55d0552182fa30d80326da3989a96ee8a0cce218541e418b7f355e9542786 SHA512 26fea156becc136fb55702a65c29dad825fd3fa60d8e19d8d142ab6518dc8e40fbddfe70d79d2b71f14f76c8a1d9bca34fb65e565702e67c9276aec9758bf345
DIST qt-creator-opensource-src-13.0.1.tar.xz 51891908 BLAKE2B ab4701be5328fccc91e885a6a331ba8c4f53cb7d9a723f03f30ad01d03281d16b1f49cd6027ad9873cd94ecf6555978df9eba14bfcbfa8e4c36d304b8b106d5a SHA512 8af971d86a958b6a04da0bec78f5706d8ecf8c14621a5f9c83b415409288a0eccfecc237534288414cea5e620758d8daa104620c42fcaac718e9713e8c29afa4
diff --git a/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch b/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch
deleted file mode 100644
index 986f328fa8eb..000000000000
--- a/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Building with Qt6.7.1 needs [1] and a part of [2]+[3]. [2] was intended
-to fix building with Qt6.8 but turned out part of it was needed for 6.7.1
-and this was adjusted in [3]. [2] does not apply cleanly so only taking
-the bit needed given 6.8 can wait for a proper release.
-
-[1] https://github.com/qt-creator/qt-creator/commit/041727fb2
-[2] https://github.com/qt-creator/qt-creator/commit/6babc022d
-[3] https://github.com/qt-creator/qt-creator/commit/fcf2d2064
---- a/src/libs/utils/fsengine/fsengine_impl.h
-+++ b/src/libs/utils/fsengine/fsengine_impl.h
-@@ -52,4 +52,7 @@
- uint ownerId(FileOwner) const override;
- QString owner(FileOwner) const override;
-+ #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 1)
-+ using FileTime = QFile::FileTime;
-+ #endif
- bool setFileTime(const QDateTime &newDate, FileTime time) override;
- QDateTime fileTime(FileTime time) const override;
---- a/src/plugins/languageclient/languageclientutils.cpp
-+++ b/src/plugins/languageclient/languageclientutils.cpp
-@@ -236,6 +236,6 @@
- Client *client = LanguageClientManager::clientForDocument(textEditor->textDocument());
-
-- ClientExtras *extras = widget->findChild<ClientExtras *>(clientExtrasName,
-- Qt::FindDirectChildrenOnly);
-+ ClientExtras *extras = dynamic_cast<ClientExtras *>(
-+ widget->findChild<QObject *>(clientExtrasName, Qt::FindDirectChildrenOnly));
- if (!extras) {
- if (!client)
diff --git a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
deleted file mode 100644
index 12edbaa8754c..000000000000
--- a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm-r1 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 keyring plugin-dev qmldesigner
- serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-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,dbus,gui,network,widgets,xml]
- >=dev-qt/qtdeclarative-${QT_PV}=
- clang? (
- dev-cpp/yaml-cpp:=
- $(llvm_gen_dep 'sys-devel/clang:${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}
- )
- 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,qtattributionsscanner] )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
- "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
- "${FILESDIR}"/${P}-qt671.patch
-)
-
-pkg_setup() {
- python-any-r1_pkg_setup
- use clang && llvm-r1_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
-
- 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() {
- # -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)
-
- -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
-
- # 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=(
- # 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-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:
-- 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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2024-05-06 1:37 Ionen Wolkens
0 siblings, 0 replies; 12+ messages in thread
From: Ionen Wolkens @ 2024-05-06 1:37 UTC (permalink / raw
To: gentoo-commits
commit: 75c319b193950fbdd168f96adf0e6cbd441496b0
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 00:09:51 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May 6 00:41:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c319b1
dev-qt/qt-creator: fix build with upcoming Qt6.7.1
6.7.1 is (currently) due to release in ~2 days and it seems
unlikely qt-creator-13.0.1 will release before then.
Patch should be safe so doing straight-to-stable to spare
users from a revbump long rebuild.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../qt-creator/files/qt-creator-13.0.0-qt671.patch | 29 ++++++++++++++++++++++
dev-qt/qt-creator/qt-creator-13.0.0.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch b/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch
new file mode 100644
index 000000000000..986f328fa8eb
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch
@@ -0,0 +1,29 @@
+Building with Qt6.7.1 needs [1] and a part of [2]+[3]. [2] was intended
+to fix building with Qt6.8 but turned out part of it was needed for 6.7.1
+and this was adjusted in [3]. [2] does not apply cleanly so only taking
+the bit needed given 6.8 can wait for a proper release.
+
+[1] https://github.com/qt-creator/qt-creator/commit/041727fb2
+[2] https://github.com/qt-creator/qt-creator/commit/6babc022d
+[3] https://github.com/qt-creator/qt-creator/commit/fcf2d2064
+--- a/src/libs/utils/fsengine/fsengine_impl.h
++++ b/src/libs/utils/fsengine/fsengine_impl.h
+@@ -52,4 +52,7 @@
+ uint ownerId(FileOwner) const override;
+ QString owner(FileOwner) const override;
++ #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 1)
++ using FileTime = QFile::FileTime;
++ #endif
+ bool setFileTime(const QDateTime &newDate, FileTime time) override;
+ QDateTime fileTime(FileTime time) const override;
+--- a/src/plugins/languageclient/languageclientutils.cpp
++++ b/src/plugins/languageclient/languageclientutils.cpp
+@@ -236,6 +236,6 @@
+ Client *client = LanguageClientManager::clientForDocument(textEditor->textDocument());
+
+- ClientExtras *extras = widget->findChild<ClientExtras *>(clientExtrasName,
+- Qt::FindDirectChildrenOnly);
++ ClientExtras *extras = dynamic_cast<ClientExtras *>(
++ widget->findChild<QObject *>(clientExtrasName, Qt::FindDirectChildrenOnly));
+ if (!extras) {
+ if (!client)
diff --git a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
index fb3c7244f96b..12edbaa8754c 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
@@ -88,6 +88,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+ "${FILESDIR}"/${P}-qt671.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2023-12-12 13:17 Ionen Wolkens
0 siblings, 0 replies; 12+ messages in thread
From: Ionen Wolkens @ 2023-12-12 13:17 UTC (permalink / raw
To: gentoo-commits
commit: 6cb6580b8c2250e0e43bc9562d49500371afe967
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 12:18:15 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 13:16:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb6580b
dev-qt/qt-creator: drop 11.0.3
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qt-creator/Manifest | 1 -
.../qt-creator-11.0.2-musl-no-malloc-trim.patch | 10 -
dev-qt/qt-creator/qt-creator-11.0.3.ebuild | 262 ---------------------
3 files changed, 273 deletions(-)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index caa1ae484ad1..b48bd50d7f52 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-11.0.3.tar.xz 49863336 BLAKE2B 60ce53bdc0d3a2167a62cf479e9d3427b3a4f6e3ba5eb0489e0546d80fb30f9bcea1174b67cb36673a7aa2094d5f82a7d8ab34decf47fe0c260893f0a55c9795 SHA512 4d0faab02cb9b123f135b3a436e9f4132f459fd40400b9adab8af0a395b9d999f473f2bbab7cb5353f5a129bfc66e3e8dfe9143412cbd03c385a3d052ef221ca
DIST qt-creator-opensource-src-12.0.0.tar.xz 50995944 BLAKE2B 1fd4abbd9386b7d15f14c141cb82e7061e99c226a8fd68aff1807fe1dd7e92348ccaee193112fa546d6350813261e1a44e01002d3f590921091cbc13731c6382 SHA512 e2383dece32d0fb49d95a4f4190ca70e182533a8a2e4eb13c782a39b700feb1eef59508c6f5b0abaf72ad09498380ccf51ef80d71ec7294b4df2745b918316af
diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch
deleted file mode 100644
index d4936882d4d2..000000000000
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-malloc_trim() is unavailable with musl
---- a/src/plugins/coreplugin/mainwindow.cpp
-+++ b/src/plugins/coreplugin/mainwindow.cpp
-@@ -222,5 +222,5 @@
- m_trimTimer.setInterval(60000);
- // glibc may not actually free memory in free().
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- connect(&m_trimTimer, &QTimer::timeout, this, [] { malloc_trim(0); });
- #endif
diff --git a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild b/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
deleted file mode 100644
index 089d5576fdc9..000000000000
--- a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
+++ /dev/null
@@ -1,262 +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 )"
-
-LLVM_MAX_SLOT=17
-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
-)
-
-llvm_check_deps() {
- has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2023-10-10 20:20 Ionen Wolkens
0 siblings, 0 replies; 12+ messages in thread
From: Ionen Wolkens @ 2023-10-10 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 1eb216e5795dd62466726179d4e99ffc06af2253
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 18:55:12 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 20:18:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb216e5
dev-qt/qt-creator: drop 11.0.2
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qt-creator/Manifest | 1 -
.../qt-creator/files/qt-creator-11.0.2-qt653.patch | 31 ---
.../files/qt-creator-11.0.2-yaml-cpp-0.8.patch | 29 ---
dev-qt/qt-creator/qt-creator-11.0.2.ebuild | 261 ---------------------
4 files changed, 322 deletions(-)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 3d5794daf457..6402206232fe 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-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
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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2021-07-11 5:37 Davide Pesavento
0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2021-07-11 5:37 UTC (permalink / raw
To: gentoo-commits
commit: 69c7ab38c931d19f61adb59bebadecc2ca598632
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 11 05:29:54 2021 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 05:29:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c7ab38
dev-qt/qt-creator: remove half-broken 4.12.3-r1
Bug: https://bugs.gentoo.org/757756
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
dev-qt/qt-creator/Manifest | 1 -
.../files/qt-creator-4.12.0-dylib-fix.patch | 84 --------
.../qt-creator-4.12.0-libclangformat-ide.patch | 64 ------
dev-qt/qt-creator/metadata.xml | 2 -
dev-qt/qt-creator/qt-creator-4.12.3-r1.ebuild | 235 ---------------------
5 files changed, 386 deletions(-)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index d88825421b0..975ecb0a7d2 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a SHA512 a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3
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 0d4deb2c795..00000000000
--- 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 12c46c89ed0..00000000000
--- 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 f1b1bb3d025..c9357db9d2d 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.12.3-r1.ebuild
deleted file mode 100644
index 5e676fcc1ce..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.12.3-r1.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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"
-
-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 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.12.3: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:10
- dev-libs/libclangformat-ide:10 )
- ( sys-devel/clang:9
- dev-libs/libclangformat-ide:9 )
- )
- <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
- )
- designer? ( >=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]
- 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.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}"
-}
-
-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/\<check\>//' 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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2020-06-25 7:11 Jason A. Donenfeld
0 siblings, 0 replies; 12+ messages in thread
From: Jason A. Donenfeld @ 2020-06-25 7:11 UTC (permalink / raw
To: gentoo-commits
commit: c7eeefaef05e0014713eef90e3ff50f21f11346d
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Tue May 19 03:16:47 2020 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7eeefae
dev-qt/qt-creator: Build against dev-libs/libclangformat-ide
Build against a patched libclangFormat in the correct slot for a fully
functional clangformat plugin.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
.../qt-creator-4.12.0-libclangformat-ide.patch | 64 ++++++++++++++++++++++
dev-qt/qt-creator/qt-creator-9999.ebuild | 14 +++--
2 files changed, 74 insertions(+), 4 deletions(-)
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
new file mode 100644
index 00000000000..12c46c89ed0
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch
@@ -0,0 +1,64 @@
+--- 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/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 3f09133f6ee..ff58c169e4e 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -68,8 +68,10 @@ CDEPEND="
kde-frameworks/syntax-highlighting:5
clang? (
|| (
- sys-devel/clang:10
- sys-devel/clang:9
+ ( sys-devel/clang:10
+ dev-libs/libclangformat-ide:10 )
+ ( sys-devel/clang:9
+ dev-libs/libclangformat-ide:9 )
)
<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
)
@@ -110,10 +112,14 @@ for x in ${PLOCALES}; do
done
unset x
-PATCHES=( "${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch )
+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 "sys-devel/clang:${LLVM_SLOT}" && \
+ has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}"
}
pkg_setup() {
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2020-06-25 6:21 Jason A. Donenfeld
0 siblings, 0 replies; 12+ messages in thread
From: Jason A. Donenfeld @ 2020-06-25 6:21 UTC (permalink / raw
To: gentoo-commits
commit: b5b9383e897b618372ae474fedb68517738a0d04
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 06:12:58 2020 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 06:19:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b9383e
dev-qt/qt-creator: build with clang 10 and bump to 4.12.3
Closes: https://bugs.gentoo.org/723644
Closes: https://bugs.gentoo.org/722306
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
dev-qt/qt-creator/Manifest | 2 +-
.../files/qt-creator-4.12.3-clang-libs.patch | 24 ++++++++++++++++++++++
.../files/qt-creator-4.12.3-preload-plugins.patch | 13 ++++++++++++
...ator-4.12.0.ebuild => qt-creator-4.12.3.ebuild} | 9 ++++++--
4 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index d7586825807..98c7d26ee6f 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,3 @@
DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
-DIST qt-creator-opensource-src-4.12.0.tar.xz 32575196 BLAKE2B 193e10a790f35944473c2177ba84e6e15d00effc769b4d63a51a217e4da93a4d6ca0061976d0def31c625a73d49b0adcb40e551d02a70ab7225b40f441d9b6b6 SHA512 9c35ebf095c2874b89af54b06fd190976a27f7e753a23e47db3b26947bdba64e4fe7774ae8b252867cf7f6f0c86b35d773a4012cae6d4aaa9101d7a31973f215
+DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.3-clang-libs.patch b/dev-qt/qt-creator/files/qt-creator-4.12.3-clang-libs.patch
new file mode 100644
index 00000000000..a0cc8c54738
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-4.12.3-clang-libs.patch
@@ -0,0 +1,24 @@
+diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
+index 08838838bc..bee3779484 100644
+--- a/src/shared/clang/clang_installation.pri
++++ b/src/shared/clang/clang_installation.pri
+@@ -131,9 +131,7 @@ defineReplace(extractWarnings) {
+ return($$result)
+ }
+
+-CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
+- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
+- -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic
++CLANGTOOLING_LIBS=-lclang-cpp
+ win32:CLANGTOOLING_LIBS += -lversion
+
+ BIN_EXTENSION =
+@@ -207,7 +205,7 @@ 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
++ CLANGFORMAT_LIBS=-lclang-cpp
+ ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
+ -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
+ -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch b/dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch
new file mode 100644
index 00000000000..d4ec515fe05
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp
+index 166d1c94e0..de0b9cc67b 100644
+--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
++++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
+@@ -67,7 +67,7 @@ static QStringList clazyPluginArguments(const ClangDiagnosticConfig diagnosticCo
+ QStringList arguments;
+
+ if (diagnosticConfig.isClazyEnabled()) {
+- arguments << XclangArgs({"-add-plugin", "clazy"});
++ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", "clazy"});
+ if (!diagnosticConfig.clazyChecks().isEmpty())
+ arguments << XclangArgs({"-plugin-arg-clazy", diagnosticConfig.clazyChecks()});
+ }
diff --git a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
similarity index 97%
rename from dev-qt/qt-creator/qt-creator-4.12.0.ebuild
rename to dev-qt/qt-creator/qt-creator-4.12.3.ebuild
index a4ca520e993..bfcf6f271e6 100644
--- a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-LLVM_MAX_SLOT=9
+LLVM_MAX_SLOT=10
PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
inherit llvm qmake-utils virtualx xdg
@@ -59,7 +59,7 @@ CDEPEND="
>=dev-qt/qtwidgets-${QT_PV}
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
- clang? ( >=sys-devel/clang-9.0.1:= )
+ clang? ( sys-devel/clang:10 )
designer? ( >=dev-qt/designer-${QT_PV} )
help? (
>=dev-qt/qthelp-${QT_PV}
@@ -99,6 +99,11 @@ for x in ${PLOCALES}; do
done
unset x
+PATCHES=(
+ "${FILESDIR}/${PN}"-4.12.3-clang-libs.patch
+ "${FILESDIR}/${PN}"-4.12.3-preload-plugins.patch
+)
+
pkg_setup() {
use clang && llvm_pkg_setup
}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2016-04-29 16:42 Davide Pesavento
0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2016-04-29 16:42 UTC (permalink / raw
To: gentoo-commits
commit: b9b896f3f927a57afde1c63a6ff387fc08996666
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 16:42:05 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 16:42:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9b896f3
dev-qt/qt-creator: drop old version that won't be stabilized
Package-Manager: portage-2.2.28
dev-qt/qt-creator/Manifest | 1 -
.../files/3.5.1-tst_fileutils-parentDir.patch | 32 ----
dev-qt/qt-creator/qt-creator-3.5.1.ebuild | 166 ---------------------
3 files changed, 199 deletions(-)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index a6f4506..a84b87a 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,5 +1,4 @@
DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
-DIST qt-creator-opensource-src-3.5.1.tar.gz 22580581 SHA256 5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65 SHA512 ccd5e4ee669c749b19c53f4a3c18d59f73747ca18198648be48d8e5c1cc484cc360ebdb5100546cc5811d88a5139b9997d6cec1d5eeeccf7634f1c803a6e3722 WHIRLPOOL 85883e3462eabc03e16abaaef9cc002377b0856119ce3c1aa8aa8d5cf51a90bab667219fdf40abc7ac42f1b338337a9e152944d26c46e85747da9273e4888448
DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
DIST qt-creator-opensource-src-4.0.0-rc1.tar.gz 22781346 SHA256 33e478b4c5d024bcab07fa6974b2af6818666812ff88f153405bedb557e0c566 SHA512 b109a5144c276183d2c9ae1d2406bf555536b3799bf3ea442d2fed37495eb2c79a2f3fbfbbd060fdbecd4d4a54804b56b9f81285127621ffb382de89b5bdb451 WHIRLPOOL f04b51d848230b7c791659e899a8e7c517488972447a1426aa36bf95e25803ee94dd2458fa0dabd7f5a68d156a8b0ceb789331dea3200dccd0d16d8cc560e3a0
diff --git a/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch b/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch
deleted file mode 100644
index c34965d..0000000
--- a/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d30eeb9c9866161a16fc38fcca7ad3772d30fcc8 Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <pesa@gentoo.org>
-Date: Sun, 18 Oct 2015 02:43:59 +0200
-Subject: Tests: add missing column to tst_fileutils::parentDir testcase
-
-The third column was accidentally removed from one data row in
-commit 271794fbc9cbeaa3393808691742893602de6cf5
-
-Fixes the following fatal error:
-QFETCH: Requested testdata 'expectFailMessage' not available, check your _data function.
-
-Change-Id: I4a09df2e044b4dcee1ed2ffc589082a3e2601232
----
- tests/auto/utils/fileutils/tst_fileutils.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp
-index dd02f57..0b1e502 100644
---- a/tests/auto/utils/fileutils/tst_fileutils.cpp
-+++ b/tests/auto/utils/fileutils/tst_fileutils.cpp
-@@ -62,7 +62,7 @@ void tst_fileutils::parentDir_data()
- QTest::newRow("//") << "//" << "" << "";
- QTest::newRow("/tmp/dir") << "/tmp/dir" << "/tmp" << "";
- QTest::newRow("relative/path") << "relative/path" << "relative" << "";
-- QTest::newRow("relativepath") << "relativepath" << ".";
-+ QTest::newRow("relativepath") << "relativepath" << "." << "";
-
- // Windows stuff:
- #ifdef Q_OS_WIN
---
-2.6.2
-
diff --git a/dev-qt/qt-creator/qt-creator-3.5.1.ebuild b/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
deleted file mode 100644
index 27b0b1e..0000000
--- a/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-inherit eutils l10n multilib qmake-utils virtualx
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI=(
- "git://code.qt.io/${PN}/${PN}.git"
- "https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
- bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
- perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.4.0:5"
-
-RDEPEND="
- =dev-libs/botan-1.10*[-bindist,threads]
- >=dev-qt/designer-${QT_PV}
- >=dev-qt/qtconcurrent-${QT_PV}
- >=dev-qt/qtcore-${QT_PV}
- >=dev-qt/qtdeclarative-${QT_PV}[widgets]
- >=dev-qt/qtgui-${QT_PV}
- >=dev-qt/qthelp-${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}
- >=sys-devel/gdb-7.5[client,python]
- clang? ( =sys-devel/clang-3.6*:= )
- qbs? ( >=dev-util/qbs-1.4.2 )
- systemd? ( sys-apps/systemd:= )
- webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
- >=dev-qt/linguist-tools-${QT_PV}
- virtual/pkgconfig
- doc? ( >=dev-qt/qdoc-${QT_PV} )
- test? ( >=dev-qt/qttest-${QT_PV} )
-"
-for x in ${PLOCALES}; do
- # qt translations must be installed for qt-creator translations to work
- RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
- autotools? ( sys-devel/autoconf )
- bazaar? ( dev-vcs/bzr )
- cmake? ( dev-util/cmake )
- cvs? ( dev-vcs/cvs )
- git? ( dev-vcs/git )
- mercurial? ( dev-vcs/mercurial )
- subversion? ( dev-vcs/subversion )
- valgrind? ( dev-util/valgrind )
-"
-
-PATCHES=(
- "${FILESDIR}/3.5.1-tst_fileutils-parentDir.patch"
-)
-
-src_unpack() {
- if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
- eerror "GCC version 4.7 or later is required to build Qt Creator"
- die "GCC >= 4.7 required"
- fi
-
- if [[ ${PV} == *9999 ]]; then
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- # apply patches
- [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
- epatch_user
-
- # disable unwanted plugins
- for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
- if ! use ${plugin%:*}; then
- einfo "Disabling ${plugin%:*} plugin"
- sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
- src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
- fi
- done
-
- # automagic dep on qtwebkit (bug 538236)
- if ! use webkit; then
- sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
- src/plugins/help/help.pro || die "failed to disable webkit"
- fi
-
- # disable broken or unreliable tests
- sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
- sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
- sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
-
- # fix translations
- sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
- share/qtcreator/translations/translations.pro || die
-
- # remove bundled qbs
- rm -rf src/shared/qbs || die
-}
-
-src_configure() {
- eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
- IDE_PACKAGE_MODE=1 \
- $(use clang && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
- $(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) \
- USE_SYSTEM_BOTAN=1
-}
-
-src_test() {
- cd tests/auto || die
- VIRTUALX_COMMAND=default virtualmake
-}
-
-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
-
- # install desktop file
- make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/
@ 2015-10-18 1:48 Davide Pesavento
0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2015-10-18 1:48 UTC (permalink / raw
To: gentoo-commits
commit: 24a9fd87a6d73a113facd6c3c73383ca43ac778b
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 01:42:07 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 01:48:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a9fd87
dev-qt/qt-creator: bump to 3.5.1
Fixed also bug 560398 and 563312
Package-Manager: portage-2.2.23
dev-qt/qt-creator/Manifest | 1 +
.../files/3.5.1-tst_fileutils-parentDir.patch | 32 +++++
dev-qt/qt-creator/qt-creator-3.5.1.ebuild | 158 +++++++++++++++++++++
3 files changed, 191 insertions(+)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index ffde8f9..9ade25f 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -2,3 +2,4 @@ DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb
DIST qt-creator-opensource-src-3.2.2.tar.gz 22789455 SHA256 a115f1d7b08446dcfeb79537f3d8d251dbc3c9808d0ff377efe5c4fad7dbd8f0 SHA512 f85381eb6f56d787e5efe02407c4b6f949fd2a766a25567ceccb3a002ec7dd9c6277d9cf39ef0afdd8e110d7bc7436344756225784009a2e01ba9fd8428f885e WHIRLPOOL aa65009cffbc10161cdd9f8e70121c5b2e80df034bb1e06400558a947dcf3284cc23d1b162f85a7ed19af216f0d94d0c5f997c0072c3f19149f64e528fde36a7
DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
DIST qt-creator-opensource-src-3.5.0.tar.gz 22583597 SHA256 5dc35f81b50d65243a6ae046125061051d03c3d50937a37e29e0669384bb0eb6 SHA512 bdae95a6ba9950ff7cfc021a89af52972ca735d3831f7df49418b06b0ce45130a42ed1d29a02dbb03f4739226adb22b55dd6701071da44f8c0e31ba389cc66d0 WHIRLPOOL 5bde80476b57df65defb2f32ef5c2263bc4c157ba0c85cf369d190ec364e916da5760ff57b53ef4f8bcad09cf7c4d24185aa52ffe08e54ce5035dc2d4ca95679
+DIST qt-creator-opensource-src-3.5.1.tar.gz 22580581 SHA256 5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65 SHA512 ccd5e4ee669c749b19c53f4a3c18d59f73747ca18198648be48d8e5c1cc484cc360ebdb5100546cc5811d88a5139b9997d6cec1d5eeeccf7634f1c803a6e3722 WHIRLPOOL 85883e3462eabc03e16abaaef9cc002377b0856119ce3c1aa8aa8d5cf51a90bab667219fdf40abc7ac42f1b338337a9e152944d26c46e85747da9273e4888448
diff --git a/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch b/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch
new file mode 100644
index 0000000..c34965d
--- /dev/null
+++ b/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch
@@ -0,0 +1,32 @@
+From d30eeb9c9866161a16fc38fcca7ad3772d30fcc8 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Sun, 18 Oct 2015 02:43:59 +0200
+Subject: Tests: add missing column to tst_fileutils::parentDir testcase
+
+The third column was accidentally removed from one data row in
+commit 271794fbc9cbeaa3393808691742893602de6cf5
+
+Fixes the following fatal error:
+QFETCH: Requested testdata 'expectFailMessage' not available, check your _data function.
+
+Change-Id: I4a09df2e044b4dcee1ed2ffc589082a3e2601232
+---
+ tests/auto/utils/fileutils/tst_fileutils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp
+index dd02f57..0b1e502 100644
+--- a/tests/auto/utils/fileutils/tst_fileutils.cpp
++++ b/tests/auto/utils/fileutils/tst_fileutils.cpp
+@@ -62,7 +62,7 @@ void tst_fileutils::parentDir_data()
+ QTest::newRow("//") << "//" << "" << "";
+ QTest::newRow("/tmp/dir") << "/tmp/dir" << "/tmp" << "";
+ QTest::newRow("relative/path") << "relative/path" << "relative" << "";
+- QTest::newRow("relativepath") << "relativepath" << ".";
++ QTest::newRow("relativepath") << "relativepath" << "." << "";
+
+ // Windows stuff:
+ #ifdef Q_OS_WIN
+--
+2.6.2
+
diff --git a/dev-qt/qt-creator/qt-creator-3.5.1.ebuild b/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
new file mode 100644
index 0000000..d12592a
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+inherit eutils l10n multilib qmake-utils virtualx
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://doc.qt.io/qtcreator/"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI=(
+ "git://code.qt.io/${PN}/${PN}.git"
+ "https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+ S=${WORKDIR}/${MY_P}
+fi
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
+ bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
+ perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.4.0:5"
+
+RDEPEND="
+ =dev-libs/botan-1.10*[-bindist,threads]
+ >=dev-qt/designer-${QT_PV}
+ >=dev-qt/qtconcurrent-${QT_PV}
+ >=dev-qt/qtcore-${QT_PV}
+ >=dev-qt/qtdeclarative-${QT_PV}[widgets]
+ >=dev-qt/qtgui-${QT_PV}
+ >=dev-qt/qthelp-${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}
+ >=sys-devel/gdb-7.5[client,python]
+ clang? ( >=sys-devel/clang-3.6:= )
+ qbs? ( >=dev-util/qbs-1.4.2 )
+ systemd? ( sys-apps/systemd:= )
+ webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/linguist-tools-${QT_PV}
+ virtual/pkgconfig
+ doc? ( >=dev-qt/qdoc-${QT_PV} )
+ test? ( >=dev-qt/qttest-${QT_PV} )
+"
+for x in ${PLOCALES}; do
+ # qt translations must be installed for qt-creator translations to work
+ RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PDEPEND="
+ autotools? ( sys-devel/autoconf )
+ bazaar? ( dev-vcs/bzr )
+ cmake? ( dev-util/cmake )
+ cvs? ( dev-vcs/cvs )
+ git? ( dev-vcs/git )
+ mercurial? ( dev-vcs/mercurial )
+ subversion? ( dev-vcs/subversion )
+ valgrind? ( dev-util/valgrind )
+"
+
+src_unpack() {
+ if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
+ eerror "GCC version 4.7 or later is required to build Qt Creator"
+ die "GCC >= 4.7 required"
+ fi
+
+ if [[ ${PV} == *9999 ]]; then
+ git-r3_src_unpack
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ # disable unwanted plugins
+ for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+ if ! use ${plugin%:*}; then
+ einfo "Disabling ${plugin%:*} plugin"
+ sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+ src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+ fi
+ done
+
+ # automagic dep on qtwebkit (bug 538236)
+ if ! use webkit; then
+ sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+ src/plugins/help/help.pro || die "failed to disable webkit"
+ fi
+
+ # disable broken or unreliable tests
+ sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
+ sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+ sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+ # fix translations
+ sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+ share/qtcreator/translations/translations.pro || die
+
+ # remove bundled qbs
+ rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+ eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+ IDE_PACKAGE_MODE=1 \
+ $(use clang && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+ $(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) \
+ USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+ cd tests/auto || die
+ VIRTUALX_COMMAND=default virtualmake
+}
+
+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
+
+ # install desktop file
+ make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2025-02-21 17:36 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-26 8:06 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2025-02-21 17:36 Ionen Wolkens
2024-11-04 16:15 Ionen Wolkens
2024-06-06 13:20 Ionen Wolkens
2024-05-06 1:37 Ionen Wolkens
2023-12-12 13:17 Ionen Wolkens
2023-10-10 20:20 Ionen Wolkens
2021-07-11 5:37 Davide Pesavento
2020-06-25 7:11 Jason A. Donenfeld
2020-06-25 6:21 Jason A. Donenfeld
2016-04-29 16:42 Davide Pesavento
2015-10-18 1:48 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox