commit: 166a265815ff2e354e8d83e4fb6b076f058774bc Author: Peter Levine <plevine457 <AT> gmail <DOT> com> AuthorDate: Mon Oct 31 00:48:35 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Nov 5 06:32:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=166a2658
dev-qt/qt-creator: fix pkgconfig bdep virtual/pkgconfig should be included as a build dependency if building without qtwebengine support. Also, such a dep should be explicitly searched for by cmake with the 'find_package' command. Closes: https://bugs.gentoo.org/878753 Signed-off-by: Peter Levine <plevine457 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild index f03c7c4f74e0..e110647e5230 100644 --- a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild +++ b/dev-qt/qt-creator/qt-creator-8.0.1.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? ( @@ -213,7 +214,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
