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 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
|
Index: dvi2ps-5.1j/Makefile.am
===================================================================
--- dvi2ps-5.1j.orig/Makefile.am 2014-04-25 19:31:38.899954306 +0200
+++ dvi2ps-5.1j/Makefile.am 2014-04-25 19:32:13.836828101 +0200
@@ -6,7 +6,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 dvi2ps_freetype.h funcfont.h \
jsub.h emit.h \
ps.h \
ptexmac.h dvips.h cscommands.h \
Index: dvi2ps-5.1j/Makefile.in
===================================================================
--- dvi2ps-5.1j.orig/Makefile.in 2014-04-25 19:31:47.468169129 +0200
+++ dvi2ps-5.1j/Makefile.in 2014-04-25 19:32:04.680599641 +0200
@@ -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 dvi2ps_freetype.h funcfont.h \
jsub.h emit.h \
ps.h \
ptexmac.h dvips.h cscommands.h \
Index: dvi2ps-5.1j/freetype.h
===================================================================
--- dvi2ps-5.1j.orig/freetype.h 2006-04-15 18:28:31.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-#include <ft2build.h>
-#include FT_FREETYPE_H
Index: dvi2ps-5.1j/pstt.c
===================================================================
--- dvi2ps-5.1j.orig/pstt.c 2010-10-12 10:57:20.000000000 +0200
+++ dvi2ps-5.1j/pstt.c 2014-04-25 19:29:46.949112858 +0200
@@ -12,7 +12,7 @@
#include "rastfont.h"
#include "ps.h"
#ifdef FREETYPE
-#include "freetype.h"
+#include "dvi2ps_freetype.h"
#endif /* FREETYPE */
static struct psbiops po;
Index: dvi2ps-5.1j/pstt2t1.c
===================================================================
--- dvi2ps-5.1j.orig/pstt2t1.c 2010-09-30 10:17:56.000000000 +0200
+++ dvi2ps-5.1j/pstt2t1.c 2014-04-25 19:30:11.037730037 +0200
@@ -33,7 +33,7 @@
#include "defs.h"
#include "emit.h"
#include "global.h"
-#include "freetype.h"
+#include "dvi2ps_freetype.h"
#include "cscommands.h"
/*
Index: dvi2ps-5.1j/ttfont.c
===================================================================
--- dvi2ps-5.1j.orig/ttfont.c 2014-04-25 19:29:07.468184190 +0200
+++ dvi2ps-5.1j/ttfont.c 2014-04-25 19:29:57.709388966 +0200
@@ -12,7 +12,7 @@
#ifdef FREETYPE
-#include "freetype.h"
+#include "dvi2ps_freetype.h"
#include FT_TRUETYPE_IDS_H
#if FREETYPE_MAJOR==2
Index: dvi2ps-5.1j/dvi2ps_freetype.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ dvi2ps-5.1j/dvi2ps_freetype.h 2006-04-15 18:28:31.000000000 +0200
@@ -0,0 +1,2 @@
+#include <ft2build.h>
+#include FT_FREETYPE_H
|