[pkgsrc/trunk]: pkgsrc/x11/libXft xftglyphs: use recommend freetype inclusion

[richard <richard%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cae2bd26778f
branches:  trunk
changeset: 632100:cae2bd26778f
user:      richard <richard%pkgsrc.org@localhost>
date:      Sat Mar 15 09:20:31 2014 +0000

description:
xftglyphs: use recommend freetype inclusion
FreeType recommends to use their special macros to include the headers, because
it gives them the ability to move headers around.  They did this in 2.5.1 (yes,
a point release) and this direct inclusion doesn't work anymore.
http://lists.freedesktop.org/archives/xorg-devel/2013-December/039310.html
and
http://lists.freedesktop.org/archives/xorg-devel/2013-December/039311.html

diffstat:

 x11/libXft/distinfo                      |   3 ++-
 x11/libXft/patches/patch-src_xftglyphs.c |  23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r 0593778bfad6 -r cae2bd26778f x11/libXft/distinfo
--- a/x11/libXft/distinfo       Sat Mar 15 08:17:37 2014 +0000
+++ b/x11/libXft/distinfo       Sat Mar 15 09:20:31 2014 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2012/06/03 17:43:11 wiz Exp $
+$NetBSD: distinfo,v 1.9 2014/03/15 09:20:31 richard Exp $
 
 SHA1 (libXft-2.3.1.tar.bz2) = c7ec1361e3d4f095910f8c58988ab42e32f314d9
 RMD160 (libXft-2.3.1.tar.bz2) = 81a29298af843dff03234a6f0068ae052e698380
 Size (libXft-2.3.1.tar.bz2) = 311556 bytes
+SHA1 (patch-src_xftglyphs.c) = 50bb8668ed1cd4555f55b63d23a4d90dba9bb2df
diff -r 0593778bfad6 -r cae2bd26778f x11/libXft/patches/patch-src_xftglyphs.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libXft/patches/patch-src_xftglyphs.c  Sat Mar 15 09:20:31 2014 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_xftglyphs.c,v 1.1 2014/03/15 09:20:31 richard Exp $
+Use FT_*_H macros instead of including <freetype/*.h>
+http://lists.freedesktop.org/archives/xorg-devel/2013-December/039310.html
+and
+http://lists.freedesktop.org/archives/xorg-devel/2013-December/039311.html
+
+--- src/xftglyphs.c.orig       2012-06-02 16:36:35.000000000 +0000
++++ src/xftglyphs.c
+@@ -21,10 +21,10 @@
+  */
+ 
+ #include "xftint.h"
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftlcdfil.h>
+-
+-#include <freetype/ftsynth.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
++#include FT_LCD_FILTER_H
++#include FT_SYNTHESIS_H
+ 
+ /*
+  * Validate the memory info for a font