[patch] libgnomeprint-2.18.8-freetype-2.5.1.patch

libgnomeprint-2.18.8-freetype-2.5.1.patch (text/plain), 2.21 KB, created by Lars Wendler (Polynomial-C) (RETIRED) on 2015-10-08 07:24:04 UTC

--- libgnomeprint-2.18.8/configure.in
+++ libgnomeprint-2.18.8/configure.in
@@ -162,25 +162,9 @@
 dnl =================================
 dnl Checking for freetype2
 dnl =================================
-FREETYPE_LIBS=
-FREETYPE_CFLAGS=
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-if test "x$FREETYPE_CONFIG" = "xno" ; then
-	AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint)
-else
-	FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
-	FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
-fi
-
-libgnomeprint_save_ldflags=$LDFLAGS
-LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
-
-freetype_version=false
-AC_MSG_NOTICE([checking for sufficiently new FreeType (at least 2.0.5)])
-AC_CHECK_LIB(freetype, FT_Get_Postscript_Name,:,[
-    AC_MSG_ERROR(You need FreeType2 (freetype-devel 2.0.5 or greater package) for this version of libgnomeprint)])
-
-LDFLAGS=$libgnomeprint_save_ldflags
+dnl "freetype2 >= 17" means freetype-2.5.1
+PKG_CHECK_MODULES(FREETYPE, freetype2 >= 17, ,
+	[PKG_CHECK_MODULES(FREETYPE, freetype2, [FREETYPE_CFLAGS="$FREETYPE_CFLAGS -I`$PKG_CONFIG --variable=includedir freetype2`/freetype2/freetype"])])
 
 dnl =================================
 dnl END: Checking for freetype2
--- libgnomeprint-2.18.8/libgnomeprint/gnome-font-face.c
+++ libgnomeprint-2.18.8/libgnomeprint/gnome-font-face.c
@@ -36,7 +36,8 @@
 #include <stdarg.h>
 #include <locale.h>
 
-#include <freetype/ftoutln.h>
+#include <ft2build.h>
+#include FT_OUTLINE_H
 
 #include <libgnomeprint/gnome-print-private.h>
 #include <libgnomeprint/gnome-font-private.h>
--- libgnomeprint-2.18.8/libgnomeprint/gnome-print-gdi.c
+++ libgnomeprint-2.18.8/libgnomeprint/gnome-print-gdi.c
@@ -36,7 +36,7 @@
 #include <libgnomeprint/gp-gc-private.h>
 
 #include <ft2build.h>
-#include <freetype/freetype.h>
+#include FT_FREETYPE_H
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
--- libgnomeprint-2.18.8/libgnomeprint/gnome-rfont.c
+++ libgnomeprint-2.18.8/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>