commit: 011fbde92eec2c2770e354b00f0ec4fa14a20025 Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> AuthorDate: Mon Oct 17 19:05:08 2022 +0000 Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> CommitDate: Mon Oct 17 19:10:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=011fbde9
media-libs/coin: locate qhelpgenerator more reliably Bug: https://bugs.gentoo.org/863773 Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org> media-libs/coin/coin-4.0.0.ebuild | 3 ++- .../coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/media-libs/coin/coin-4.0.0.ebuild b/media-libs/coin/coin-4.0.0.ebuild index 90ef8396eb87..41f77c0f06e4 100644 --- a/media-libs/coin/coin-4.0.0.ebuild +++ b/media-libs/coin/coin-4.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -56,6 +56,7 @@ PATCHES=( "${FILESDIR}"/${P}-0004-Added-coin-default.cfg.patch "${FILESDIR}"/${P}-0005-Slightly-fix-coin.cfg.cmake.in.patch "${FILESDIR}"/${P}-0006-Fix-underlinking-against-X11.patch + "${FILESDIR}"/${P}-0007-Locate-slotted-qhelpgenerator.patch ) DOCS=( diff --git a/media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch b/media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch new file mode 100644 index 000000000000..7c53c4e12952 --- /dev/null +++ b/media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch @@ -0,0 +1,13 @@ +diff -ruN coin/src/doc/CMakeLists.txt my/src/doc/CMakeLists.txt +--- coin/src/doc/CMakeLists.txt 2019-12-23 20:47:44.000000000 +0100 ++++ my/src/doc/CMakeLists.txt 2022-10-17 21:02:17.868469249 +0200 +@@ -30,7 +30,8 @@ + endif() + endif() + if(COIN_BUILD_DOCUMENTATION_QTHELP) +- find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt qhelpgenerator") ++ find_package(Qt5Help REQUIRED) ++ get_target_property(QHG_LOCATION Qt5::qhelpgenerator LOCATION) + if(NOT QHG_LOCATION) + message(FATAL_ERROR "Missing program Qt qhelpgenerator") + else()
