diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2013-12-08 18:06:59 +0000 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2013-12-08 18:06:59 +0000 |
| commit | b773cb6f3ecc5402467a9070dfd28c8f3aa91f82 (patch) | |
| tree | da49c0fd0b481ca957e6149ee2b2df9f9d66e203 /x11-libs | |
| parent | x86 stable, bug #478252 (diff) | |
| download | gentoo-2-b773cb6f3ecc5402467a9070dfd28c8f3aa91f82.tar.gz gentoo-2-b773cb6f3ecc5402467a9070dfd28c8f3aa91f82.tar.bz2 gentoo-2-b773cb6f3ecc5402467a9070dfd28c8f3aa91f82.zip | |
x11-libs/libXft: Fix build with >=media-libs/freetype-2.5.1
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libXft/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch | 17 | ||||
| -rw-r--r-- | x11-libs/libXft/libXft-2.3.1-r1.ebuild | 4 |
3 files changed, 25 insertions, 2 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/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" ) |