From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1475477-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 970D715800F
for <garchives@archives.gentoo.org>; Mon, 9 Jan 2023 13:02:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DB83EE07DB;
Mon, 9 Jan 2023 13:02:52 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 BFFDEE07DB
for <gentoo-commits@lists.gentoo.org>; Mon, 9 Jan 2023 13:02:52 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 EAC1D340E84
for <gentoo-commits@lists.gentoo.org>; Mon, 9 Jan 2023 13:02:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 57BD8771
for <gentoo-commits@lists.gentoo.org>; Mon, 9 Jan 2023 13:02:50 +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: <1673269365.3e34d258d85a79b4ff1723d949e136615bc9bccd.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/musescore/files/musescore-9999-missing-qt-includes.patch media-sound/musescore/musescore-9999.ebuild
X-VCS-Directories: media-sound/musescore/files/ media-sound/musescore/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 3e34d258d85a79b4ff1723d949e136615bc9bccd
X-VCS-Branch: master
Date: Mon, 9 Jan 2023 13:02:50 +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: 21253389-bc6a-44d8-8756-eeeb2fa90750
X-Archives-Hash: 23305cd2d37878ed74e6115e10808642
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
+}