[gentoo-commits] proj/x11:master commit in: x11-libs/libXft/files/, x11-libs/libXft/

[David Heidelberger]

commit:     dde3f202bdccdc11a110d88af67b074ff8fb2a6b
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Sat Dec  7 22:44:40 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Sat Dec  7 22:44:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=dde3f202

x11-libs/libXft: fixed compilation 2.3.1-r1 with freetype 2.5.1

---
 .../libXft/files/libXft-2.3.1-compile_fix.patch    | 17 +++++++++++++++
 x11-libs/libXft/libXft-2.3.1-r1.ebuild             | 24 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)

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 0000000..4fc944a
--- /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
new file mode 100644
index 0000000..423d9d5
--- /dev/null
+++ b/x11-libs/libXft/libXft-2.3.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="X.Org Xft library"
+
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrender-0.8.2[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	media-libs/freetype[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]
+	virtual/ttf-fonts"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.3.1-compile_fix.patch" )