aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2004-03-22 05:38:23 +0800
committerpav <pav@FreeBSD.org>2004-03-22 05:38:23 +0800
commit42a944b7bb7743de0f6c4f1372cf240a0322eedd (patch)
tree4294241f6cd915d1c7cf78af55635b243c7643b6
parentc6406ce9a9ec9374560c1b55a873dde8ac0c9225 (diff)
downloadfreebsd-ports-gnome-42a944b7bb7743de0f6c4f1372cf240a0322eedd.tar.gz
freebsd-ports-gnome-42a944b7bb7743de0f6c4f1372cf240a0322eedd.tar.zst
freebsd-ports-gnome-42a944b7bb7743de0f6c4f1372cf240a0322eedd.zip
- Fix build with new freetype
-rw-r--r--x11-fonts/ttmkfdir/files/patch-encoding.cpp11
-rw-r--r--x11-fonts/ttmkfdir/files/patch-encoding.h12
-rw-r--r--x11-fonts/ttmkfdir/files/patch-ttf.h26
3 files changed, 44 insertions, 5 deletions
diff --git a/x11-fonts/ttmkfdir/files/patch-encoding.cpp b/x11-fonts/ttmkfdir/files/patch-encoding.cpp
new file mode 100644
index 000000000000..cf95ac2996f3
--- /dev/null
+++ b/x11-fonts/ttmkfdir/files/patch-encoding.cpp
@@ -0,0 +1,11 @@
+--- encoding.cpp.orig Tue Mar 12 15:40:09 2002
++++ encoding.cpp Sun Mar 21 22:33:00 2004
+@@ -2,7 +2,7 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+-#include "freetype/freetype.h"
++#include <ft2build.h>
+
+ #include "ttmkfdir.h"
+ #include "encoding.h"
diff --git a/x11-fonts/ttmkfdir/files/patch-encoding.h b/x11-fonts/ttmkfdir/files/patch-encoding.h
new file mode 100644
index 000000000000..9f0f53ae57b2
--- /dev/null
+++ b/x11-fonts/ttmkfdir/files/patch-encoding.h
@@ -0,0 +1,12 @@
+--- encoding.h.orig Tue Mar 12 15:41:27 2002
++++ encoding.h Sun Mar 21 22:35:15 2004
+@@ -6,7 +6,8 @@
+ #include <map>
+ #include <string>
+
+-#include "freetype/freetype.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
+
+ #include "util.h"
+
diff --git a/x11-fonts/ttmkfdir/files/patch-ttf.h b/x11-fonts/ttmkfdir/files/patch-ttf.h
index 5295d0ea7ada..6437e27ef235 100644
--- a/x11-fonts/ttmkfdir/files/patch-ttf.h
+++ b/x11-fonts/ttmkfdir/files/patch-ttf.h
@@ -1,11 +1,27 @@
--- ttf.h.orig Wed Mar 13 19:16:38 2002
-+++ ttf.h Sat Dec 6 23:47:35 2003
-@@ -13,6 +13,8 @@
++++ ttf.h Sun Mar 21 22:30:16 2004
+@@ -3,15 +3,18 @@
+ #define TTF_H__
+
+ #include <string>
+-#include "freetype/freetype.h"
+-#include "freetype/tttables.h"
+-#include "freetype/ftsnames.h"
+-#include "freetype/ttnameid.h"
+-#include "freetype/fterrors.h"
+-#include "freetype/ftmodule.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
++#include FT_TRUETYPE_TABLES_H
++#include FT_SFNT_NAMES_H
++#include FT_TRUETYPE_IDS_H
++#include FT_ERRORS_H
++#include FT_MODULE_H
+
#include "util.h"
#include "encoding.h"
-
-+using namespace std;
+
++using namespace std;
+
namespace ttf {
- class Face {