x11-libs/libXft: Fix build with >=media-libs/freetype-2.5.1

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 28 insertions, 24 deletions

diff --git a/x11-libs/libXft/ChangeLog b/x11-libs/libXft/ChangeLog
index a26e37b93108..5810539e0d3f 100644
--- a/x11-libs/libXft/ChangeLog
+++ b/x11-libs/libXft/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libXft
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/ChangeLog,v 1.96 2013/10/08 05:08:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/ChangeLog,v 1.97 2013/12/08 18:06:59 remi Exp $
+
+  08 Dec 2013; Rémi Cardona <remi@gentoo.org> libXft-2.3.1-r1.ebuild,
+  +files/libXft-2.3.1-compile_fix.patch:
+  Fix build with >=media-libs/freetype-2.5.1, see bug #493572
 
   08 Oct 2013; Agostino Sarubbo <ago@gentoo.org> libXft-2.3.1-r1.ebuild:
   Stable for x86, wrt bug #475480
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 12ea1237f306..d65cff706791 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,31 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX libXft-2.3.0-bold-fonts.patch 1212 SHA256 1e22da1702fd7bd0d94c7e3b77a563020beb3943571b0278eaba88a9338c2940 SHA512 5edcb8798dede473616631def6b120e474ee399815a5cf9182f333fa1c5da5cf0c24facc30d47a0a157c486934afc11a4fd1ae6a90b67fdd8da65cab523fc0f4 WHIRLPOOL 15e4d2263b2fecaaa831f105cf38889084f6776d58b426a3590bdeaa5b780f81823b8d55b122c4f2f5ea1b07e5747169cbfcbed7e256a263d566f733637fdd9b
+AUX libXft-2.3.1-compile_fix.patch 404 SHA256 c567d6781034d83df173f903e3dc536854933d599a93bca85327fcb65c65cacd SHA512 b8bf5c564741c805ebb7b07c9a605de07fe5e66330743e92d47f6f0d8ba9e58d78d038aabcd08514a4d14d365d1f08faab87d9ef5788762eb0ab53ea80cc2dcc WHIRLPOOL 7c0be45084aa5c5147aec83b8c4be2d96bc9c880c65fc3986d75e83de7127385bbaa3c5ede3eb9b32acdf2b776928c916b42f69951cfb22b09747fb20fb32cc3
 DIST libXft-2.2.0.tar.bz2 290451 SHA256 c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2 SHA512 948ba8918895e49705b4b925b7821a3885c6b9de2e1fe1e95e3fcfee10d06906bf00eeb8035b0ae1a911c28028de0bd109fd6bda54695a3bbd2a19a80f0de37a WHIRLPOOL d639220ed5d2c3efcafa08e55ae719815766e5b1f4ef56c395463e4475f9bab01d66d3a4e0007fc10ca3dd1ccd1bce775620326e0a29975cc0892bb5835a4eba
 DIST libXft-2.3.0.tar.bz2 325561 SHA256 3426393ad72a5c47006536d474e396c7a21c33131bb28f495578e05a5858b044 SHA512 3e4e6134a9e7596b43ec2d037bb1d43fb2b0cd983fec1f1cdf404dba2b6d61154240fe47a27c1e9dd4b77868384bde8585f7f0785378cbe379d0d5f985436d7d WHIRLPOOL fe6dcf8a67260d63164483f196977b78893eab1d39603de0eb8db8c9e02edf1c180a6d459e54378a844a62a71954d0ca583d7356702a2ea35fc5cc31ca29004e
 DIST libXft-2.3.1.tar.bz2 311556 SHA256 7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd SHA512 737d6ab892daf829da8b2fed954b31b2657d29033f35e806599cd67c6e044ab94b0f035804a1c4c9e3e0cbdc74a117cd274128a57f4b2cf81383561d62eb9f1f WHIRLPOOL ecd372614afc4fba05598e51c051f0a011c5ccaabc41e9e585b67180099cd9f7c6d68904adbe5ccf44f79133e21495daa6cd46675ca7556e7d7ab0dac1ee432a
 EBUILD libXft-2.2.0.ebuild 708 SHA256 d043138baf772bf2d3657653755e23ff68feb2464de04cb68e9086a63125cb78 SHA512 06e6239f6aa39d202874ac987b2c48723a0f9a6460cbd00b6ca5c7638b31a552f5c681ba72ec460696c01056b6e5dbb765bdcd24c6864b7a7d269158df41f64c WHIRLPOOL ddbb0dc4500854e35eb660b344079bae8f68c0f39353fb4ee4fda66c61039dbfdef8ef2f2136c0ce033462a5d0d2ed894f3dab3cd6ca5a753583cbc39900f4b2
 EBUILD libXft-2.3.0-r1.ebuild 781 SHA256 1bf5acc938687e0f1c8d5277b4cb2d95849730d28ad11429fdfad9fc79bf39a2 SHA512 029fdca869197ebeddc46a12b5ca93c992e98ad35ab8edee008d412938dde6a7498cec971d93f6229818e9544a64f2af40fb86ce7ceecd23e1cd86be613f1aac WHIRLPOOL 257382ac6c7765299bfe8eaac0dc2fa2f2212979b60c6dc31729e517037eca6a3e40ad6a1b966cf6388a2df1207f0311f810ecd25fe0c281fecdbbce97f7d8ff
 EBUILD libXft-2.3.0.ebuild 716 SHA256 55aa22b3287c4749f1ef9c64afc8558b3c455f3fa601b336d89baa6b003265e2 SHA512 902dec4e96774aacf51d5ab70afb7f534f988c9df29e47fdd7359edd9434eacc5b5cd8049fc944d0246edbdf10320376972bb442e2eb3423a4352535a4a84e97 WHIRLPOOL 5dfb07bc6b0de586249548aede2f03729de4ab37c89525d7ff74f744dcf51f6e0b654fb6aa6c7bd5ff047b1d2908bcecf7db9423f402580981dceacc55872027
-EBUILD libXft-2.3.1-r1.ebuild 868 SHA256 499eb5c6bce54b36004fb676e7ce7997584ab0ed0b30ef1bf7a61e8b645ab3a6 SHA512 c5114c2ffa8c2094d937c62a2ff403f74894626c833a22e44d00b015bdf06070eda211d1dcfa96b6dbada9bc1e5ab610c549a6390ff09681a50b14457e53ce18 WHIRLPOOL 436e6973bcfc548c0f2b3bf669ab4e05aaba0de6ff299cf791caa15932c3110d569bddd0458728fd28e80db9a91651bc3745b0ba8460d95e6c52ff00579736a5
+EBUILD libXft-2.3.1-r1.ebuild 927 SHA256 48abba92a6ddb1c654b645abacac1025302e6817b034e6882407cd66fd8a9918 SHA512 1e3acae424ace56a0602fb87fdba3af3ac7f2e005c81420d063a3d6064a4eaa0ab286ab52d1431542240d2bd86247ba73ee7da303a451103ba5154531c99f9e4 WHIRLPOOL 242655b76216d08019d4d92c1ee39dd4265e0e1b05d7cbb23d1d9682f994d33bd726e1896fb01e839e04620e72abb41443e54572e249475efbace65f913bc841
 EBUILD libXft-2.3.1.ebuild 727 SHA256 40c8cfa9288e9a4091b5a8eb5c2234b5d924dfc50aa5205adaf9b0240d978b59 SHA512 269c29999be50e6e61ceec275c77f4cfa3b8fdc506e6997ecc0394c19e020b8f0db006d91ab33399b3c98d697283c47f4a95fe0b82f443ecb383beda3a4fb73f WHIRLPOOL 511c81b9bcff27df68cf97e1268e2e744c660b09cfac69cfc4344e62eac306b3b60d2f2db32f87129b539c7f185e8611e4a418ca3ed68d4e4830506cfb80cd85
-MISC ChangeLog 11013 SHA256 6b4962aa51877f0ac07a41bfa0c4f0285b20bd296438ddb18ec6957ed2e8882c SHA512 c424f434ca306ca21ee9f8040fc52706317cf1b4056bec45bc8609263d0bf993fac34c9d9eefc2ab25c25459791f8a99194d983614214074d83a3fd7f2ae87ee WHIRLPOOL 62779321302aa344b823e8e91191e8b293b2ffb1f357a09c6793cea5614486e9fe3fcbba6f431d7de1f15951f0088e2d958308b3ddc34861b9b8127862ec1e8d
+MISC ChangeLog 11189 SHA256 d7f7cf3e2482a4f18b85836563d15b2210379a3db4c3230f9684f01232e77198 SHA512 7ba2dfe381b23f6068a7cd4dc807ebe573a6d1f9363c46086b7214bf5d82b5cd9aab2872da0fe9489dd07a4541572c16a6a3566b02c9af0256f431ad57aec62c WHIRLPOOL eac84cd7a74e505f593d78b27e186a8374026a79604c59d53536fb71be0233e37a382362dc1f087b1a31824caa3bf7d02d02c60a6a623c34eca7c13292838c14
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSU5MtAAoJELp701BxlEWfzfIP/1SWU6v7FNfI/NMm2KaDz+lT
-6LyIdDFvIqR6I7Q6bWWDpTcjT4C+IGc3Ba2+9iTCHZ5QcCM2LaKm5Xe6gnOjKSJw
-6yxqCLk6srTAXKbtnxn159ToCt84YDuJIhrThGdC0EZwOVpJrNXHfaeVjN0Bf1Af
-q337hvprriVgA8FAx4ATKx9F2l/8n4ekyOS8hw3mWxxV25/mgOETfzaTqxAKX91y
-jGLhCZXQL4jUMfX4DgtvCJ8+lAcp++BkIufr2db1nIhjRFD6Z06ytwLKU0iNrrvB
-miv85QiZfpzrr1qz06SVYZI4qRoAeCGj8zxTQ3dm3yMbagX1GCuVUPmjYLLPi7MQ
-CxfIqnTCpPvp+K7gAt/WDs/HBD46j4vOFlZd6/RAo1XwzaccvrGYeYkcqG63shh+
-7a/+G0K53Jlfvo2nUxwLsc5utrNfUJljTByexkuw5T9IQpIUnA/ygpaVY2tpWwQE
-2rpYESJGPZ6RxfYPT/zFvXSzQJIs6MBbZRl29qlCp7KvuCLpu+Wz0uTNjh7ozsiX
-VIpnk15SU7osLxmVNB0/57vgLt7vaiXGUbkSbcIsUrZTfMap3NfzRj+WINhJuqZh
-XF5xdSOTfyONtiNJuXDchu7897hUlajH1905t7h6FohWu7vdU3IfUxFw/8cW6aS+
-VVYGN2XSXWg2zXP6ugEz
-=VuPZ
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch b/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch
new file mode 100644
index 000000000000..4fc944aa2195
--- /dev/null
+++ b/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch
@@ -0,0 +1,17 @@
+--- src/xftglyphs.c.orig	2012-06-02 11:36:35.000000000 -0500
++++ src/xftglyphs.c	2013-11-28 01:39:49.000000000 -0600
+@@ -21,10 +21,10 @@
+  */
+ 
+ #include "xftint.h"
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftlcdfil.h>
+-
+-#include <freetype/ftsynth.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
++#include FT_LCD_FILTER_H
++#include FT_SYNTHESIS_H
+ 
+ /*
+  * Validate the memory info for a font
diff --git a/x11-libs/libXft/libXft-2.3.1-r1.ebuild b/x11-libs/libXft/libXft-2.3.1-r1.ebuild
index 4672eac566a2..dcb97900b8d9 100644
--- a/x11-libs/libXft/libXft-2.3.1-r1.ebuild
+++ b/x11-libs/libXft/libXft-2.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.3.1-r1.ebuild,v 1.9 2013/10/08 05:08:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.3.1-r1.ebuild,v 1.10 2013/12/08 18:06:59 remi Exp $
 
 EAPI=5
 
@@ -20,3 +20,5 @@ RDEPEND=">=x11-libs/libXrender-0.8.2[${MULTILIB_USEDEP}]
 	x11-proto/xproto[${MULTILIB_USEDEP}]
 	virtual/ttf-fonts"
 DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.3.1-compile_fix.patch" )