diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-04-16 06:11:17 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-04-16 06:11:17 +0000 |
| commit | ad60a7e7c8a3725bce92e71a6168de04e1fe65f5 (patch) | |
| tree | 2ae97867c95f760934a9d51456186396a7e157f3 /media-sound/musescore | |
| parent | Specify a working version of automake, fixing bug 506652. (diff) | |
| download | gentoo-2-ad60a7e7c8a3725bce92e71a6168de04e1fe65f5.tar.gz gentoo-2-ad60a7e7c8a3725bce92e71a6168de04e1fe65f5.tar.bz2 gentoo-2-ad60a7e7c8a3725bce92e71a6168de04e1fe65f5.zip | |
Fixed compilation with >=freetype-2.5.1 (bug #507712)
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'media-sound/musescore')
| -rw-r--r-- | media-sound/musescore/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/musescore/files/musescore-1.3-freetype251.patch | 19 | ||||
| -rw-r--r-- | media-sound/musescore/musescore-1.3.ebuild | 7 |
3 files changed, 29 insertions, 5 deletions
diff --git a/media-sound/musescore/ChangeLog b/media-sound/musescore/ChangeLog index 0aafeeb83b0f..abb2e74dbb2f 100644 --- a/media-sound/musescore/ChangeLog +++ b/media-sound/musescore/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/musescore -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.29 2013/03/12 23:19:11 radhermit Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.30 2014/04/16 06:11:17 polynomial-c Exp $ + + 16 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> musescore-1.3.ebuild, + +files/musescore-1.3-freetype251.patch: + Fixed compilation with >=freetype-2.5.1 (bug #507712). *musescore-1.3 (12 Mar 2013) diff --git a/media-sound/musescore/files/musescore-1.3-freetype251.patch b/media-sound/musescore/files/musescore-1.3-freetype251.patch new file mode 100644 index 000000000000..0fbad400e8f9 --- /dev/null +++ b/media-sound/musescore/files/musescore-1.3-freetype251.patch @@ -0,0 +1,19 @@ +Date: Tue, 15 Apr 2014 16:36:51 +0200 +Subject: [PATCH] Fix compilation with >=freetype-2.5.1 while remaining + compatible with older freetype versions. + +This fixes Gentoo bug #507712 (https://bugs.gentoo.org/507712) + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> + +--- mscore-1.3/mscore/mscore/genft.cpp ++++ mscore-1.3/mscore/mscore/genft.cpp +@@ -27,7 +27,7 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H +-#include <freetype/tttables.h> ++#include FT_TRUETYPE_TABLES_H + #include "al/xml.h" + + QMap<int, int> codemap; diff --git a/media-sound/musescore/musescore-1.3.ebuild b/media-sound/musescore/musescore-1.3.ebuild index a0eaad5e8d28..6eb38c89b213 100644 --- a/media-sound/musescore/musescore-1.3.ebuild +++ b/media-sound/musescore/musescore-1.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/musescore-1.3.ebuild,v 1.1 2013/03/12 23:19:11 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/musescore-1.3.ebuild,v 1.2 2014/04/16 06:11:17 polynomial-c Exp $ EAPI=5 inherit cmake-utils eutils font @@ -42,7 +42,8 @@ src_prepare() { # don't build redundant qtscriptgenerator libs sed -i '/^set(BUILD_SCRIPTGEN/s/TRUE/FALSE/' CMakeLists.txt || die - epatch "${FILESDIR}"/${P}-cflags.patch + epatch "${FILESDIR}"/${P}-cflags.patch \ + "${FILESDIR}"/${P}-freetype251.patch } src_compile() { |