Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
Date: Tue, 02 Mar 2021 08:54:29
Message-Id: 1614675261.6a5b3bfc47e9e3abd77835f84560a77364aa4e9b.fordfrog@gentoo
1 commit: 6a5b3bfc47e9e3abd77835f84560a77364aa4e9b
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 2 08:54:05 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 2 08:54:21 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a5b3bfc
7
8 media-sound/musescore: removed obsolete 3.5.2
9
10 Closes: https://bugs.gentoo.org/766111
11 Package-Manager: Portage-3.0.16, Repoman-3.0.2
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 media-sound/musescore/Manifest | 1 -
15 .../files/musescore-3.5-lambda-capture-this.patch | 13 ---
16 ...usescore-3.5-remove-duplicite-declaration.patch | 12 ---
17 media-sound/musescore/musescore-3.5.2.ebuild | 118 ---------------------
18 4 files changed, 144 deletions(-)
19
20 diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
21 index 1451929632d..33839d6ed5f 100644
22 --- a/media-sound/musescore/Manifest
23 +++ b/media-sound/musescore/Manifest
24 @@ -1,4 +1,3 @@
25 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
26 -DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb SHA512 4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
27 DIST musescore-3.6.1.tar.gz 68754499 BLAKE2B 81462d8c1d57af7f58c117cbeda725ab4eb8fb313fb29f95724aaba43bd9879ae7a018c8b5de932ab8b925c4362b855b06508aba28b7c5ae0ca59ec11b2803ad SHA512 8e486ea08f8ad6b8238ca400475b9108955ff200221c9ba694e42e20e373c43f7dfd89933ca3887de26cefa547d0e1d792922c685a9d16eaefc9293f72a6fe2d
28 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
29
30 diff --git a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
31 deleted file mode 100644
32 index 283ffdc92e2..00000000000
33 --- a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
34 +++ /dev/null
35 @@ -1,13 +0,0 @@
36 -diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
37 -index 94b1aef..6a7b4e8 100644
38 ---- a/mscore/scoreview.cpp
39 -+++ b/mscore/scoreview.cpp
40 -@@ -2661,7 +2661,7 @@ void ScoreView::cmd(const char* s)
41 - cv->updateGrips();
42 - }},
43 - #ifdef OMR
44 -- {{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
45 -+ {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
46 - if (cv->score()->masterScore()->omr())
47 - showOmr(!_score->masterScore()->showOmr());
48 - }},
49
50 diff --git a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
51 deleted file mode 100644
52 index b4e1ad0baf5..00000000000
53 --- a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
54 +++ /dev/null
55 @@ -1,12 +0,0 @@
56 -diff --git a/omr/pattern.h b/omr/pattern.h
57 -index b040497..1b8e0c4 100644
58 ---- a/omr/pattern.h
59 -+++ b/omr/pattern.h
60 -@@ -24,7 +24,6 @@
61 -
62 - namespace Ms {
63 -
64 --enum class SymId;
65 - class Sym;
66 -
67 - //---------------------------------------------------------
68
69 diff --git a/media-sound/musescore/musescore-3.5.2.ebuild b/media-sound/musescore/musescore-3.5.2.ebuild
70 deleted file mode 100644
71 index b8137e72faf..00000000000
72 --- a/media-sound/musescore/musescore-3.5.2.ebuild
73 +++ /dev/null
74 @@ -1,118 +0,0 @@
75 -# Copyright 1999-2020 Gentoo Authors
76 -# Distributed under the terms of the GNU General Public License v2
77 -
78 -EAPI=7
79 -
80 -CMAKE_MAKEFILE_GENERATOR="emake"
81 -CHECKREQS_DISK_BUILD=3500M
82 -inherit cmake xdg check-reqs
83 -
84 -if [[ ${PV} == "9999" ]]; then
85 - inherit git-r3
86 - EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
87 -else
88 - SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
89 - KEYWORDS="amd64 ~arm64 x86"
90 - S="${WORKDIR}/MuseScore-${PV}"
91 -fi
92 -
93 -DESCRIPTION="WYSIWYG Music Score Typesetter"
94 -HOMEPAGE="https://musescore.org/"
95 -# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
96 -# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
97 -SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
98 -
99 -LICENSE="GPL-2"
100 -SLOT="0"
101 -IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
102 -REQUIRED_USE="portmidi? ( portaudio )"
103 -
104 -BDEPEND="
105 - dev-qt/linguist-tools:5
106 - virtual/pkgconfig
107 -"
108 -DEPEND="
109 - dev-qt/designer:5
110 - dev-qt/qtconcurrent:5
111 - dev-qt/qtcore:5
112 - dev-qt/qtdeclarative:5
113 - dev-qt/qtgui:5
114 - dev-qt/qthelp:5
115 - dev-qt/qtnetwork:5
116 - dev-qt/qtprintsupport:5
117 - dev-qt/qtquickcontrols2:5
118 - >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
119 - dev-qt/qtsvg:5
120 - dev-qt/qtxml:5
121 - dev-qt/qtxmlpatterns:5
122 - >=media-libs/freetype-2.5.2
123 - media-libs/libsndfile
124 - sys-libs/zlib:=
125 - alsa? ( >=media-libs/alsa-lib-1.0.0 )
126 - jack? ( virtual/jack )
127 - mp3? ( media-sound/lame )
128 - omr? ( app-text/poppler )
129 - portaudio? ( media-libs/portaudio )
130 - portmidi? ( media-libs/portmidi )
131 - pulseaudio? ( media-sound/pulseaudio )
132 - sf3? ( media-libs/libvorbis )
133 - webengine? ( dev-qt/qtwebengine:5[widgets] )
134 -"
135 -RDEPEND="${DEPEND}"
136 -
137 -PATCHES=(
138 - "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
139 - "${FILESDIR}/${PN}-3.5-lambda-capture-this.patch"
140 - "${FILESDIR}/${PN}-3.5-remove-duplicite-declaration.patch"
141 -)
142 -
143 -src_unpack() {
144 - if [[ ${PV} == "9999" ]]; then
145 - git-r3_src_unpack
146 - unpack ${A}
147 - else
148 - default
149 - fi
150 -}
151 -
152 -src_prepare() {
153 - cmake_src_prepare
154 -
155 - # Move soundfonts to the correct directory
156 - mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
157 -}
158 -
159 -src_configure() {
160 - local mycmakeargs=(
161 - -DAEOLUS=OFF # does not compile
162 - -DBUILD_ALSA="$(usex alsa)"
163 - -DBUILD_CRASH_REPORTER=OFF
164 - -DBUILD_JACK="$(usex jack)"
165 - -DBUILD_LAME="$(usex mp3)"
166 - -DBUILD_PCH=ON
167 - -DBUILD_PORTAUDIO="$(usex portaudio)"
168 - -DBUILD_PORTMIDI="$(usex portmidi)"
169 - -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
170 - -DBUILD_SHARED_LIBS=ON
171 - -DBUILD_TELEMETRY_MODULE=ON
172 - -DBUILD_WEBENGINE="$(usex webengine)"
173 - -DCMAKE_SKIP_RPATH=ON
174 - -DDOWNLOAD_SOUNDFONT=OFF
175 - -DHAS_AUDIOFILE=ON
176 - -DOCR=OFF
177 - -DOMR="$(usex omr)"
178 - -DSOUNDFONT3=ON
179 - -DZERBERUS="$(usex sfz)"
180 - -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
181 - -DUSE_SYSTEM_FREETYPE=ON
182 - -DUSE_SYSTEM_POPPLER=ON
183 - -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
184 - )
185 - cmake_src_configure
186 -}
187 -
188 -src_compile() {
189 - cd "${BUILD_DIR}" || die
190 - cmake_build -j1 lrelease manpages
191 - cmake_src_compile
192 -}