From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CCE8F158020 for ; Mon, 17 Oct 2022 19:11:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25276E0932; Mon, 17 Oct 2022 19:11:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CE5BE0932 for ; Mon, 17 Oct 2022 19:11:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA964340F1F for ; Mon, 17 Oct 2022 19:11:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E77B5A0 for ; Mon, 17 Oct 2022 19:11:39 +0000 (UTC) From: "Maciej Mrozowski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Mrozowski" Message-ID: <1666033829.011fbde92eec2c2770e354b00f0ec4fa14a20025.reavertm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/coin/coin-4.0.0.ebuild media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch X-VCS-Directories: media-libs/coin/ media-libs/coin/files/ X-VCS-Committer: reavertm X-VCS-Committer-Name: Maciej Mrozowski X-VCS-Revision: 011fbde92eec2c2770e354b00f0ec4fa14a20025 X-VCS-Branch: master Date: Mon, 17 Oct 2022 19:11:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d393318f-ee77-40c6-9f20-de87e850144c X-Archives-Hash: 6ae22b4e01346b8a441231e38481d447 commit: 011fbde92eec2c2770e354b00f0ec4fa14a20025 Author: Maciej Mrozowski gentoo org> AuthorDate: Mon Oct 17 19:05:08 2022 +0000 Commit: Maciej Mrozowski gentoo 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 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()