public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/
Date: Sat,  6 Aug 2022 21:49:24 +0000 (UTC)	[thread overview]
Message-ID: <1659822506.86473be29f70c53a17c71f96cbbb51cc23caca7e.chewi@gentoo> (raw)

commit:     86473be29f70c53a17c71f96cbbb51cc23caca7e
Author:     Kalin KOZHUHAROV <me.kalin <AT> gmail <DOT> com>
AuthorDate: Thu Jul 21 07:43:09 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 21:48:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86473be2

media-gfx/nomacs-3.16.224-r3: Fix building with USE=plugins

It looks like qmake was renamed to qmake5 and could not be found, see
2022-03-30-qt-5_15_3-bump in Gentoo news and
https://archives.gentoo.org/gentoo-dev/message/5f3681b5b28dabeb5339d44e9585d29f

Closes: https://bugs.gentoo.org/847112
Signed-off-by: Kalin KOZHUHAROV <kalin <AT> thinrope.net>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-gfx/nomacs/nomacs-3.16.224-r2.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
index 0102090380d2..4fb8d3913800 100644
--- a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
@@ -57,6 +57,9 @@ src_prepare() {
 	if use plugins ; then
 		rmdir plugins || die
 		mv -v ../../${PLUGIN_PKG} plugins || die
+		# Fix bug #847112
+		sed -e 's:QT_QMAKE_EXECUTABLE NAMES "qmake" "qmake-qt5" "qmake.exe":QT_QMAKE_EXECUTABLE NAMES "qmake" "qmake5" "qmake.exe":' \
+			-i plugins/cmake/Utils.cmake || die
 		# Fix nomacs-plugins installation and search library directory
 		sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \
 			-i plugins/cmake/Utils.cmake || die


             reply	other threads:[~2022-08-06 21:49 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-06 21:49 James Le Cuirot [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-01  4:30 [gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/ Sam James
2025-01-01  4:30 Sam James
2024-12-31 20:24 Andreas Sturmlechner
2024-12-31 20:24 Andreas Sturmlechner
2024-11-17 17:16 Joonas Niilola
2024-11-17 17:16 Joonas Niilola
2024-03-07 23:24 Andreas Sturmlechner
2023-11-22 11:31 Arthur Zamarin
2023-10-09  7:04 Sam James
2023-09-03 12:19 Andreas Sturmlechner
2022-09-10  0:29 Sam James
2022-09-09 16:09 Andrew Ammerlaan
2021-02-23 19:53 Andreas Sturmlechner
2021-02-15  3:36 Sam James
2020-10-10 11:57 Andreas Sturmlechner
2020-10-09  8:41 Agostino Sarubbo
2020-10-04 16:59 Sam James
2020-08-30  5:20 Sam James
2020-08-09  8:32 Andreas Sturmlechner
2020-07-17 15:17 Agostino Sarubbo
2020-07-17 15:05 Agostino Sarubbo
2020-06-16 13:39 Andreas Sturmlechner
2019-04-18  9:03 Michael Palimaka
2019-02-07 11:46 Mikle Kolyada
2019-01-31 22:15 Thomas Deutschmann
2019-01-14 14:35 Mikle Kolyada
2018-12-31 16:43 Thomas Deutschmann
2018-12-29 22:02 Andreas Sturmlechner
2018-06-07 10:13 Agostino Sarubbo
2018-04-13 20:00 Andreas Sturmlechner
2018-04-13 20:00 Andreas Sturmlechner
2018-04-10  9:22 Andreas Sturmlechner
2017-12-07 11:31 Michael Palimaka
2017-09-13 12:20 Michael Palimaka
2017-08-27  7:14 Michael Palimaka
2017-08-27  7:14 Michael Palimaka
2017-06-20  5:17 Agostino Sarubbo
2017-06-18 14:01 Agostino Sarubbo
2017-04-25  8:08 Michael Palimaka
2017-01-09 12:26 Aaron Bauman
2016-12-22 17:07 Michael Palimaka
2016-10-28 20:38 Michael Palimaka
2016-08-11 16:02 Michael Palimaka
2016-06-09 11:18 Michael Palimaka
2016-03-06 12:58 Agostino Sarubbo
2015-10-04 21:44 Michał Górny
2015-10-04 14:51 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1659822506.86473be29f70c53a17c71f96cbbb51cc23caca7e.chewi@gentoo \
    --to=chewi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox