1 |
commit: 64a4d821185c9753a018610f20c613408747b767 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 31 17:47:06 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 31 17:47:42 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a4d821 |
7 |
|
8 |
media-sound/musescore-{3.3,9999}: bump + updates |
9 |
|
10 |
1) ported changes from 3.0.1-r1 to 9999 |
11 |
2) dropped -CMAKE_MIN_VERSION |
12 |
3) added CHECKREQS_DISK_BUILD |
13 |
4) updated MuseScore_General to 0.1.6 |
14 |
5) fixed icon cache update |
15 |
|
16 |
Closes: https://bugs.gentoo.org/688678 |
17 |
Closes: https://bugs.gentoo.org/694006 |
18 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
19 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
20 |
|
21 |
media-sound/musescore/Manifest | 2 ++ |
22 |
...{musescore-9999.ebuild => musescore-3.3.ebuild} | 33 +++++++++++----------- |
23 |
media-sound/musescore/musescore-9999.ebuild | 24 ++++++++-------- |
24 |
3 files changed, 31 insertions(+), 28 deletions(-) |
25 |
|
26 |
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest |
27 |
index 0c4c655eec0..8add901541c 100644 |
28 |
--- a/media-sound/musescore/Manifest |
29 |
+++ b/media-sound/musescore/Manifest |
30 |
@@ -1,2 +1,4 @@ |
31 |
DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5 SHA512 91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b |
32 |
+DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d SHA512 81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5 |
33 |
DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d |
34 |
+DIST musescore-3.3.tar.gz 64453809 BLAKE2B 278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef SHA512 b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea |
35 |
|
36 |
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-3.3.ebuild |
37 |
similarity index 84% |
38 |
copy from media-sound/musescore/musescore-9999.ebuild |
39 |
copy to media-sound/musescore/musescore-3.3.ebuild |
40 |
index 54404ac316e..436f8021bc1 100644 |
41 |
--- a/media-sound/musescore/musescore-9999.ebuild |
42 |
+++ b/media-sound/musescore/musescore-3.3.ebuild |
43 |
@@ -1,25 +1,30 @@ |
44 |
# Copyright 1999-2019 Gentoo Authors |
45 |
# Distributed under the terms of the GNU General Public License v2 |
46 |
|
47 |
-EAPI=6 |
48 |
+EAPI=7 |
49 |
|
50 |
-CMAKE_MIN_VERSION="3.11" |
51 |
-inherit git-r3 cmake-utils xdg-utils gnome2-utils |
52 |
+CMAKE_MAKEFILE_GENERATOR="emake" |
53 |
+CHECKREQS_DISK_BUILD=3500M |
54 |
+inherit cmake-utils xdg-utils check-reqs |
55 |
|
56 |
DESCRIPTION="WYSIWYG Music Score Typesetter" |
57 |
HOMEPAGE="https://musescore.org/" |
58 |
# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/ |
59 |
# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there. |
60 |
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.3.tar.bz2" |
61 |
-EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" |
62 |
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz |
63 |
+ https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.6.tar.bz2" |
64 |
|
65 |
LICENSE="GPL-2" |
66 |
SLOT="0" |
67 |
-KEYWORDS="" |
68 |
+KEYWORDS="~amd64 ~x86" |
69 |
IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine" |
70 |
REQUIRED_USE="portmidi? ( portaudio )" |
71 |
|
72 |
-RDEPEND=" |
73 |
+BDEPEND=" |
74 |
+ dev-qt/linguist-tools:5 |
75 |
+ virtual/pkgconfig |
76 |
+" |
77 |
+DEPEND=" |
78 |
dev-qt/designer:5 |
79 |
dev-qt/qtconcurrent:5 |
80 |
dev-qt/qtcore:5 |
81 |
@@ -44,19 +49,13 @@ RDEPEND=" |
82 |
vorbis? ( media-libs/libvorbis ) |
83 |
webengine? ( dev-qt/qtwebengine:5[widgets] ) |
84 |
" |
85 |
-DEPEND="${RDEPEND} |
86 |
- dev-qt/linguist-tools:5 |
87 |
- virtual/pkgconfig |
88 |
-" |
89 |
+RDEPEND="${DEPEND}" |
90 |
|
91 |
PATCHES=( |
92 |
"${FILESDIR}/${PN}-3.0.1-man-pages.patch" |
93 |
) |
94 |
|
95 |
-src_unpack() { |
96 |
- git-r3_src_unpack |
97 |
- unpack ${A} |
98 |
-} |
99 |
+S="${WORKDIR}/MuseScore-${PV}" |
100 |
|
101 |
src_prepare() { |
102 |
cmake-utils_src_prepare |
103 |
@@ -93,11 +92,11 @@ src_compile() { |
104 |
pkg_postinst() { |
105 |
xdg_mimeinfo_database_update |
106 |
xdg_desktop_database_update |
107 |
- gnome2_icon_cache_update |
108 |
+ xdg_icon_cache_update |
109 |
} |
110 |
|
111 |
pkg_postrm() { |
112 |
xdg_mimeinfo_database_update |
113 |
xdg_desktop_database_update |
114 |
- gnome2_icon_cache_update |
115 |
+ xdg_icon_cache_update |
116 |
} |
117 |
|
118 |
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild |
119 |
index 54404ac316e..15619c44fed 100644 |
120 |
--- a/media-sound/musescore/musescore-9999.ebuild |
121 |
+++ b/media-sound/musescore/musescore-9999.ebuild |
122 |
@@ -1,16 +1,17 @@ |
123 |
# Copyright 1999-2019 Gentoo Authors |
124 |
# Distributed under the terms of the GNU General Public License v2 |
125 |
|
126 |
-EAPI=6 |
127 |
+EAPI=7 |
128 |
|
129 |
-CMAKE_MIN_VERSION="3.11" |
130 |
-inherit git-r3 cmake-utils xdg-utils gnome2-utils |
131 |
+CMAKE_MAKEFILE_GENERATOR="emake" |
132 |
+CHECKREQS_DISK_BUILD=3500M |
133 |
+inherit git-r3 cmake-utils xdg-utils check-reqs |
134 |
|
135 |
DESCRIPTION="WYSIWYG Music Score Typesetter" |
136 |
HOMEPAGE="https://musescore.org/" |
137 |
# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/ |
138 |
# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there. |
139 |
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.3.tar.bz2" |
140 |
+SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.6.tar.bz2" |
141 |
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" |
142 |
|
143 |
LICENSE="GPL-2" |
144 |
@@ -19,7 +20,11 @@ KEYWORDS="" |
145 |
IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine" |
146 |
REQUIRED_USE="portmidi? ( portaudio )" |
147 |
|
148 |
-RDEPEND=" |
149 |
+BDEPEND=" |
150 |
+ dev-qt/linguist-tools:5 |
151 |
+ virtual/pkgconfig |
152 |
+" |
153 |
+DEPEND=" |
154 |
dev-qt/designer:5 |
155 |
dev-qt/qtconcurrent:5 |
156 |
dev-qt/qtcore:5 |
157 |
@@ -44,10 +49,7 @@ RDEPEND=" |
158 |
vorbis? ( media-libs/libvorbis ) |
159 |
webengine? ( dev-qt/qtwebengine:5[widgets] ) |
160 |
" |
161 |
-DEPEND="${RDEPEND} |
162 |
- dev-qt/linguist-tools:5 |
163 |
- virtual/pkgconfig |
164 |
-" |
165 |
+RDEPEND="${DEPEND}" |
166 |
|
167 |
PATCHES=( |
168 |
"${FILESDIR}/${PN}-3.0.1-man-pages.patch" |
169 |
@@ -93,11 +95,11 @@ src_compile() { |
170 |
pkg_postinst() { |
171 |
xdg_mimeinfo_database_update |
172 |
xdg_desktop_database_update |
173 |
- gnome2_icon_cache_update |
174 |
+ xdg_icon_cache_update |
175 |
} |
176 |
|
177 |
pkg_postrm() { |
178 |
xdg_mimeinfo_database_update |
179 |
xdg_desktop_database_update |
180 |
- gnome2_icon_cache_update |
181 |
+ xdg_icon_cache_update |
182 |
} |