Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/
Date: Sat, 06 Aug 2022 21:49:28
Message-Id: 1659822506.86473be29f70c53a17c71f96cbbb51cc23caca7e.chewi@gentoo
1 commit: 86473be29f70c53a17c71f96cbbb51cc23caca7e
2 Author: Kalin KOZHUHAROV <me.kalin <AT> gmail <DOT> com>
3 AuthorDate: Thu Jul 21 07:43:09 2022 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 6 21:48:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86473be2
7
8 media-gfx/nomacs-3.16.224-r3: Fix building with USE=plugins
9
10 It looks like qmake was renamed to qmake5 and could not be found, see
11 2022-03-30-qt-5_15_3-bump in Gentoo news and
12 https://archives.gentoo.org/gentoo-dev/message/5f3681b5b28dabeb5339d44e9585d29f
13
14 Closes: https://bugs.gentoo.org/847112
15 Signed-off-by: Kalin KOZHUHAROV <kalin <AT> thinrope.net>
16 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
17
18 media-gfx/nomacs/nomacs-3.16.224-r2.ebuild | 3 +++
19 1 file changed, 3 insertions(+)
20
21 diff --git a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
22 index 0102090380d2..4fb8d3913800 100644
23 --- a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
24 +++ b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
25 @@ -57,6 +57,9 @@ src_prepare() {
26 if use plugins ; then
27 rmdir plugins || die
28 mv -v ../../${PLUGIN_PKG} plugins || die
29 + # Fix bug #847112
30 + sed -e 's:QT_QMAKE_EXECUTABLE NAMES "qmake" "qmake-qt5" "qmake.exe":QT_QMAKE_EXECUTABLE NAMES "qmake" "qmake5" "qmake.exe":' \
31 + -i plugins/cmake/Utils.cmake || die
32 # Fix nomacs-plugins installation and search library directory
33 sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \
34 -i plugins/cmake/Utils.cmake || die