Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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/files/, media-sound/musescore/
Date: Thu, 06 Aug 2020 13:28:47
Message-Id: 1596720515.fee3a7887e5b7abbb31782464d8793e2594573b8.fordfrog@gentoo
1 commit: fee3a7887e5b7abbb31782464d8793e2594573b8
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 6 13:24:38 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 6 13:28:35 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee3a788
7
8 media-sound/musescore: bump to 3.5 + updated 9999
9
10 Package-Manager: Portage-3.0.1, Repoman-2.3.23
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 media-sound/musescore/Manifest | 2 ++
14 .../files/musescore-3.5-lambda-capture-this.patch | 13 ++++++++++++
15 ...usescore-3.5-remove-duplicite-declaration.patch | 12 +++++++++++
16 ...{musescore-9999.ebuild => musescore-3.5.ebuild} | 24 ++++++++++++++++------
17 media-sound/musescore/musescore-9999.ebuild | 23 +++++++++++++++------
18 5 files changed, 62 insertions(+), 12 deletions(-)
19
20 diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
21 index b3547c30c63..558cc4a8edc 100644
22 --- a/media-sound/musescore/Manifest
23 +++ b/media-sound/musescore/Manifest
24 @@ -1,2 +1,4 @@
25 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
26 +DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
27 DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f SHA512 d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
28 +DIST musescore-3.5.tar.gz 66798006 BLAKE2B dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907 SHA512 db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96
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 new file mode 100644
32 index 00000000000..283ffdc92e2
33 --- /dev/null
34 +++ b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
35 @@ -0,0 +1,13 @@
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 new file mode 100644
52 index 00000000000..b4e1ad0baf5
53 --- /dev/null
54 +++ b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
55 @@ -0,0 +1,12 @@
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-9999.ebuild b/media-sound/musescore/musescore-3.5.ebuild
70 similarity index 80%
71 copy from media-sound/musescore/musescore-9999.ebuild
72 copy to media-sound/musescore/musescore-3.5.ebuild
73 index d6ea4938d86..d56a9bca792 100644
74 --- a/media-sound/musescore/musescore-9999.ebuild
75 +++ b/media-sound/musescore/musescore-3.5.ebuild
76 @@ -5,14 +5,21 @@ EAPI=7
77
78 CMAKE_MAKEFILE_GENERATOR="emake"
79 CHECKREQS_DISK_BUILD=3500M
80 -inherit git-r3 cmake xdg check-reqs
81 +inherit cmake xdg check-reqs
82 +
83 +if [[ ${PV} == "9999" ]]; then
84 + inherit git-r3
85 + EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
86 +else
87 + SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
88 + S="${WORKDIR}/MuseScore-${PV}"
89 +fi
90
91 DESCRIPTION="WYSIWYG Music Score Typesetter"
92 HOMEPAGE="https://musescore.org/"
93 -# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
94 +# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
95 # It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
96 -SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
97 -EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
98 +SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
99
100 LICENSE="GPL-2"
101 SLOT="0"
102 @@ -56,11 +63,16 @@ RDEPEND="${DEPEND}"
103 PATCHES=(
104 "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
105 "${FILESDIR}/${P}-lambda-capture-this.patch"
106 + "${FILESDIR}/${P}-remove-duplicite-declaration.patch"
107 )
108
109 src_unpack() {
110 - git-r3_src_unpack
111 - unpack ${A}
112 + if [[ ${PV} == "9999" ]]; then
113 + git-r3_src_unpack
114 + unpack ${A}
115 + else
116 + default
117 + fi
118 }
119
120 src_prepare() {
121
122 diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
123 index d6ea4938d86..51e4cf8aa99 100644
124 --- a/media-sound/musescore/musescore-9999.ebuild
125 +++ b/media-sound/musescore/musescore-9999.ebuild
126 @@ -5,14 +5,21 @@ EAPI=7
127
128 CMAKE_MAKEFILE_GENERATOR="emake"
129 CHECKREQS_DISK_BUILD=3500M
130 -inherit git-r3 cmake xdg check-reqs
131 +inherit cmake xdg check-reqs
132 +
133 +if [[ ${PV} == "9999" ]]; then
134 + inherit git-r3
135 + EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
136 +else
137 + SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
138 + S="${WORKDIR}/MuseScore-${PV}"
139 +fi
140
141 DESCRIPTION="WYSIWYG Music Score Typesetter"
142 HOMEPAGE="https://musescore.org/"
143 -# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
144 +# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
145 # It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
146 -SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
147 -EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
148 +SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
149
150 LICENSE="GPL-2"
151 SLOT="0"
152 @@ -59,8 +66,12 @@ PATCHES=(
153 )
154
155 src_unpack() {
156 - git-r3_src_unpack
157 - unpack ${A}
158 + if [[ ${PV} == "9999" ]]; then
159 + git-r3_src_unpack
160 + unpack ${A}
161 + else
162 + default
163 + fi
164 }
165
166 src_prepare() {
Report Message
Find on MARC Find on Google Groups