summaryrefslogtreecommitdiff
path: root/dev-qt/qt-creator
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-11-05 09:17:35 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-11-05 09:17:35 +0000
commit54c42eb42df420f52e032fcba7727c326ef01094 (patch)
tree0dee719f67aa7ad3bfb64c3a46912acad885d738 /dev-qt/qt-creator
parenta8b01fd62375e0df65d5f8f20c5ee142ec6739b6 (diff)
gentoo auto-resync : 05:11:2022 - 09:17:35
Diffstat (limited to 'dev-qt/qt-creator')
-rw-r--r--dev-qt/qt-creator/Manifest4
-rw-r--r--dev-qt/qt-creator/qt-creator-8.0.2.ebuild (renamed from dev-qt/qt-creator/qt-creator-8.0.1.ebuild)8
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 23afe7db0d75..64e3812081e4 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,3 @@
-DIST qt-creator-opensource-src-8.0.1.tar.xz 46918596 BLAKE2B 07ab50ae9ee77372c2d79a472da8cb3c65b269b8def670f66426daf9875ca44f2a66bb2ab0c01d8591420d6c43b7ca57f6ac2a6b8443cc8a5af7c89599e3966d SHA512 ffef39e8d0694b38549f301a143dec6e2fe026a1e6098acc41bd8f9c80c93d1dbb60616042901093bdaa13380034b9dd8234d82300b1fa89ab9bce81bd3f1672
-EBUILD qt-creator-8.0.1.ebuild 13375 BLAKE2B 029161e39a4d14dad69d62752ab3088b720d056003dec67010b21e183f433996aa02f25be45830e1920047b990d460cc008227187ed9605f1b2625ffd8eefebd SHA512 64adcea38339807b856ea8c98aef9c85540f2a367334ef0a95eaddcd39cb5808b6f8a0db39fab392bb6adb8cedea1ab23720bb32ebcfafb2647b141e72da46b8
+DIST qt-creator-opensource-src-8.0.2.tar.xz 48874868 BLAKE2B 53f491441ba28f9420c76cd4adfdcb7c7ef432d756fc5bf64a507c2cd1022b35700418a7b35b7119d97f9947b5dac2a8acc56b600c3e75001f80565f1619c072 SHA512 59ff62e6592fd33ff74aeab13dd33f3817ba132fb98f8a87ea818e1e52b4af0dc292e362085733665f0867d67ff867794755b2f02067897a9fb1c14023c6fb23
+EBUILD qt-creator-8.0.2.ebuild 13543 BLAKE2B 2a62e0a970957aed589924bc46b56146a7b42b2376586f021deb973950f4476bfe4ecf6bf194984db02051840e2619cf10bd7e199f26be9c566a3521ff94c7a7 SHA512 1dd6ebd5aaf328f4838917b62c1cf465dee881ac406ecf288a290edee10862c5285620f1e85dd7e8ad8fcf28977f9bd117e1ad9f1ebae948058ec8552e6ef83b
MISC metadata.xml 3889 BLAKE2B fe54d506e96703f88697dcb61747b6ce358644a98c83e8449f65d8a2bcacedf11a39066b40de85309b4739cbd7856b1af4d5a2aa7827ad376021f97998976db2 SHA512 cc5bdbd7eb15a65803873296866805c8eaec9f8cc2bb003eda49d7493928cbf9edbe1a281bb421d696928d30c3c0060bf6c6e174ea27d7c51a7dfecf66433b6f
diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild b/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
index f03c7c4f74e0..138e0e37a74e 100644
--- a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
@@ -71,6 +71,7 @@ QT_PV="5.15.2:5"
BDEPEND="
>=dev-qt/linguist-tools-${QT_PV}
doc? ( >=dev-qt/qdoc-${QT_PV} )
+ help? ( !webengine? ( virtual/pkgconfig ) )
"
CDEPEND="
clang? (
@@ -179,6 +180,8 @@ src_prepare() {
src/libs/CMakeLists.txt
cmake_use_remove_addsubdirectory qml advanceddockingsystem \
src/libs/CMakeLists.txt
+ cmake_use_remove_addsubdirectory clang clangtools \
+ src/plugins/CMakeLists.txt
cmake_use_remove_addsubdirectory test test \
src/plugins/mcusupport/CMakeLists.txt
@@ -213,7 +216,8 @@ src_prepare() {
if use help && ! use webengine; then
# unbundled gumbo doesn't use cmake
- local gumbo_dep='pkg_check_modules(gumbo REQUIRED IMPORTED_TARGET gumbo)\n'
+ local gumbo_dep='find_package(PkgConfig REQUIRED)\n'
+ gumbo_dep+='pkg_check_modules(gumbo REQUIRED IMPORTED_TARGET gumbo)\n'
sed -i -e '/^\s*gumbo/s|gumbo|PkgConfig::gumbo|' \
-e "/^find_package(litehtml/s|^|${gumbo_dep}|" \
src/libs/qlitehtml/src/CMakeLists.txt || die
@@ -336,7 +340,6 @@ src_configure() {
# Clang stuff
-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
- -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
# QML stuff
# -DBUILD_PLUGIN_QMLDESIGNER=$(usex qml) #Qt6 only
@@ -360,6 +363,7 @@ src_configure() {
-DClang_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/clang"
-DLLVM_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/llvm"
-DCLANGTOOLING_LINK_CLANG_DYLIB=YES
+ -DBUILD_PLUGIN_CLANGTOOLS=YES
)
fi
if use help; then