Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/
Date: Thu, 02 Jun 2022 03:00:12
Message-Id: 1654138799.da2fd474f20d6540338e651e1ea7f17196bff974.sam@gentoo
1 commit: da2fd474f20d6540338e651e1ea7f17196bff974
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 2 02:52:05 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=da2fd474
7
8 media-sound/musescore: disable PCH (and ccache automagic in live)
9
10 PCH is buggy and we disable it where possible in Gentoo. As for ccache, automagic
11 usage isn't correct, and users can enable it properly via e.g. FEATURES.
12
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 .../{musescore-9999.ebuild => musescore-3.6.2-r1.ebuild} | 8 ++++++--
16 media-sound/musescore/musescore-9999.ebuild | 3 ++-
17 2 files changed, 8 insertions(+), 3 deletions(-)
18
19 diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-3.6.2-r1.ebuild
20 similarity index 95%
21 copy from media-sound/musescore/musescore-9999.ebuild
22 copy to media-sound/musescore/musescore-3.6.2-r1.ebuild
23 index c7f38acd5608..d9fdbd5e6e56 100644
24 --- a/media-sound/musescore/musescore-9999.ebuild
25 +++ b/media-sound/musescore/musescore-3.6.2-r1.ebuild
26 @@ -39,7 +39,6 @@ DEPEND="
27 dev-qt/qtgui:5
28 dev-qt/qthelp:5
29 dev-qt/qtnetwork:5
30 - dev-qt/qtnetworkauth:5
31 dev-qt/qtopengl:5
32 dev-qt/qtprintsupport:5
33 dev-qt/qtquickcontrols2:5
34 @@ -62,6 +61,11 @@ DEPEND="
35 "
36 RDEPEND="${DEPEND}"
37
38 +PATCHES=(
39 + "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
40 + "${FILESDIR}/${PN}-3.6.1-rename-audioitem.patch"
41 +)
42 +
43 src_unpack() {
44 if [[ ${PV} == "9999" ]]; then
45 git-r3_src_unpack
46 @@ -88,7 +92,7 @@ src_configure() {
47 -DBUILD_CRASH_REPORTER=OFF
48 -DBUILD_JACK="$(usex jack)"
49 -DBUILD_LAME="$(usex mp3)"
50 - -DBUILD_PCH=ON
51 + -DBUILD_PCH=OFF
52 -DBUILD_PORTAUDIO="$(usex portaudio)"
53 -DBUILD_PORTMIDI="$(usex portmidi)"
54 -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
55
56 diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
57 index c7f38acd5608..d2e8794771d9 100644
58 --- a/media-sound/musescore/musescore-9999.ebuild
59 +++ b/media-sound/musescore/musescore-9999.ebuild
60 @@ -88,7 +88,7 @@ src_configure() {
61 -DBUILD_CRASH_REPORTER=OFF
62 -DBUILD_JACK="$(usex jack)"
63 -DBUILD_LAME="$(usex mp3)"
64 - -DBUILD_PCH=ON
65 + -DBUILD_PCH=OFF
66 -DBUILD_PORTAUDIO="$(usex portaudio)"
67 -DBUILD_PORTMIDI="$(usex portmidi)"
68 -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
69 @@ -101,6 +101,7 @@ src_configure() {
70 -DOCR=OFF
71 -DOMR="$(usex omr)"
72 -DSOUNDFONT3=ON
73 + -DTRY_USE_CCACHE=OFF
74 -DZERBERUS="$(usex sfz)"
75 -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
76 -DUSE_SYSTEM_FREETYPE=ON