fix building with new freetype

4 files changed, 109 insertions, 6 deletions

diff --git a/gnome-base/gnome-print/ChangeLog b/gnome-base/gnome-print/ChangeLog
index 84e687807aee..8ce76f2ca678 100644
--- a/gnome-base/gnome-print/ChangeLog
+++ b/gnome-base/gnome-print/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gnome-print
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-print/ChangeLog,v 1.20 2004/01/10 14:37:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-print/ChangeLog,v 1.21 2004/04/30 13:25:43 foser Exp $
+
+  30 Apr 2004; foser <foser@gentoo.org> gnome-print-0.37.ebuild :
+  Add patch to fix build with >=freetype-2.1.7, patch provided by Benoit <b.boissinot@ifrance.com> in #44114
 
   10 Jan 2004; <agriffis@gentoo.org> gnome-print-0.37.ebuild:
   stable on alpha and ia64
diff --git a/gnome-base/gnome-print/Manifest b/gnome-base/gnome-print/Manifest
index 58ebfb24e489..27d1cbe438f4 100644
--- a/gnome-base/gnome-print/Manifest
+++ b/gnome-base/gnome-print/Manifest
@@ -1,6 +1,7 @@
-MD5 887be03d1b63cc4b21c314c3f27d6529 ChangeLog 2589
-MD5 49227e826a125418919d842efec3340f gnome-print-0.35-r3.ebuild 1714
-MD5 fb1ee0d59a23e4b9e89d13141f09e76d gnome-print-0.37.ebuild 1347
+MD5 4fc736b194be5224ac0798700b4223cc gnome-print-0.37.ebuild 1446
+MD5 2a117c243bd90c7df395594e7ef63d6c ChangeLog 2762
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 49227e826a125418919d842efec3340f gnome-print-0.35-r3.ebuild 1714
+MD5 6fdff6b7ba3e66b73275be3788fdfc35 files/gnome-print-0.37-freetype_new_include.patch 3567
 MD5 448a5b6d9dd0cec3e158e8a2a4747bae files/digest-gnome-print-0.35-r3 68
 MD5 8aba5ad8525bc9c93bb9374f7072cfa7 files/digest-gnome-print-0.37 69
diff --git a/gnome-base/gnome-print/files/gnome-print-0.37-freetype_new_include.patch b/gnome-base/gnome-print/files/gnome-print-0.37-freetype_new_include.patch
new file mode 100644
index 000000000000..36cf61d612cb
--- /dev/null
+++ b/gnome-base/gnome-print/files/gnome-print-0.37-freetype_new_include.patch
@@ -0,0 +1,95 @@
+diff -Naur gnome-print-0.37.origin/installer/gf-pfb.c gnome-print-0.37/installer/gf-pfb.c
+--- gnome-print-0.37.origin/installer/gf-pfb.c	2002-01-19 01:23:00.000000000 +0100
++++ gnome-print-0.37/installer/gf-pfb.c	2004-03-08 19:40:35.861812512 +0100
+@@ -12,7 +12,8 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include "gf-pfb.h"
+ 
+ #define noVERBOSE
+diff -Naur gnome-print-0.37.origin/installer/gf-ttf.c gnome-print-0.37/installer/gf-ttf.c
+--- gnome-print-0.37.origin/installer/gf-ttf.c	2001-11-05 15:07:28.000000000 +0100
++++ gnome-print-0.37/installer/gf-ttf.c	2004-03-08 19:42:51.483194928 +0100
+@@ -32,7 +32,8 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #include "gf-ttf.h"
+ 
+diff -Naur gnome-print-0.37.origin/installer/gnome-font-install.c gnome-print-0.37/installer/gnome-font-install.c
+--- gnome-print-0.37.origin/installer/gnome-font-install.c	2002-01-22 22:44:55.000000000 +0100
++++ gnome-print-0.37/installer/gnome-font-install.c	2004-03-08 19:43:31.858057016 +0100
+@@ -26,7 +26,8 @@
+ #include <parser.h>
+ #include <xmlmemory.h>
+ /* End of ugly thing */
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <libgnome/gnome-defs.h>
+ #include <libgnome/gnome-util.h>
+ #include <libgnome/gnome-i18n.h>
+diff -Naur gnome-print-0.37.origin/libgnomeprint/gnome-font-face.c gnome-print-0.37/libgnomeprint/gnome-font-face.c
+--- gnome-print-0.37.origin/libgnomeprint/gnome-font-face.c	2002-09-15 22:49:12.000000000 +0200
++++ gnome-print-0.37/libgnomeprint/gnome-font-face.c	2004-03-08 19:46:11.832737168 +0100
+@@ -10,7 +10,8 @@
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <ctype.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
+ #include <locale.h>
+ 
+ #include <libgnomeprint/gnome-print-i18n.h>
+diff -Naur gnome-print-0.37.origin/libgnomeprint/gnome-font-private.h gnome-print-0.37/libgnomeprint/gnome-font-private.h
+--- gnome-print-0.37.origin/libgnomeprint/gnome-font-private.h	2001-12-05 23:07:58.000000000 +0100
++++ gnome-print-0.37/libgnomeprint/gnome-font-private.h	2004-03-08 19:46:47.087377648 +0100
+@@ -22,7 +22,8 @@
+ 
+ BEGIN_GNOME_DECLS
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <libgnomeprint/gp-character-block.h>
+ #include <libgnomeprint/gp-fontmap.h>
+ #include <libgnomeprint/gnome-font.h>
+diff -Naur gnome-print-0.37.origin/libgnomeprint/parseTT.c gnome-print-0.37/libgnomeprint/parseTT.c
+--- gnome-print-0.37.origin/libgnomeprint/parseTT.c	2002-08-27 20:46:20.000000000 +0200
++++ gnome-print-0.37/libgnomeprint/parseTT.c	2004-03-08 19:45:02.876220152 +0100
+@@ -107,9 +107,10 @@
+ #include <config.h>
+ 
+ #include <parseTT.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+diff -Naur gnome-print-0.37.origin/libgnomeprint/parseTT.h gnome-print-0.37/libgnomeprint/parseTT.h
+--- gnome-print-0.37.origin/libgnomeprint/parseTT.h	2001-11-05 20:27:09.000000000 +0100
++++ gnome-print-0.37/libgnomeprint/parseTT.h	2004-03-08 19:45:32.614699216 +0100
+@@ -22,7 +22,8 @@
+ BEGIN_GNOME_DECLS
+ 
+ #include <glib.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ /*
+  * Convert loaded Freetype TTF face to Type1
diff --git a/gnome-base/gnome-print/gnome-print-0.37.ebuild b/gnome-base/gnome-print/gnome-print-0.37.ebuild
index 8dd2377281c1..82339f107d7e 100644
--- a/gnome-base/gnome-print/gnome-print-0.37.ebuild
+++ b/gnome-base/gnome-print/gnome-print-0.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-print/gnome-print-0.37.ebuild,v 1.4 2004/01/10 14:37:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-print/gnome-print-0.37.ebuild,v 1.5 2004/04/30 13:25:43 foser Exp $
 
 inherit gnome.org libtool
 
@@ -8,7 +8,7 @@ IUSE="nls"
 
 DESCRIPTION="GNOME printing library"
 HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="~x86 ~ppc ~sparc alpha hppa ia64"
+KEYWORDS="x86 ~ppc ~sparc alpha hppa ia64"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -28,6 +28,10 @@ src_unpack() {
 	cp ${S}/installer/Makefile.in ${S}/installer/Makefile.in.orig
 	sed -e 's:$(PERL) \($(top_srcdir)/run-gnome-font-install\):echo \1:' \
 		${S}/installer/Makefile.in.orig > ${S}/installer/Makefile.in
+
+	# fix build with freetype 2.1.7 and up (#44114)
+	epatch ${FILESDIR}/${P}-freetype_new_include.patch
+
 }
 
 src_compile() {