Fixed compilation with >=freetype-2.5.1 (bug #507712)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 46 insertions, 15 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/Manifest b/media-sound/musescore/Manifest
index b4ea8175c766..102b97edef19 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -4,22 +4,29 @@ Hash: SHA256
 AUX musescore-1.1-sline.patch 566 SHA256 0bdee4ec9f9e871a706ab477287e310b6c1fd57cee94a572591a158f58760479 SHA512 b887a467e6a9ddb16140988558aa01ec3e81c6481454eb7ded89fd4bc070ffc59cae07758220eb9b23e39c5b69786f3fae613b1c296dfe2d42ef0ad6b0b52e38 WHIRLPOOL 57703f125c86b65369fa0891d57b12470c2b0406595877f9a25e89974a963fa5ed8c67aa38fcf94bed4c4e7edc809b3b3e5048005f0d214d44c7e3217f4a576c
 AUX musescore-1.2-cflags.patch 2150 SHA256 bc22ab1916ed0c60e972306925fb9cf0234def0c7f41362170e4388f44fa2ed8 SHA512 a58d7bf9961c12048a1acc56f091f94576f71c9cb10041e25412d7ad9cf1f2946edd333c8ff3d34a6ea7546f53f65c35aa51e41f393d0bd46c0f4a0d7d730002 WHIRLPOOL 7711fc07a091b433a9a7398afaaf5e982232e3a68596fff28dbd0f07655a112b4a6725b57930535d05e8e12440f13a8835fec687df09ce7736733ddbe226ce47
 AUX musescore-1.3-cflags.patch 4109 SHA256 e447a215849d3cefbaee791cb977fcb4569424947611657b2ba99b33fe243940 SHA512 c5d29f59ab9d92269bb508f24aa6224144bc32a283c685e989bb9e0a305f293904ba0d33bcd169dbf1eebe0ddcc0821ae0af2130a6c2d9b8ed53719d37c83bb6 WHIRLPOOL f68a1c40a57e54f0b72aa811f248f67b96067029a7147d9318ffa59b517810f7c4be5b0d8d11cc8ae5c724e9e5bd6e9c207e0bd5735c12b3498547598689f73f
+AUX musescore-1.3-freetype251.patch 527 SHA256 f7132a8a2af19265a4a52f57d28d193f9b180c3443923f64ad8c13d6dbc6a51c SHA512 db7f277e13682414859137eacedbc1ea2a27bbedcf95509ebf471b18beb3682de0e4fb107df0c17d43768c7e0824615eebc1453cddfe941b94f47d8a1869978c WHIRLPOOL 779faac6d25277afce06924aae39f0e2dc4617f253cfd1731c0bf81b14fbe7d8e5d6d19460c67176ad03ffb1c5943cd727201a73299f3ca16459b394eb8cd141
 DIST mscore-1.1.tar.bz2 82410619 SHA256 d160b4dabbee5bbe7c0ba6e653e90fd36fae07ab7fffed2c6991b65123fee10c
 DIST mscore-1.2.tar.bz2 85739954 SHA256 e7f6c6cd705381a4583db267acbfed2dc9ce3985b20ed5407cd9cfe208d74d81 SHA512 aa92520b34d597db9fcf3c0121a56ceb7bfd8008ec5520cb318129da1c127426b0b789aab9d4754526d22c00307cc730d3c1b5a23e4252d5c5ca9e2b6cd95a38 WHIRLPOOL 6abcd260e908a045b43d210d274911cb87acacc1707638bc625aae817ad3791b13b079b6eaf44fb8b600031e7492eae86d88a6d6cb923c6badcdfe1b89314734
 DIST mscore-1.3.tar.bz2 94704857 SHA256 a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683 SHA512 65369cc62f401c059c3452ada8a8861b6dd36df54313f4039f1a8a96771a37926bb40240df88d150b99cee7bc8a4ee8963a4fdb5a162defc8be660810cbc49b4 WHIRLPOOL 89a91da5607ce8163b74f6a787b57f15ef615a32ede154f943a3d87e78f348b145d14e89c487797df1bff577085b36d5e21c6ffb2daf044cf48b01f350538be1
 EBUILD musescore-1.1.ebuild 1380 SHA256 4621f87e7c53746836d1165e048df7e0fb2436310e73f8d9bc2d19954da1fcdb SHA512 6c34def7421615e998f6cc04e05020265dfcea0044b2518a5694c343f1d9661feb7af50bb7e0b824a0da65a285e94b59ed1da3f8e83ab9eafe00270626efd2ed WHIRLPOOL 212654268ddbaf90c22300099377e15280bfa855dc9f3588c2e309a325dc4661c6ffec0484af487cd669a1cc2a766fd7d49ba170e67afaa5aecf9a470f27a885
 EBUILD musescore-1.2.ebuild 1349 SHA256 8775f8d4667cdca85e281261bcd117eaae2ada1720e31991b10bd970146d723b SHA512 24a3e361a0a0ba24496bc93148ee8726e9c66ceb143bfb1a7d1247106f4361f2591d2d60a605032230450c889e20b0eb60cbb242d820fb53509a5916ce2d9349 WHIRLPOOL 8d4f074741dad5d91d679c588d8879550b2db4a10e256a34d6dceaa2f66656b172a396afa11151e3eeb2ecdd317e787a31b329b1f87ddc16217c5bb795b68a7b
-EBUILD musescore-1.3.ebuild 1347 SHA256 cdc4996cfcc2d8376caf6346d2a092cd8dcb1c575b57eaf88b444e57b0f11a16 SHA512 8856e1d00a8d74251c6ad706a8511b147c45fbe48026108f6b29c0be0852c592f75f4bbed04b9b9d8df2358d0c77503e6da9ee4adece30bc7e32eaca4745dd7f WHIRLPOOL 1b88811e9d64d430bbb0e7514cbcc2bd7a1d6e5e85fd429529d0623c2493809e354bc883131a6591023efaae4172459aff0362881a98fd89af7761fa3f44e595
-MISC ChangeLog 4231 SHA256 ad764c9189fc2c4838ee3585de023de1843030b4b98cc35d64b90265e351a20e SHA512 2c2105b5b02fbb209554d56e8b88d8a650ba37a06b42786252430a66094eb4e221d513a9944c5e63eabd6dda18a564d876a20bdcab3f812a231f7b57ccaff1d8 WHIRLPOOL 17e7647336920d630e6fdce03ce57ac54ca894449cfd494949cf9b6fc212728b16f275e169dae1611964807821a078bd6dc2bcdecd26d9c1c60e1102e40fe440
+EBUILD musescore-1.3.ebuild 1391 SHA256 2e11b7725e9daf1a20f1505e61824e50f99e09aa2822eff3b62a609490143809 SHA512 7ff4b45854443c79ae60f0445c7bb20952412c5a2e3928270deece3281463a26592617d0c87d2adcf072b70ff32537375bf9ca3b17119feeeec29ab3f4e947c7 WHIRLPOOL 060a58228eebf7af790a64912b4582e6d378262557ecbcac489b61707f23bc3e30a5b99c73a4e628da44d25cef3134a8c2fb1414355f0620f4f36b5b3f08ac35
+MISC ChangeLog 4410 SHA256 b82d15ced3d73641097d88b713ccfce420b3e50d3444b18545c371276c3492c2 SHA512 2daeef52739bc6fae768d584b5b7962e6e7863f6924d5d0bbb3e4f94d7168fb03d4ed3157f62b41abc526223e2934864f65854b9dace8d92dd8935f03c463cce WHIRLPOOL 2f2ce21d67bb225432b67ca68de87c46ac4232b00c992834037f109eb0d9ee1015cf1c4812b245bbf5171d4429ea6b913ee5582dbc6c6ae7b707d2419efacb95
 MISC metadata.xml 159 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369 SHA512 a77b80f2ab1799aab052edd575ad80daae01c717af7bd5bf3dcda15714b9afd2e9fd6553cc20b000bc3157915b7082641a92fda56de3a9b8362ae2488925e4b1 WHIRLPOOL 913c53cb00341537eff621357b1c5b8379bb63df52d18b88fdef0173cdfd7c60f6d1ece1d42b5d0fcda69ed73ab4138f4268c6394851b07a9411a8306fef9173
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRP7fyAAoJEEqz6FtPBkyjLmUH/RtvZSzJd6bn6tRVv7T5VIDE
-vT+U8BilK9Np5nw4LClC/8gmIJQTNoUWvzdXOhO+COQkE0FG+mn1V17ghhXso5+C
-Ny2uIy0N6JJZFbF3Yydl2mNJgUJoOvu0iyegJ+wddVbfYz12mMNUZyrHDE/KCcEY
-O1RfhuxcoFycDPaOCJcJLz7HNW1C5NtBEohEb2g4aC5da2MVh4aGDe1qDPGawtB3
-IQtvE6dJ22Kk/qboZFVtKA9apiGwOegVqQOk3DoZdxDJpo2/OiuCi0E3/6DwufPp
-x8l+iukkOQgY5SOBgBS3jn4ApZ4BrSWSRsRZRl1AmaM9f7dnbz8O6rMgn8Q6wjQ=
-=A/RN
+iQIcBAEBCAAGBQJTTh8GAAoJEPiazRVxLXTFIP4QAJK3SSBBjEyPzhaSkJLif8Xn
+PsJg0GSO7tDqY57sEYE4TkiAUdEMJsXn+rA3CPEbNxcvvGRzUMtbhr+3bPQtlK/L
+3WEAvYwJJmgjTEze+Q49NeoZ9FbAjwCOZmMgNtxs3srgK2yhYFt9Noii8eFXv3WF
+4v4ZmaFK8vBZ8YNnDnYvdSSDUOsl+DhQYrTSmXhaLP6205y6Uh/X8ICfzC8Wp7Ky
+C/r8V+hpPVEfYVhvYai7A1PuAh4Y7crpi2ItbjnAz1q9Hd+0AYwcmMU+DRlz0Nog
+2wiT7Zgacdtt1IWdIEDHSHBD1ZHqbvtXWqKo5YzDoymb68A/D4TFrKzSXezXIcbN
+YUVgMDNuh00enZsYkw2W2qmSTJz6MsAI9Ngz9CvGM7mgOqpgHx+ijRPN28KADe/a
+zONezu96Vby0yTQcMvbPq/MVSWw+XFNNC8XFoKBD0ee3pLv2nui2mXN4HsqYEt5T
+eZnTYlvEO6aISH/WktAfnsk1UZo9qc2aeeStLPwnd+6ddK2w1ChYUCQcDqn1iGxQ
+hAju8lEvuqcyriXeyBesE+sFFdl1QoiyDIH0XqlQ06KhjW+9RB9eaPqbpijiFOaI
+IBuXNLWObi0Gp2wG66LFFHRzlfGGwrcV+lijW5FXZXwjJtqEcwaypEK5IVK8CydR
+WAHWEIN9J2hvdzfKmt5n
+=O7eZ
 -----END PGP SIGNATURE-----
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() {