add freetype includes fix

4 files changed, 66 insertions, 13 deletions

diff --git a/x11-misc/ttmkfdir/ChangeLog b/x11-misc/ttmkfdir/ChangeLog
index 79d4a5901535..42865a0c5001 100644
--- a/x11-misc/ttmkfdir/ChangeLog
+++ b/x11-misc/ttmkfdir/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/ttmkfdir
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.49 2004/11/17 15:23:11 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.50 2004/12/21 13:43:22 foser Exp $
+
+  21 Dec 2004; foser <foser@gentoo.org> ttmkfdir-3.0.9-r2.ebuild :
+  Add patch to fix build issues with newer freetypes (#44119)
 
   17 Nov 2004; Markus Rothe <corsair@gentoo.org> ttmkfdir-3.0.9-r2.ebuild:
   Stable on ppc64
diff --git a/x11-misc/ttmkfdir/Manifest b/x11-misc/ttmkfdir/Manifest
index 4b3b24d7dc60..4743f5ade390 100644
--- a/x11-misc/ttmkfdir/Manifest
+++ b/x11-misc/ttmkfdir/Manifest
@@ -1,16 +1,17 @@
-MD5 c20cc99de3c275457e9d1306bdc94d42 ChangeLog 6272
-MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
-MD5 21f9162a0699a8b533fafd2fb553a631 ttmkfdir-3.0.9-r1.ebuild 1078
-MD5 0d038e633398082b2252fa6868805e78 ttmkfdir-3.0.9-r2.ebuild 1132
+MD5 e79050b1403b76c2ff0ce6bb777a9a0f ttmkfdir-3.0.9-r2.ebuild 1248
 MD5 08e67eff70f7d6781128ba04a765aac7 ttmkfdir-3.0.9.ebuild 896
-MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9 66
-MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r1 66
-MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r2 66
-MD5 d1defff244ae210e4ba3da97b5443b4c files/ttmkfdir-1.0-gentoo.diff 1190
+MD5 21f9162a0699a8b533fafd2fb553a631 ttmkfdir-3.0.9-r1.ebuild 1078
+MD5 591c425f07cf940acdd75aae7aeb3a28 ChangeLog 6400
+MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
 MD5 e285b7a7c7369e7947c0997de817d3ce files/ttmkfdir-2.0-gentoo.patch 688
 MD5 255516ccdde8cad5c8f7b6659f4bdde2 files/ttmkfdir-3.0.9-cpp.patch 505
-MD5 11a05e48e2bba01444957f6049353fc7 files/ttmkfdir-3.0.9-encoding.patch 2334
-MD5 2f9cb69179e04e61bd5666c2c4833a36 files/ttmkfdir-3.0.9-gcc33.patch 529
+MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r1 66
+MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r2 66
 MD5 4a98d364009103c5afb6552165049585 files/ttmkfdir-3.0.9-gcc34.patch 878
-MD5 537b2fa79d0feee2ffd2f994b227eb12 files/ttmkfdir-3.0.9-zlib.patch 1913
+MD5 5364b626b96f3a393fad212b3d99aa29 files/ttmkfdir-3.0.9-freetype_new_includes.patch 1199
 MD5 9b84e6d68d388eb67760658ba28d05c8 files/ttmkfdir2-ignore-FIRSTINDEX.patch 440
+MD5 11a05e48e2bba01444957f6049353fc7 files/ttmkfdir-3.0.9-encoding.patch 2334
+MD5 d1defff244ae210e4ba3da97b5443b4c files/ttmkfdir-1.0-gentoo.diff 1190
+MD5 537b2fa79d0feee2ffd2f994b227eb12 files/ttmkfdir-3.0.9-zlib.patch 1913
+MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9 66
+MD5 2f9cb69179e04e61bd5666c2c4833a36 files/ttmkfdir-3.0.9-gcc33.patch 529
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-freetype_new_includes.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-freetype_new_includes.patch
new file mode 100644
index 000000000000..a5ded9fbe492
--- /dev/null
+++ b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-freetype_new_includes.patch
@@ -0,0 +1,44 @@
+--- ttmkfdir-3.0.9/encoding.cpp.orig   2002-12-09 17:52:48.000000000 +0900
++++ ttmkfdir-3.0.9/encoding.cpp        2004-01-31 18:16:46.617118976 +0900
+@@ -4,7 +4,6 @@
+ #include <cstring>
+ #include <unistd.h>
+ #include <zlib.h>
+-#include "freetype/freetype.h"
+
+ #include "ttmkfdir.h"
+ #include "encoding.h"
+--- ttmkfdir-3.0.9/encoding.h.orig     2002-12-09 17:52:48.000000000 +0900
++++ ttmkfdir-3.0.9/encoding.h  2004-01-31 18:19:18.600014064 +0900
+@@ -6,7 +6,8 @@
+ #include <map>
+ #include <string>
+
+-#include "freetype/freetype.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
+
+ #include "util.h"
+
+--- ttmkfdir-3.0.9/ttf.h.orig  2003-01-08 14:25:25.000000000 +0900
++++ ttmkfdir-3.0.9/ttf.h       2004-01-31 18:32:53.333155800 +0900
+@@ -3,12 +3,13 @@
+ #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_SFNT_NAMES_H
++#include FT_TRUETYPE_TABLES_H
++#include FT_TRUETYPE_IDS_H
++#include FT_ERRORS_H
++#include FT_MODULE_H
+
+ #include "util.h"
+ #include "encoding.h"
diff --git a/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild b/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild
index 29c623ac7324..10a5e6eeba08 100644
--- a/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild
+++ b/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild,v 1.14 2004/11/17 15:23:11 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild,v 1.15 2004/12/21 13:43:22 foser Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -16,11 +16,13 @@ IUSE=""
 RDEPEND="virtual/libc
 	sys-libs/zlib
 	>=media-libs/freetype-2.0.8"
+
 DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4a-r5
 	sys-devel/libtool"
 
 src_unpack() {
+
 	unpack ${A}
 
 	cd ${S}
@@ -28,6 +30,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-zlib.patch
 	epatch ${FILESDIR}/${P}-gcc34.patch
 	epatch ${FILESDIR}/${P}-encoding.patch
+	# fix pack to work with new freetype include scheme (#44119)
+	epatch ${FILESDIR}/${P}-freetype_new_includes.patch
+
 }
 
 src_compile() {