Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
Date: Mon, 30 Jan 2017 13:20:37
Message-Id: 1485782426.afb483297962f98d38ff20f01c3f7ee679c9fbf6.johu@gentoo
1 commit: afb483297962f98d38ff20f01c3f7ee679c9fbf6
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 30 13:17:51 2017 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 30 13:20:26 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb48329
7
8 media-sound/musescore: Remove 1.3
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 media-sound/musescore/Manifest | 1 -
13 .../musescore/files/musescore-1.3-cflags.patch | 113 ---------------------
14 .../files/musescore-1.3-freetype251.patch | 19 ----
15 media-sound/musescore/musescore-1.3.ebuild | 60 -----------
16 4 files changed, 193 deletions(-)
17
18 diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
19 index 65bc3e1..7ca5ad2 100644
20 --- a/media-sound/musescore/Manifest
21 +++ b/media-sound/musescore/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST mscore-1.3.tar.bz2 94704857 SHA256 a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683 SHA512 65369cc62f401c059c3452ada8a8861b6dd36df54313f4039f1a8a96771a37926bb40240df88d150b99cee7bc8a4ee8963a4fdb5a162defc8be660810cbc49b4 WHIRLPOOL 89a91da5607ce8163b74f6a787b57f15ef615a32ede154f943a3d87e78f348b145d14e89c487797df1bff577085b36d5e21c6ffb2daf044cf48b01f350538be1
24 DIST musescore-2.0.2.tar.gz 44528670 SHA256 92f35403d1cb87bdb080a18bc37b2023a998ed9a26e7f50a5b6d30dbc3c1db45 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c WHIRLPOOL 87c5e64f721deec1389fcb5ae3d21536586a4ec8d3419d0f88cd2dca7cb6bab0e5df283de1253fd7407f7d6f0a8cf8a95bdd6c1877923193f7d3ea24167631a6
25 DIST musescore-2.0.3.tar.gz 49958474 SHA256 66c613f27fcc07252e856a51ed1162a9921f3d11ac130260763e2178b7098b01 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1 WHIRLPOOL bf31de08858404e7ccd5cf78c3433bb4e799a3bc020582953bbc83b7abe6075847352fb8f30f9be795cfc69c57dc856d05d1602bbd194c4dbed90d2ba2254ad2
26
27 diff --git a/media-sound/musescore/files/musescore-1.3-cflags.patch b/media-sound/musescore/files/musescore-1.3-cflags.patch
28 deleted file mode 100644
29 index 44af885..00000000
30 --- a/media-sound/musescore/files/musescore-1.3-cflags.patch
31 +++ /dev/null
32 @@ -1,113 +0,0 @@
33 ---- mscore-1.3/mscore/al/CMakeLists.txt
34 -+++ mscore-1.3/mscore/al/CMakeLists.txt
35 -@@ -42,7 +42,7 @@
36 -
37 - set_source_files_properties(
38 - dsp.cpp xml.cpp tempo.cpp sig.cpp pos.cpp fraction.cpp
39 -- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
40 -+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
41 - )
42 -
43 - set_source_files_properties(dspSSE.cpp
44 ---- mscore-1.3/mscore/awl/CMakeLists.txt
45 -+++ mscore-1.3/mscore/awl/CMakeLists.txt
46 -@@ -61,7 +61,7 @@
47 -
48 - set_target_properties( awl
49 - PROPERTIES COMPILE_FLAGS
50 -- "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
51 -+ "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
52 - )
53 -
54 - ADD_DEPENDENCIES(awl mops1)
55 ---- mscore-1.3/mscore/CMakeLists.txt
56 -+++ mscore-1.3/mscore/CMakeLists.txt
57 -@@ -257,9 +257,6 @@
58 - WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
59 - )
60 -
61 --set(CMAKE_CXX_FLAGS_DEBUG "-g")
62 --set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
63 --
64 - if (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
65 - if (MINGW)
66 - set(FLAGS -DQT_DEBUG -DQT_DLL)
67 -@@ -272,9 +269,9 @@
68 - endif (MINGW)
69 - else (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
70 - if (MINGW)
71 -- set(FLAGS -O2 -DNDEBUG -DQT_DLL -DQT_NO_DEBUG)
72 -+ set(FLAGS -DNDEBUG -DQT_DLL -DQT_NO_DEBUG)
73 - else (MINGW)
74 -- set(FLAGS -O2 -DNDEBUG -DQT_NO_DEBUG)
75 -+ set(FLAGS -DNDEBUG -DQT_NO_DEBUG)
76 - endif (MINGW)
77 - endif (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
78 -
79 -@@ -284,7 +281,7 @@
80 - add_custom_command(
81 - OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
82 - COMMAND ${CMAKE_CXX_COMPILER}
83 -- -x c++-header -g ${FLAGS}
84 -+ -x c++-header ${FLAGS}
85 - -I${QT_HEADERS_DIR}
86 - -o all.h.gch all.h
87 - DEPENDS ${PROJECT_BINARY_DIR}/all.h
88 ---- mscore-1.3/mscore/fluid/CMakeLists.txt
89 -+++ mscore-1.3/mscore/fluid/CMakeLists.txt
90 -@@ -28,7 +28,7 @@
91 - )
92 -
93 - set_target_properties( fluid
94 -- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
95 -+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
96 - )
97 -
98 - ADD_DEPENDENCIES(fluid mops1)
99 ---- mscore-1.3/mscore/mscore/CMakeLists.txt
100 -+++ mscore-1.3/mscore/mscore/CMakeLists.txt
101 -@@ -199,7 +199,7 @@
102 - if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
103 - set_target_properties( mscore
104 - PROPERTIES
105 -- COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB -DQT_SCRIPT_LIB"
106 -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB -DQT_SCRIPT_LIB"
107 - LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
108 - )
109 - else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
110 ---- mscore-1.3/mscore/ofqf/CMakeLists.txt
111 -+++ mscore-1.3/mscore/ofqf/CMakeLists.txt
112 -@@ -34,8 +34,8 @@
113 - )
114 -
115 - set_target_properties( ofqf
116 -- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
117 -+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
118 - )
119 -
120 - ADD_DEPENDENCIES(ofqf mops1)
121 --ADD_DEPENDENCIES(ofqf mops2)
122 -\ No newline at end of file
123 -+ADD_DEPENDENCIES(ofqf mops2)
124 ---- mscore-1.3/mscore/osdabzip/CMakeLists.txt
125 -+++ mscore-1.3/mscore/osdabzip/CMakeLists.txt
126 -@@ -29,7 +29,7 @@
127 - )
128 -
129 - set_target_properties( osdabzip
130 -- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
131 -+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
132 - )
133 -
134 - ADD_DEPENDENCIES(osdabzip mops1)
135 ---- mscore-1.3/mscore/singleapp/src/CMakeLists.txt
136 -+++ mscore-1.3/mscore/singleapp/src/CMakeLists.txt
137 -@@ -35,7 +35,7 @@
138 - )
139 -
140 - set_target_properties( qtsingleapp
141 -- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
142 -+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
143 - )
144 -
145 - ADD_DEPENDENCIES(qtsingleapp mops1)
146
147 diff --git a/media-sound/musescore/files/musescore-1.3-freetype251.patch b/media-sound/musescore/files/musescore-1.3-freetype251.patch
148 deleted file mode 100644
149 index 0fbad40..00000000
150 --- a/media-sound/musescore/files/musescore-1.3-freetype251.patch
151 +++ /dev/null
152 @@ -1,19 +0,0 @@
153 -Date: Tue, 15 Apr 2014 16:36:51 +0200
154 -Subject: [PATCH] Fix compilation with >=freetype-2.5.1 while remaining
155 - compatible with older freetype versions.
156 -
157 -This fixes Gentoo bug #507712 (https://bugs.gentoo.org/507712)
158 -
159 -Signed-off-by: Lars Wendler <polynomial-c@g.o>
160 -
161 ---- mscore-1.3/mscore/mscore/genft.cpp
162 -+++ mscore-1.3/mscore/mscore/genft.cpp
163 -@@ -27,7 +27,7 @@
164 -
165 - #include <ft2build.h>
166 - #include FT_FREETYPE_H
167 --#include <freetype/tttables.h>
168 -+#include FT_TRUETYPE_TABLES_H
169 - #include "al/xml.h"
170 -
171 - QMap<int, int> codemap;
172
173 diff --git a/media-sound/musescore/musescore-1.3.ebuild b/media-sound/musescore/musescore-1.3.ebuild
174 deleted file mode 100644
175 index fc1ae34..00000000
176 --- a/media-sound/musescore/musescore-1.3.ebuild
177 +++ /dev/null
178 @@ -1,60 +0,0 @@
179 -# Copyright 1999-2014 Gentoo Foundation
180 -# Distributed under the terms of the GNU General Public License v2
181 -# $Id$
182 -
183 -EAPI=5
184 -inherit cmake-utils eutils font
185 -
186 -MY_P="mscore-${PV}"
187 -
188 -DESCRIPTION="WYSIWYG Music Score Typesetter"
189 -HOMEPAGE="http://mscore.sourceforge.net"
190 -SRC_URI="mirror://sourceforge/mscore/${MY_P}.tar.bz2"
191 -
192 -LICENSE="GPL-2"
193 -SLOT="0"
194 -KEYWORDS="~amd64 ~x86"
195 -IUSE=""
196 -
197 -RDEPEND="media-libs/alsa-lib
198 - >=media-libs/libsndfile-1.0.19
199 - media-libs/portaudio
200 - media-sound/fluidsynth
201 - media-sound/jack-audio-connection-kit
202 - sys-libs/zlib
203 - dev-qt/qtcore:4
204 - dev-qt/qtgui:4
205 - dev-qt/qt3support:4
206 - dev-qt/qtscript:4
207 - dev-qt/qtsvg:4
208 - x11-libs/qtscriptgenerator"
209 -DEPEND="${RDEPEND}
210 - dev-texlive/texlive-context
211 - app-doc/doxygen
212 - virtual/pkgconfig"
213 -
214 -S="${WORKDIR}/${MY_P}/mscore"
215 -VARTEXFONTS="${T}/fonts"
216 -FONT_SUFFIX="ttf"
217 -FONT_S="${S}/mscore/fonts"
218 -
219 -src_prepare() {
220 - # don't build redundant qtscriptgenerator libs
221 - sed -i '/^set(BUILD_SCRIPTGEN/s/TRUE/FALSE/' CMakeLists.txt || die
222 -
223 - epatch "${FILESDIR}"/${P}-cflags.patch \
224 - "${FILESDIR}"/${P}-freetype251.patch
225 -}
226 -
227 -src_compile() {
228 - cmake-utils_src_make lupdate
229 - cmake-utils_src_make lrelease
230 - cmake-utils_src_make
231 -}
232 -
233 -src_install() {
234 - cmake-utils_src_install
235 - font_src_install
236 - dodoc ChangeLog NEWS README
237 - doman packaging/mscore.1
238 -}