Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Use proper method to include freetype headers |
| 2 | |
| 3 | FreeType wants to use these special macros to include its APIs |
| 4 | so be it. |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | Upstream-Status: Pending |
| 8 | |
| 9 | Index: libgnomeprint-2.18.7/libgnomeprint/gnome-font-face.c |
| 10 | =================================================================== |
| 11 | --- libgnomeprint-2.18.7.orig/libgnomeprint/gnome-font-face.c |
| 12 | +++ libgnomeprint-2.18.7/libgnomeprint/gnome-font-face.c |
| 13 | @@ -36,7 +36,9 @@ |
| 14 | #include <stdarg.h> |
| 15 | #include <locale.h> |
| 16 | |
| 17 | -#include <freetype/ftoutln.h> |
| 18 | +#include <ft2build.h> |
| 19 | +#include FT_FREETYPE_H |
| 20 | + |
| 21 | |
| 22 | #include <libgnomeprint/gnome-print-private.h> |
| 23 | #include <libgnomeprint/gnome-font-private.h> |
| 24 | Index: libgnomeprint-2.18.7/libgnomeprint/gnome-rfont.c |
| 25 | =================================================================== |
| 26 | --- libgnomeprint-2.18.7.orig/libgnomeprint/gnome-rfont.c |
| 27 | +++ libgnomeprint-2.18.7/libgnomeprint/gnome-rfont.c |
| 28 | @@ -28,8 +28,8 @@ |
| 29 | |
| 30 | #include <ft2build.h> |
| 31 | #include FT_FREETYPE_H |
| 32 | -#include <freetype/ftglyph.h> |
| 33 | -#include <freetype/ftbbox.h> |
| 34 | +#include FT_GLYPH_H |
| 35 | +#include FT_BBOX_H |
| 36 | #include <libart_lgpl/art_misc.h> |
| 37 | #include <libart_lgpl/art_affine.h> |
| 38 | #include <libart_lgpl/art_vpath.h> |