From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1403764-garchives=archives.gentoo.org@lists.gentoo.org>
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 B5044158091
for <garchives@archives.gentoo.org>; Thu, 2 Jun 2022 03:00:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8B14FE07D3;
Thu, 2 Jun 2022 03:00:11 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 601BBE0391
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Jun 2022 03:00:11 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 37D623415C1
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Jun 2022 03:00:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E653105
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Jun 2022 03:00:07 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1654138799.7a461f04217706838471b36a5dc8233f2ed6853b.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/musescore/musescore-3.6.2.ebuild media-sound/musescore/musescore-9999.ebuild
X-VCS-Directories: media-sound/musescore/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 7a461f04217706838471b36a5dc8233f2ed6853b
X-VCS-Branch: master
Date: Thu, 2 Jun 2022 03:00:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1df0bd73-9086-4acd-907f-2a28aa76a357
X-Archives-Hash: 406294418186156b7475c00a5a246a06
commit: 7a461f04217706838471b36a5dc8233f2ed6853b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 02:45:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 02:59:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a461f04
media-sound/musescore: fix finding qmake
Upstream need to fix their Qt handling but w/e.
Closes: https://bugs.gentoo.org/766111
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/musescore/musescore-3.6.2.ebuild | 7 +++++--
media-sound/musescore/musescore-9999.ebuild | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/media-sound/musescore/musescore-3.6.2.ebuild b/media-sound/musescore/musescore-3.6.2.ebuild
index 96f936a41a63..5cc3b579f8cd 100644
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
+inherit cmake qmake-utils xdg check-reqs
if [[ ${PV} == "9999" ]]; then
inherit git-r3
@@ -83,6 +83,9 @@ src_prepare() {
}
src_configure() {
+ # bug #766111
+ export PATH="$(qt5_get_bindir):${PATH}"
+
local mycmakeargs=(
-DAEOLUS=OFF # does not compile
-DBUILD_ALSA="$(usex alsa)"
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 01dcab44b226..c7f38acd5608 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
+inherit cmake qmake-utils xdg check-reqs
if [[ ${PV} == "9999" ]]; then
inherit git-r3
@@ -79,6 +79,9 @@ src_prepare() {
}
src_configure() {
+ # bug #766111
+ export PATH="$(qt5_get_bindir):${PATH}"
+
local mycmakeargs=(
-DAEOLUS=OFF # does not compile
-DBUILD_ALSA="$(usex alsa)"