commit: fee3a7887e5b7abbb31782464d8793e2594573b8
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 6 13:24:38 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug 6 13:28:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee3a788
media-sound/musescore: bump to 3.5 + updated 9999
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/Manifest | 2 ++
.../files/musescore-3.5-lambda-capture-this.patch | 13 ++++++++++++
...usescore-3.5-remove-duplicite-declaration.patch | 12 +++++++++++
...{musescore-9999.ebuild => musescore-3.5.ebuild} | 24 ++++++++++++++++------
media-sound/musescore/musescore-9999.ebuild | 23 +++++++++++++++------
5 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index b3547c30c63..558cc4a8edc 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,2 +1,4 @@
DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B
65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32
SHA512
bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
+DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
SHA512
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B
be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f
SHA512
d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
+DIST musescore-3.5.tar.gz 66798006 BLAKE2B
dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907
SHA512
db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96
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
new file mode 100644
index 00000000000..283ffdc92e2
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
@@ -0,0 +1,13 @@
+diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
+index 94b1aef..6a7b4e8 100644
+--- a/mscore/scoreview.cpp
++++ b/mscore/scoreview.cpp
+@@ -2661,7 +2661,7 @@ void ScoreView::cmd(const char* s)
+ cv->updateGrips();
+ }},
+ #ifdef OMR
+- {{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
++ {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
+ if (cv->score()->masterScore()->omr())
+ showOmr(!_score->masterScore()->showOmr());
+ }},
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
new file mode 100644
index 00000000000..b4e1ad0baf5
--- /dev/null
+++
b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
@@ -0,0 +1,12 @@
+diff --git a/omr/pattern.h b/omr/pattern.h
+index b040497..1b8e0c4 100644
+--- a/omr/pattern.h
++++ b/omr/pattern.h
+@@ -24,7 +24,6 @@
+
+ namespace Ms {
+
+-enum class SymId;
+ class Sym;
+
+ //---------------------------------------------------------
diff --git a/media-sound/musescore/musescore-9999.ebuild
b/media-sound/musescore/musescore-3.5.ebuild
similarity index 80%
copy from media-sound/musescore/musescore-9999.ebuild
copy to media-sound/musescore/musescore-3.5.ebuild
index d6ea4938d86..d56a9bca792 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-3.5.ebuild
@@ -5,14 +5,21 @@ EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
CHECKREQS_DISK_BUILD=3500M
-inherit git-r3 cmake xdg check-reqs
+inherit cmake xdg check-reqs
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+else
+ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+ S="${WORKDIR}/MuseScore-${PV}"
+fi
DESCRIPTION="WYSIWYG Music Score Typesetter"
HOMEPAGE="https://musescore.org/";
-# MuseScore_General-0.1.3.tar.bz2 packaged from
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# MuseScore_General-*.tar.bz2 packaged from
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
# It has to be repackaged because the files are not versioned, current version
can be found in VERSION file there.
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2";
-EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+SRC_URI+="
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
@@ -56,11 +63,16 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
"${FILESDIR}/${P}-lambda-capture-this.patch"
+ "${FILESDIR}/${P}-remove-duplicite-declaration.patch"
)
src_unpack() {
- git-r3_src_unpack
- unpack ${A}
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_src_unpack
+ unpack ${A}
+ else
+ default
+ fi
}
src_prepare() {
diff --git a/media-sound/musescore/musescore-9999.ebuild
b/media-sound/musescore/musescore-9999.ebuild
index d6ea4938d86..51e4cf8aa99 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -5,14 +5,21 @@ EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
CHECKREQS_DISK_BUILD=3500M
-inherit git-r3 cmake xdg check-reqs
+inherit cmake xdg check-reqs
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+else
+ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+ S="${WORKDIR}/MuseScore-${PV}"
+fi
DESCRIPTION="WYSIWYG Music Score Typesetter"
HOMEPAGE="https://musescore.org/";
-# MuseScore_General-0.1.3.tar.bz2 packaged from
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# MuseScore_General-*.tar.bz2 packaged from
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
# It has to be repackaged because the files are not versioned, current version
can be found in VERSION file there.
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2";
-EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+SRC_URI+="
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
@@ -59,8 +66,12 @@ PATCHES=(
)
src_unpack() {
- git-r3_src_unpack
- unpack ${A}
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_src_unpack
+ unpack ${A}
+ else
+ default
+ fi
}
src_prepare() {
