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

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

4 files changed, 54 insertions, 10 deletions

diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index 0d13c9af6e88..52cf5c01859e 100644
--- a/media-libs/coin/ChangeLog
+++ b/media-libs/coin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/coin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.48 2013/08/09 13:42:58 axs Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.49 2014/03/21 20:53:01 polynomial-c Exp $
+
+  21 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> coin-3.1.3-r2.ebuild,
+  +files/coin-3.1.3-freetype251.patch:
+  Fixed compilation with >=freetype-2.5.1 (bug #504556).
 
   09 Aug 2013; Ian Stakenvicius <axs@gentoo.org> coin-3.1.0.ebuild,
   coin-3.1.3-r1.ebuild, coin-3.1.3-r2.ebuild:
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index cdb0eb17a5b7..0b443353ac44 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -3,19 +3,30 @@ Hash: SHA256
 
 AUX coin-3.1.0-javascript.patch 1259 SHA256 179489dfd99872150cc229d4f9d1bd40a03c67df5daad20741ff8b3a1874a883 SHA512 4b7142dae7f463616b695058b6deeac9a6d116a4647430fb6b234b30915ed5fea5d657ee49a8af553c5a946d8a04c93a5cbf98cb92fa10080c1b72ff8ac8b895 WHIRLPOOL 3d9affd7da39b76e8b9f5eba446924ce52f44f67291bd7af4568b0a102381466e88f7d3303d43b6b840957b70e0261c2afe3371bc9ce303cfdc75241231bbc60
 AUX coin-3.1.0-wrap-msvc-wine-fix.patch 20064 SHA256 e199fcd4f314cc31d1bd12a70a6837e1a93f803f7590b72a07b7a3a3bc2731eb SHA512 5f80056b35239487aa98566fd22baf2311e065f637dbb47dcf71ec1f502959a04f9611f71ea2c6b6f7fe52d65ad7ddadcd7ca73145e7f6d75416c3ab5ec3512c WHIRLPOOL c55ad174101b711fc71aa5541b15885b94511468fd0a1d0422ae28b5a3f3afc60ee176cdbe0129c1b13234f1b353f4caa8fdb5e5b63458cb4190244aed77b14b
+AUX coin-3.1.3-freetype251.patch 767 SHA256 6e490a62ff4a5145f7fb1f1cccf16cc9cdb0f243b00dcb23616d174dfcc5f5fd SHA512 f8ea66a6a21c3b20b221b4b7830feb411295e5207d0f5419183c85bfd8ae52b923f2b202f070482f1c61d4acb86b1f74d4a1ee77b09f6b86d95602db4e2c2406 WHIRLPOOL 3d338d3049d11c905a92f6bd14d2b8f64980190ba2fc49f5f0a1af4d05deeed4865ca456aebab88fe44b550d0bb670b9d21c31956b9220ccd190e7439cace152
 AUX coin-3.1.3-gcc-4.7.patch 347 SHA256 40709f40682d910e5044a11e8dba28ade2689e1b455fea0fc368722d0af3cd1c SHA512 d6f93526203a5c2f787cb03ea34214921daf49e324f867745d6bdc1c24c78359c305396d86cdbf8590b7f1610ef558390b6aba6c488052435896f089ea71d590 WHIRLPOOL ab721e76cb7ba1b0c51db3be9ef6b2b3a5161c394f48716eccaa8d9cbe431465d416e9790e994da835dbcde8e0d9d451f54460d997fc174df92ae027dc5312eb
 AUX coin-3.1.3-pkgconfig-partial.patch 431 SHA256 40d52356991d2aa35571d77373d7534208f04cde4cc828959d468b615935e4ff SHA512 6747ed14dca25017b6126ee2e542bec8cdf36cc634a8f0df059715f022a5f6c6f7126b9ea3c01e099a5564c634921fdc829c7561754df8c2dbf915659c7edb53 WHIRLPOOL c9915dd41237bd039c4c62d51ec1c711555b4b78eb590b302ac5c8dcbd37984d3f468d48fde3de540bf182c491a2ee31daea62bc919fe93cc5f1e77357f03d06
 DIST Coin-3.1.0.tar.gz 5632452 SHA256 81ec8c4bf0daca6718d6b59eca76354f5f9e1c5a19c20dd4fa173d65f04cb899 SHA512 df7975d64cce216f80e378f28f375a1c30c483b9e969bdeefc55992ddeef196b05279160e057ac27014cae04685854c34597493b446bbe4abd53177c89b0a07c WHIRLPOOL 9a3e45cc3df4003bbbbb831f317c14fbc44e9aa0cf2f6408818576465c27df7fbf008187633ac5109f14cf4932ae35158ff57ef0ba4d51101503bd32a5aab70f
 DIST Coin-3.1.3.tar.gz 5981534 SHA256 583478c581317862aa03a19f14c527c3888478a06284b9a46a0155fa5886d417 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394 WHIRLPOOL 2b02b2273acfe2f5d779d8adaca8f88c5119a3326e395cc039df6898d2c7c60888d7586de877a27fca3a4cb620662ffe9363d845836b2483c2f3108475ea696c
 EBUILD coin-3.1.0.ebuild 1720 SHA256 7d5cbc5ec736a9ce6a8693d5a81d8e88fad31e01c9878518b4243535b5f036c0 SHA512 184ebc78fc50a924a4767c4fa6e79010282435e44b6be4ccbc6603c8e7a404f3c58bfb443ef3f1e606ae83e8040719577bb3ce419ccbf271e84678e019383a2a WHIRLPOOL b7e7c0d1b99a356018d34548bf3d8bebcd4415c58db78a1915ddfa665318f793cd363caa991a2bc5814691b7b790342b70581b3be3d90ebf13678fb147ef380e
 EBUILD coin-3.1.3-r1.ebuild 2484 SHA256 355da331648c336919b0ec47ef8914299ff6a9846d0156090756d68c8a9e58dd SHA512 1c8db237aa108e33a1f01b949d8b20d8b755291146de671d4c8f563acb064966d33c6aed1f7b930990eef053b2735b87d67f0a4c79d5994492a5af9a993415b9 WHIRLPOOL b4b8e95721277b614f0f2170f31f2c8fc8ede8557d8bdf64c711f6eacd6e165b69f032c1451a3878d8611004d81beced7d0bd1bb4068a4fde5bbc947d4d08bd3
-EBUILD coin-3.1.3-r2.ebuild 2464 SHA256 affeb62f8fcb683e7d925fcdbdda259309a6ecc7d58a8b1a51391438097762ab SHA512 9f0cdc2c0da88ef749555c4dee1f98ad1c2f3061d19852530392f409100fb189f67f884b7158e94c7e5e5ce2830edece0bc119f9d51a80eedbf2b3604fcb3054 WHIRLPOOL a615ceaf6b1bd7d15e64b109982e634e3f264ef1cde2031805c74b34cfd7e04df206627efeb1efafe1b4e0822ae5ede599d02c4ea34a45e3e9cf85a525217bb2
-MISC ChangeLog 7080 SHA256 05bfd14a4051cc5fac3e8675389a3922c5a7e2e73c6321c56997454677d61a89 SHA512 735e31f9e8dfa4a640d80873f67f9ba0612546048d6ee8e48aa55db49f02826f440d4f23c146d6a5a458110c5d7f367760bca665ac5ec0ee4e02e3d1921b432b WHIRLPOOL f5c9d6cc6fb835a7a79ea0ce0e47e49535a6092dec234467e30665532bec56d721158f9dbf214aa74f33087ef1e52e210a363a228eb20dfed8f3d7168d08a9b6
+EBUILD coin-3.1.3-r2.ebuild 2511 SHA256 f4e21465ca81db061b3d4feec7832b291b11108a1623149d525ad639bac110b3 SHA512 6e07235f53a380443c9c1e40ef5d6362f400e41b481894da29ab3f1a9230a651cbf7e172a7d7fdf4bd7726320e27c7ec076ac14e21b4e68fb96dd241a656b97d WHIRLPOOL 22fabc2e7b02cf6a393a1f351b53c8ca69483a1b65bb37ee055cae3c0ec700078cd881dd7d0e026057494a4a751baf6a665a3c2e96451b8f63750d00cef88a4d
+MISC ChangeLog 7262 SHA256 a49b114bbeba859c357b8d3634f07a18ed4fa6dd1790dfbddd662935072e4114 SHA512 cb50dd30d1e331956ef093a9a1aabe7b5d06774824b65fe4cd589c34eb72ede247400247168fa5cd3816440774fe9a2f7ab070f15cca74d146a5ca782eabb110 WHIRLPOOL 8f122eff1500b207178764a7f7d58825c32abaa109278f919ab4d4ac4930a790fb149f408bb696f554bdae354bdc77fb2f476996a8255f53f34fc3ea6850ccb9
 MISC metadata.xml 314 SHA256 a07f499aa91eeb0337a38b72d870ff2e47b38af6c000a5e2383ce163815fe3b2 SHA512 2097fda75e266ca98e5050c3d1a71c7516ca4547272d02f0e30de526c77a01302c4dc306b8f774bc444c56b4ac5b84095a82debd92b503eea0a9b18762248bbd WHIRLPOOL 5845927214fc22a0567a02ec802924e8c5e4a533f461a1a2ea7abdd5f168335b26bcd57833d1b831863e0ab1c97f5104435425adcd2951d82446cf11fea8c986
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlIE8fQACgkQ2ugaI38ACPD3aQD/UMGfNh/Q91b/tvOjHr2fmBsm
-4Cr5PqhuFCtsAjLq7a8BAILYfzMi5nF4AIEgbS5GKQ3aOLst7Tt+Gom5nUpmoR5K
-=h6Dc
+iQIcBAEBCAAGBQJTLKauAAoJEPiazRVxLXTFyTEQANYoyu0146XNP9g6exHKfX6l
+3VUfDbbq9DijcFBkrIh597eLhz2g7l9/R8FnxMfCA+i4wyhsXp7JuSl2CO6qLQOc
+DnuNNXH1eJafBPRj+PfsVio7NDOdOwPEPoSSmRSi++RAaYJTWppuyFVmRavsr7A+
+XCS9/Yk1v1J5ePnFox4imzZL1AoSKl71ktIu+UdIzmmEjdPoxbXkIXttrwUUx9dp
+2rqd3EOmpWSFpMcFx0ppr+migyRitbrFaZbxQM+qls1e3myCO4gGzRQxF3XKKI9p
++1V8aeP+0xOnFKsB4J5LhVOrHANVzz56Fthow6yaMbmYOqDwtt3R8ti+4fZ3QJTZ
+rJWbATgNSy8FFNXzh7PVD3ln6HtIrohPPAoFsnyZKUFKhMD4YjKswv+183d3paat
+shBvwK5cC73qNyhosQjBXNH3LLdTa3UZIyRGIsL0G+m2aEnRoyrYOubnNlfRob/p
+bLc1nK+l//UkCtwcSZMJDl54CljhYIPG7+z3IZdkEBYIzXAwlBcwFDp061Z6L/Gl
+BzF+zlGvOJ9nipO5Ha9CbTAdsDT8IU5MfZ8X5B2EJ5C4vZCrOow1BDzmLk+WFDPy
+mJ/JyDBdZWqx7eQzzc0UFvuD2XgDbY1vzzQ/9j7RZfc/qxLmJsJft03ddPEwqYUP
+bNMTX1/KJQyTSHOS/WSy
+=olTE
 -----END PGP SIGNATURE-----
diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild
index 2da506b768b6..95c3fd0de7c4 100644
--- a/media-libs/coin/coin-3.1.3-r2.ebuild
+++ b/media-libs/coin/coin-3.1.3-r2.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-libs/coin/coin-3.1.3-r2.ebuild,v 1.6 2013/08/09 13:42:58 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.3-r2.ebuild,v 1.7 2014/03/21 20:53:01 polynomial-c Exp $
 
 EAPI=5
 
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-javascript.patch
 	"${FILESDIR}"/${P}-pkgconfig-partial.patch
 	"${FILESDIR}"/${P}-gcc-4.7.patch
+	"${FILESDIR}"/${P}-freetype251.patch
 )
 
 DOCS=(
diff --git a/media-libs/coin/files/coin-3.1.3-freetype251.patch b/media-libs/coin/files/coin-3.1.3-freetype251.patch
new file mode 100644
index 000000000000..44e8eefb1f63
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.3-freetype251.patch
@@ -0,0 +1,28 @@
+--- Coin-3.1.3/src/glue/freetype.cpp
++++ Coin-3.1.3/src/glue/freetype.cpp
+@@ -52,9 +52,9 @@
+ #ifdef HAVE_FREETYPE /* In case we're _not_ doing runtime linking. */
+ #define FREETYPEGLUE_ASSUME_FREETYPE 1
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #endif /* FREETYPEGLUE_ASSUME_FREETYPE */
+ 
+ #include <Inventor/C/basic.h>
+--- Coin-3.1.3/src/glue/freetype.h
++++ Coin-3.1.3/src/glue/freetype.h
+@@ -87,8 +87,8 @@
+ 
+ #ifdef HAVE_FREETYPE
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
+ #else /* HAVE_FREETYPE */
+ 
+ #include <Inventor/C/basic.h>