fix compilation with freetype-2.5.4, bug #533444

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

4 files changed, 46 insertions, 18 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 6754ebd938f9..4925ed5895b7 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.84 2014/12/21 23:03:05 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.85 2014/12/31 12:36:59 tamiko Exp $
+
+  31 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+  +files/paraview-4.2.0-vtk-freetype.patch, paraview-4.2.0.ebuild:
+  fix compilation with freetype-2.5.4, bug #533444
 
 *paraview-4.2.0 (21 Dec 2014)
 
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 18c913d27e0a..a1ce2f70f867 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -11,28 +11,29 @@ AUX paraview-4.1.0-glxext-legacy.patch 407 SHA256 f39570a4188d0d85182c99755da290
 AUX paraview-4.1.0-no-fatal-warnings.patch 973 SHA256 cdb9183dd44cf4d2fb85c49ba9e916f9ac23e7a32b5b0d238e9cb908c88dae01 SHA512 cf0c06703147c63bd495facc17e9fda9b3c8cf2a3a59ad7144a26903ca82c4870a00a7a8b9178d06368111346de1d7db8a547ddf440c3564923b26385802b43c WHIRLPOOL 193772af2f6602bb87f2c83cd66804adb3651395192cc214c8e2107a3abe5f6e727b6cf8d79554f2a6d8dee7be7006903c000a9981f56118e7e0a6c8d0139bcf
 AUX paraview-4.2.0-Protobuf.patch 1538 SHA256 e695c1ebca585c6e50b73bd67fc0d2e30b3ba7a7d4698a2eb618cdc97d399e08 SHA512 7dab74434864a4857f04ab263ee92466fec7451565be59b31298b2975baa336781c4ca4458ff522e198d39b9e0b398a816b30c2dd037995df7b63a7fae1fa44d WHIRLPOOL c541b07e3cfb2ea97a225dd9617ed9f7a3fd85d6f8d109e5caf55c1a33f4956eaa0e0b48a4c96e9c4490b9023198a90ace7297dfe2855e753b71d05d520cf4fb
 AUX paraview-4.2.0-removesqlite.patch 17104 SHA256 75b5b42450b47469e728dfbe5c2323d27f577c6dfae60b50fb43c066374bf1eb SHA512 a500ac28cca407d35c7dc3f1d9cecc55546afa193bf8f3ab400a82d75316b85e808cd4c9264f0552f22e832db8be868fb83e9ecdc0e18a0ad110624d4ce3a46b WHIRLPOOL d1bc549214704299c52b1745c02d77a64fd85f015ec1528728a217c90fc710fca701a085a9b3ff970263987c34e17fc8c3ddafa327106fcbcc0cc8ed99d25ec4
+AUX paraview-4.2.0-vtk-freetype.patch 1159 SHA256 ab95039cf8f39d1dcdf97a3ae62c4aa47f6daad4defdb5be842719102036c452 SHA512 c4e0328d1c7c1a1842de0f70ec93fe28e5537d9add29d4e76243f91138b97e993d5ef02a80fece8cc3476086772bb2f3e97ff6c8ce18a4ffedced90ad98199e0 WHIRLPOOL 95b7d29a790aa095b2ded9becb8cb02f9ca837ab4c18cae62a5f7f8191fd94af6c5e4df5359b4ea1268d01e72fe6f8eff56ec7cef8b2ef823021f8e5395fc911
 DIST ParaView-v4.0.1-source.tgz 47827831 SHA256 1e04fcc085ee0305a163d9b6a66904fbb21e6a3fac69b275395c5ffc106e48e2 SHA512 be27b4c10f4881bcd85bfd81b0671f74358022809837620a0baf59f3c3090a5eb3afc1f78a561a3fcf9d4154875fb393c062c1b428579bc254ac7c1ff7214505 WHIRLPOOL ddac32f4be7d46b43f8f66f51ec7877442fd502fcc19b9864e284762b2cc0f3162f16766ca5c566b7f8201745ed6535cf95651f152a4d4476c2682a6432835c0
 DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96
 DIST ParaView-v4.2.0-source.tar.gz 50285547 SHA256 ac26cc5fe5ce82d27531727a01242353d40984826eaa580edea0791887a07b6b SHA512 611f641ccaa62b285c595df0318da94a9e0e67a1c3040f60c33bdd32bf980db8371c84958c9d5f3191cfd5249969a60f51f8e5dfa9bd234c96ec51caecdb37c8 WHIRLPOOL 1c81a95e00f06b3c60e31c82aa6e87979c6d9b8000ca7298904d8c3f09df58153f6dde7b96df5f538a991f5764862d3059d1395db61f12464306d3c3fe919fe7
 EBUILD paraview-4.0.1-r1.ebuild 9809 SHA256 aa8ce5eb27e1c2b6dfd2e4593089c208b4bc61095467cd8012cc0b099d345c7b SHA512 de07f58635dd20f5ae70d915924bc27cf649f00d647664acf32f26586dc7468db76d7786acc61924b202f80f2e94af961e9f4ca1abc98b5a7023ba59b1356021 WHIRLPOOL c96bcd123dc41c7647f763235f0218cbe2f1edf164ef55e8fca73d7c7e9e65a0d94ddca9c8d1b6d876dfc58a1cda517bceb72c8d2b692658ac737a66e7a340c7
 EBUILD paraview-4.1.0-r1.ebuild 10362 SHA256 805be94232fe573dddfb8ca3902bca0acab54097a753dc9dbb1b281be3f0d67a SHA512 7c21e1ba2ad4dae6805403ccf374332cb8c9831e110c44c309147372a6ccc0b273f286e5e66ab6dd5bcc04bd8604f9b6cfb8d7d85959c62b0c1b702155430b08 WHIRLPOOL 30565408c51c13854f1f7232133b88f462838ffb9fc414208708be2e6380a24242ef668df9466c2e66ae3a205e34f548ae229e6a2f37c3515e668513015e2b0f
-EBUILD paraview-4.2.0.ebuild 10261 SHA256 ba8587b0df6016b6fd4828f7b9af8568b492470f8d35456f39c47ac20dd4a368 SHA512 37fd4f71794936ec776fd231f12614cf1931e947584b0136be5b3088960d072ae734dba82318727b8a9c4d97b14741e299b23aec34f0d137231eaf1d481364af WHIRLPOOL b1978609205ad752201e417375f87d8790275f12d1cf6302f8131368f4129a5f8612855cde39bf59411e8ad8e887c4329155178b160a364a98a13ac90037f19e
-MISC ChangeLog 17467 SHA256 23208da10b14abef2aa6d290bb78bb765bf598ebaaab19d28d3b60a3f9f08279 SHA512 5d81d89d6e32a3678f045c8d3ef9ccab8af4010709c8e0d99122dcdb81cf73c0f46f5fda71db13452162e61244daaefdd8ecf5cbfbcffec348f23d2a2220a4df WHIRLPOOL 13a603cc3a3722a2a637b9bfc6d11acd9fc7e29746708d8c22d77e8b6d083b6f2ad0bb1e75ec02d240c8256c5b4cedd76a3a170cf603f477b9cc328c6b933670
+EBUILD paraview-4.2.0.ebuild 10303 SHA256 175a61ec2fc62c7bf4ef191212732c7ccd760f41edd94d8ba5934371640a8c79 SHA512 c415c53abc2b01cfaefbfc888048474eea871ef0b287816600ab67512135f0ec22ce8037491c821a0d31a11e0e75fb19780738d69b382ba8596c8476d0643636 WHIRLPOOL 9b128b70ca76d3122ee5f4f44535361747c59a7806b46cf63bca30737b2e74d38a1386e550b79853a1fecda673217a71419e6b7b7335ac3dd85176c7366dd298
+MISC ChangeLog 17636 SHA256 f11a53bcf164be5445b4fab5ca96dc7389f06c926fc483f80330b3b7a0df5cb3 SHA512 828f94729e8606723ba90d10fff82c446bfcfcd86b0eecda22e922c021deca79c12146ccbecb6419bf2ddff9890e56820536f57cb4da5f271556c869f47fb4a7 WHIRLPOOL 2c2a3427195bee787cae86b415bd33afac3e9dbf19ebc86d628bdfed3d42863f861fad303897ef9685afd1deba282666447f73d3fe59bfebfb9432c8ba1a35a4
 MISC metadata.xml 702 SHA256 23c67d6f8f2cfb48ba3e8e80bf216005a892180740704cb9fbd3bc6dd7b4929e SHA512 ce92209302ca7815985d700aaa25c24796d301b8c7eeb9918f0745c8a836c735f770bb955e269c7e359b30be3d418f2fa73668ca5891f9db9437b041ebf73933 WHIRLPOOL 66658cde8cda9ecfabae72bdfe889646fb9ba33992d8c6efcb4dd882d6671f7f81f30591e6cea8dbe5cd3e3420d51142ce2bd15296d6eca3765f16455c8321ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUl1GqAAoJELhOzYlK7nn/FoIP/RTHV6AT743NsCg8SqmctQqM
-C449tK0wk+8HzFAtmTNtEnhf3QvmjPFLWET7cUzOJo4msEHTTgvmgFQ9exkPp+KG
-7ahdMyC93CG9AjCIT7v4hVHY1U183W2WgbDoXfnXzrKYP4JBG/qqnYg8TUOzXAm+
-gh4cMhgY7MK2mrUCzzkg9Ahs+qFpahcI0g4NruQpYVGJTEIUmfNhrzKvZmAwBpSw
-kLuncXkflncM7bANlCovod/4h956NH09ttfS8w4l75w/S+9nstsqso010SstRocI
-IqI2E+Sr6qOh7kxV/oQukFXInFMykuQr9v1ck8e3HSAzD3DSIdm1rVJgTC/9MjOi
-FiG9nB89I7LKWCppt10R/FowwaZqxZwts8XG3tnijOKhsD5DHLOkUqrkmdcSxgtz
-ssk1IixKMSiFamR9CfwghNLpWmYVrRebGM5i877OLJoUx9H3Tjn1iN5Y7H1VZrvk
-v2288b7Bm3iB3VcrchXK/TRDUcMF8OLyuEkDNVpFm6UNglsmVBsZPxmloY1EjEdE
-ByzoM0G5pYuWnP3u9rG2oDBaq0+0jmK9Vo7WqDFMob/LHXzevkqHmfyVqLVgMESD
-Tv5Hka6GjlT1pnwzczyjS3P7PPJOhlyakByZ3Ogscw6i3xC+IrIKiGL+oqWbRBlp
-pGs0+Rb9EJtxd/SZptRU
-=o+j1
+iQIcBAEBCAAGBQJUo+3sAAoJELhOzYlK7nn/ywAQAJW0lVSe0VFKeRQXsk9jdeIB
+DYbtv03KeErAzxbt3GevqhOzKuctyWVyB3rqDokUH4c3dcc0/+JiqLy8iCmy9XRy
+z2VJJuBnqgAAW8Mwb636cV2090U/4nXxr9psxgdMrg0NjaonYXhDkcp7NHwnkpBe
+LOUYT7mcgcIRIWGkq3fYm1r1Gslv4bWbzdi9Wsp4bkEd632c1wzlG6ckWVhUKkQO
+Pv6M7r9H8T68vtORDYflJ3VTU6FrDQ/J9BfUrWxoQD8mxJ8oB9XV2e9COyVI3aEf
+v9ZnF77ouyJXR0paBbahJh4hWTvVK2Noy7waod7QDJGx8JzQmOuvxgNIyy33WMzj
+9koqPZIpHjzZ2BYSBBva/yXOD5UE9WKwF9eAePQVoGFp/+WHaV2NwMUpGssa1Oj5
+yJ2Q7Y/OA0zWMfXSoJhOykxNJkzo1HQlHYhZC1T+V6iQX+Fcj+8mNA+OKDFoa4uF
+l9Q/moQZjoJovT6bMnv9KC6KtX9mN9fPJlCZLPUieCEbOVkGwMrDFF9YrMbICNF1
+GVhxFRTfyEEbuhr4/WmX5ibLS3/pGDTEw3OeH1OkUyJ2cJCQBK+izfMNRkdaVHvk
+4mDeQGTzNjIVN7YvEPJOOBQO5K/BOle1wN0DytI08lME4pWCbqNdgJH0dV3w514U
+oj6hi65PPqxulMkJkOGi
+=9eso
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch b/sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch
new file mode 100644
index 000000000000..b7d3e409cde1
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch
@@ -0,0 +1,22 @@
+--- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig	2014-12-23 09:25:35.000000000 +0100
++++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx	2014-12-24 09:40:31.886953389 +0100
+@@ -1185,7 +1185,7 @@
+     if (bitmap)
+       {
+       metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
+-      metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
++      metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)),
+                                   metaData.descent);
+       }
+     ++heightString;
+@@ -1952,8 +1952,8 @@
+     if (bitmap)
+       {
+       bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
+-      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
+-      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
++      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
++      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
+       bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
+       }
+     else
diff --git a/sci-visualization/paraview/paraview-4.2.0.ebuild b/sci-visualization/paraview/paraview-4.2.0.ebuild
index 148c7d4eb19c..b07e6c9d3270 100644
--- a/sci-visualization/paraview/paraview-4.2.0.ebuild
+++ b/sci-visualization/paraview/paraview-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.2.0.ebuild,v 1.1 2014/12/21 23:03:05 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.2.0.ebuild,v 1.2 2014/12/31 12:36:59 tamiko Exp $
 
 EAPI=5
 
@@ -94,7 +94,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-removesqlite.patch \
 		"${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \
 		"${FILESDIR}"/${P}-Protobuf.patch \
-		"${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch
+		"${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch \
+		"${FILESDIR}"/${P}-vtk-freetype.patch
 
 	# lib64 fixes
 	sed -i \