diff options
| author | richard <richard@pkgsrc.org> | 2014-03-15 09:20:31 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2014-03-15 09:20:31 +0000 |
| commit | 636eded61b70ca9209505a8c131a382294d96154 (patch) | |
| tree | faad4532a617f59eba1dea5637fcdc2050936547 /x11 | |
| parent | 24d8512db882170e5bb811fb127eb4f831fd8f0b (diff) | |
| download | pkgsrc-636eded61b70ca9209505a8c131a382294d96154.tar.gz | |
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 (limited to 'x11')
| -rw-r--r-- | x11/libXft/distinfo | 3 | ||||
| -rw-r--r-- | x11/libXft/patches/patch-src_xftglyphs.c | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/x11/libXft/distinfo b/x11/libXft/distinfo index bb3939a6d93..1e111b262dc 100644 --- a/x11/libXft/distinfo +++ b/x11/libXft/distinfo @@ -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 --git a/x11/libXft/patches/patch-src_xftglyphs.c b/x11/libXft/patches/patch-src_xftglyphs.c new file mode 100644 index 00000000000..5064565e927 --- /dev/null +++ b/x11/libXft/patches/patch-src_xftglyphs.c @@ -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 |