Fix build on Freetype 2.5.

Reported by Patrick Matthhai/Debian.

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index b4fb3ffe4e578dbd9c0ec461e46d0e02a17b77b4..4a3f5cb4dcf9aeda819aa9410e3388d7372971f3 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -35,6 +35,7 @@ endif
 ifdef USE_PANGO
 OBJS += producer_pango.o
 CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2`
+CFLAGS += `pkg-config --cflags-only-I freetype2 | sed 's/ *$$//g')`/freetype
 LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2`
 ifeq ($(targetos),Darwin)
 LDFLAGS += -liconv

diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c
index 4969dd2025d6575d9e1222beead30e45bdd21a37..ba902bd6f4e14385fc90861165ea58e0e2ce8863 100644 (file)
--- a/src/modules/gtk2/producer_pango.c
+++ b/src/modules/gtk2/producer_pango.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <pango/pangoft2.h>
-#include <freetype/freetype.h>
+#include <freetype.h>
 #include <iconv.h>
 #include <pthread.h>
 #include <ctype.h>