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