| 1 |
commit: 7a461f04217706838471b36a5dc8233f2ed6853b |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 2 02:45:35 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 2 02:59:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a461f04 |
| 7 |
|
| 8 |
media-sound/musescore: fix finding qmake |
| 9 |
|
| 10 |
Upstream need to fix their Qt handling but w/e. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/766111 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
media-sound/musescore/musescore-3.6.2.ebuild | 7 +++++-- |
| 16 |
media-sound/musescore/musescore-9999.ebuild | 7 +++++-- |
| 17 |
2 files changed, 10 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-sound/musescore/musescore-3.6.2.ebuild b/media-sound/musescore/musescore-3.6.2.ebuild |
| 20 |
index 96f936a41a63..5cc3b579f8cd 100644 |
| 21 |
--- a/media-sound/musescore/musescore-3.6.2.ebuild |
| 22 |
+++ b/media-sound/musescore/musescore-3.6.2.ebuild |
| 23 |
@@ -1,11 +1,11 @@ |
| 24 |
-# Copyright 1999-2021 Gentoo Authors |
| 25 |
+# Copyright 1999-2022 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
|
| 30 |
CMAKE_MAKEFILE_GENERATOR="emake" |
| 31 |
CHECKREQS_DISK_BUILD=3500M |
| 32 |
-inherit cmake xdg check-reqs |
| 33 |
+inherit cmake qmake-utils xdg check-reqs |
| 34 |
|
| 35 |
if [[ ${PV} == "9999" ]]; then |
| 36 |
inherit git-r3 |
| 37 |
@@ -83,6 +83,9 @@ src_prepare() { |
| 38 |
} |
| 39 |
|
| 40 |
src_configure() { |
| 41 |
+ # bug #766111 |
| 42 |
+ export PATH="$(qt5_get_bindir):${PATH}" |
| 43 |
+ |
| 44 |
local mycmakeargs=( |
| 45 |
-DAEOLUS=OFF # does not compile |
| 46 |
-DBUILD_ALSA="$(usex alsa)" |
| 47 |
|
| 48 |
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild |
| 49 |
index 01dcab44b226..c7f38acd5608 100644 |
| 50 |
--- a/media-sound/musescore/musescore-9999.ebuild |
| 51 |
+++ b/media-sound/musescore/musescore-9999.ebuild |
| 52 |
@@ -1,11 +1,11 @@ |
| 53 |
-# Copyright 1999-2021 Gentoo Authors |
| 54 |
+# Copyright 1999-2022 Gentoo Authors |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
|
| 57 |
EAPI=7 |
| 58 |
|
| 59 |
CMAKE_MAKEFILE_GENERATOR="emake" |
| 60 |
CHECKREQS_DISK_BUILD=3500M |
| 61 |
-inherit cmake xdg check-reqs |
| 62 |
+inherit cmake qmake-utils xdg check-reqs |
| 63 |
|
| 64 |
if [[ ${PV} == "9999" ]]; then |
| 65 |
inherit git-r3 |
| 66 |
@@ -79,6 +79,9 @@ src_prepare() { |
| 67 |
} |
| 68 |
|
| 69 |
src_configure() { |
| 70 |
+ # bug #766111 |
| 71 |
+ export PATH="$(qt5_get_bindir):${PATH}" |
| 72 |
+ |
| 73 |
local mycmakeargs=( |
| 74 |
-DAEOLUS=OFF # does not compile |
| 75 |
-DBUILD_ALSA="$(usex alsa)" |
Archives