[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

["Sam James" <sam@gentoo.org>]

commit:     3e34d258d85a79b4ff1723d949e136615bc9bccd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 13:02:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 13:02:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e34d258

media-sound/musescore: hack to avoid collision from bundled libs

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/musescore-9999-missing-qt-includes.patch    | 19 +++++++++----------
 media-sound/musescore/musescore-9999.ebuild           | 18 +++++++++++++-----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch b/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch
index 2cfa8f2b8fca..b49f2e148f28 100644
--- a/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch
+++ b/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch
@@ -54,15 +54,15 @@ Subject: [PATCH] Add missing includes (mostly Qt)
 --- a/src/framework/global/thirdparty/deto_async/async/promise.h
 +++ b/src/framework/global/thirdparty/deto_async/async/promise.h
 @@ -3,6 +3,9 @@
- 
- #include <memory>
- #include <string>
-+
-+#include <QtCore/qcompilerdetection.h>
-+
- #include "internal/abstractinvoker.h"
- #include "async.h"
- 
+ 
+ #include <memory>
+ #include <string>
++
++#include <QtCore/qcompilerdetection.h>
++
+ #include "internal/abstractinvoker.h"
+ #include "async.h"
+ 
 --- a/src/framework/ui/view/uitheme.h
 +++ b/src/framework/ui/view/uitheme.h
 @@ -24,6 +24,7 @@
@@ -214,4 +214,3 @@ Subject: [PATCH] Add missing includes (mostly Qt)
  #include <vector>
  
  
-

diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 06685fa6b24a..f26651950844 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR="emake"
+#CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
 inherit cmake qmake-utils xdg check-reqs
 
@@ -24,7 +24,8 @@ SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz test webengine"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 BDEPEND="
@@ -89,15 +90,15 @@ src_configure() {
 	local mycmakeargs=(
 		-DAEOLUS=OFF # does not compile
 		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_CRASH_REPORTER=OFF
+		-DBUILD_CRASHPAD_CLIENT=OFF
 		-DBUILD_JACK="$(usex jack)"
 		-DBUILD_LAME="$(usex mp3)"
 		-DBUILD_PCH=OFF
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_TELEMETRY_MODULE=ON
+		-DBUILD_UNIT_TESTS=$(usex test)
 		-DBUILD_WEBENGINE="$(usex webengine)"
 		-DCMAKE_SKIP_RPATH=ON
 		-DDOWNLOAD_SOUNDFONT=OFF
@@ -120,3 +121,10 @@ src_compile() {
 	cmake_build -j1 lrelease manpages
 	cmake_src_compile
 }
+
+src_install() {
+	cmake_src_install
+
+	# Hack to not install bundled libraries like libogg
+	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}