add FT includes fix

4 files changed, 59 insertions, 7 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index a64fe3563e63..9e900a61ec3a 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/dia
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.34 2004/08/05 20:21:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.35 2004/08/19 22:31:59 foser Exp $
+
+  20 Aug 2004; foser <foser@gentoo.org> dia-0.92.2.ebuild :
+  Added patch by Benoit Boissinot fixing the FT includes (#44113)
 
   05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.93.ebuild:
   Stable on sparc
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 251f06e47387..49ef53f80992 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,7 +1,8 @@
-MD5 53c1a4c4eb7c312f633278bf1529bc98 ChangeLog 4596
-MD5 ff5b358ffb83c35e47681cc24b4c4846 dia-0.92.2.ebuild 954
+MD5 8645d7b501779374e80a4ecbe8fe70f3 ChangeLog 4720
 MD5 c84a86629b4ed0197088650a00ff7e5a dia-0.93.ebuild 1075
+MD5 1deb60317a37418e46523f75c062a156 dia-0.92.2.ebuild 1050
 MD5 858a96d79b7c8b479edd95aedcf0c0c6 metadata.xml 589
-MD5 7459df6c8efd61f2c725351d0da979ad files/dia-0.93-fix_py_prefix.patch 499
-MD5 6ea73da1387f009af48baa0137f0adf8 files/digest-dia-0.92.2 64
+MD5 8cf03116a588a016da9236ded497281c files/dia-0.92.2-freetype_include.patch 1534
 MD5 1df50dee999cd3aa4746682bfc1d1d72 files/digest-dia-0.93 62
+MD5 6ea73da1387f009af48baa0137f0adf8 files/digest-dia-0.92.2 64
+MD5 7459df6c8efd61f2c725351d0da979ad files/dia-0.93-fix_py_prefix.patch 499
diff --git a/app-office/dia/dia-0.92.2.ebuild b/app-office/dia/dia-0.92.2.ebuild
index 4e4e9a0f0fef..eb3283110484 100644
--- a/app-office/dia/dia-0.92.2.ebuild
+++ b/app-office/dia/dia-0.92.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.92.2.ebuild,v 1.9 2004/06/24 22:38:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.92.2.ebuild,v 1.10 2004/08/19 22:31:59 foser Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Diagram/flowchart creation program"
 HOMEPAGE="http://www.gnome.org/projects/dia/"
@@ -32,3 +32,12 @@ DEPEND="${RDEPEND}
 G2CONF="${G2CONF} $(use_enable gnome) $(use_with python)"
 
 DOCS="AUTHORS COPYING ChangeLog KNOWN_BUGS README RELEASE* NEWS THANKS TODO"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-freetype_include.patch
+
+}
diff --git a/app-office/dia/files/dia-0.92.2-freetype_include.patch b/app-office/dia/files/dia-0.92.2-freetype_include.patch
new file mode 100644
index 000000000000..fdadb9ab615d
--- /dev/null
+++ b/app-office/dia/files/dia-0.92.2-freetype_include.patch
@@ -0,0 +1,39 @@
+diff -Naur dia-0.92.2.origin/app/diapsft2renderer.c dia-0.92.2/app/diapsft2renderer.c
+--- dia-0.92.2.origin/app/diapsft2renderer.c	2003-08-25 17:15:03.000000000 +0200
++++ dia-0.92.2/app/diapsft2renderer.c	2004-03-08 19:51:29.706413024 +0100
+@@ -27,7 +27,8 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ /* I'd really rather avoid this */
+-#include <freetype/ftglyph.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
+ 
+ #define DPI 300
+ 
+diff -Naur dia-0.92.2.origin/configure dia-0.92.2/configure
+--- dia-0.92.2.origin/configure	2003-11-01 12:26:01.000000000 +0100
++++ dia-0.92.2/configure	2004-03-08 23:00:20.733835024 +0100
+@@ -20119,7 +20119,8 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #if (FREETYPE_MAJOR*1000+FREETYPE_MINOR)*1000+FREETYPE_PATCH < 2000009
+ #error Freetype version too low.
+ #endif
+diff -Naur dia-0.92.2.origin/configure.in dia-0.92.2/configure.in
+--- dia-0.92.2.origin/configure.in	2003-11-01 12:23:46.000000000 +0100
++++ dia-0.92.2/configure.in	2004-03-08 23:01:52.331910000 +0100
+@@ -69,7 +69,8 @@
+     AC_MSG_CHECKING([if FreeType version is 2.0.9 or higher])
+     old_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS `freetype-config --cflags`"
+-    AC_TRY_CPP([#include <freetype/freetype.h>
++    AC_TRY_CPP([#include <ft2build.h>
++#include FT_FREETYPE_H
+ #if (FREETYPE_MAJOR*1000+FREETYPE_MINOR)*1000+FREETYPE_PATCH < 2000009
+ #error Freetype version too low.
+ #endif