Source: dvi2ps Control: tags -1 + patch dvi2ps has its own 2-line file called freetype.h: > #include <ft2build.h> > #include FT_FREETYPE_H Which causes a loop with the current Freetype.
Quilt patch attached. This makes no changes to the obsolete Makefile.am, just the still-used Makefile.in. Steve
Description: Fix FTBFS with freetype2 >= 2.5 Author: Steve Cotton <st...@s.cotton.clara.co.uk> Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733394 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Makefile.in +++ b/Makefile.in @@ -222,7 +222,7 @@ conf.h dvi2ps-conf.h \ defs.h gdefs.h xxstdio.h global.h commands.h set.h dconv.h \ virfont.h pkfont.h gffont.h rastfont.h \ - bifont.h freetype.h funcfont.h \ + bifont.h funcfont.h \ jsub.h emit.h \ ps.h \ ptexmac.h dvips.h cscommands.h \ --- a/pstt.c +++ b/pstt.c @@ -12,7 +12,8 @@ #include "rastfont.h" #include "ps.h" #ifdef FREETYPE -#include "freetype.h" +#include <ft2build.h> +#include FT_FREETYPE_H #endif /* FREETYPE */ static struct psbiops po; --- a/pstt2t1.c +++ b/pstt2t1.c @@ -33,7 +33,8 @@ #include "defs.h" #include "emit.h" #include "global.h" -#include "freetype.h" +#include <ft2build.h> +#include FT_FREETYPE_H #include "cscommands.h" /* --- a/ttfont.c +++ b/ttfont.c @@ -12,7 +12,8 @@ #ifdef FREETYPE -#include "freetype.h" +#include <ft2build.h> +#include FT_FREETYPE_H #include FT_TRUETYPE_IDS_H #if FREETYPE_MAJOR==2 --- a/freetype.h +++ /dev/null @@ -1,2 +0,0 @@ -#include <ft2build.h> -#include FT_FREETYPE_H
