Patch 20060406 and 20060408 for building against freetype-2.2, thanks to

David Somers in #129658. Mark 20060408 stable on ia64
(Portage version: 2.1.1_pre2-r6)

4 files changed, 24 insertions, 5 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 2d1f85bebc2e..befc34966965 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.29 2006/07/11 23:43:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.30 2006/07/12 13:57:18 agriffis Exp $
+
+  12 Jul 2006; Aron Griffis <agriffis@gentoo.org>
+  +files/fontforge-20060406-ft22.patch, fontforge-20060406.ebuild,
+  fontforge-20060408.ebuild:
+  Patch 20060406 and 20060408 for building against freetype-2.2, thanks to
+  David Somers in #129658. Mark 20060408 stable on ia64
 
   11 Jul 2006; Aron Griffis <agriffis@gentoo.org>
   +files/fontforge-20060406-ia64.patch, fontforge-20060406.ebuild,
diff --git a/media-gfx/fontforge/files/fontforge-20060406-ft22.patch b/media-gfx/fontforge/files/fontforge-20060406-ft22.patch
new file mode 100644
index 000000000000..0873d021bb14
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20060406-ft22.patch
@@ -0,0 +1,11 @@
+--- fontforge/freetype.c~	2006-04-11 16:35:35.000000000 -0700
++++ fontforge/freetype.c	2006-04-11 16:35:35.000000000 -0700
+@@ -85,7 +85,7 @@
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ #include FT_OUTLINE_H
+-#if FREETYPE_MINOR>=2
++#if defined(FREETYPE_HAS_DEBUGGER) && FREETYPE_MINOR>=2
+ # include <internal/internal.h>
+ #endif
+ #include <unistd.h>
diff --git a/media-gfx/fontforge/fontforge-20060406.ebuild b/media-gfx/fontforge/fontforge-20060406.ebuild
index 13ae2cac55f9..46f02d4bc2b7 100644
--- a/media-gfx/fontforge/fontforge-20060406.ebuild
+++ b/media-gfx/fontforge/fontforge-20060406.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20060406.ebuild,v 1.2 2006/07/11 23:43:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20060406.ebuild,v 1.3 2006/07/12 13:57:18 agriffis Exp $
 
 inherit flag-o-matic eutils
 
@@ -27,7 +27,8 @@ src_unpack() {
 	cd "${S}"
 	sed -i -e 's:ungif:gif:g' configure* || die
 	sed -i -e 's:"libungif":"libgif":g' gdraw/gimagereadgif.c || die
-	epatch "${FILESDIR}"/${P}-respect-HOME.patch
+	epatch "${FILESDIR}/${P}-respect-HOME.patch"
+	epatch "${FILESDIR}/${PN}-20060406-ft22.patch"
 	use ia64 && epatch "${FILESDIR}/${PN}-20060406-ia64.patch"
 }
 
diff --git a/media-gfx/fontforge/fontforge-20060408.ebuild b/media-gfx/fontforge/fontforge-20060408.ebuild
index 308c8a75d88b..98cee377d0b1 100644
--- a/media-gfx/fontforge/fontforge-20060408.ebuild
+++ b/media-gfx/fontforge/fontforge-20060408.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20060408.ebuild,v 1.2 2006/07/11 23:43:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20060408.ebuild,v 1.3 2006/07/12 13:57:18 agriffis Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc-macos ~sparc ~x86"
 IUSE="png gif jpeg tiff truetype svg unicode X"
 
 DEPEND="png? ( >=media-libs/libpng-1.2.4 )
@@ -27,6 +27,7 @@ src_unpack() {
 	cd "${S}"
 	sed -i -e 's:ungif:gif:g' configure* || die
 	sed -i -e 's:"libungif":"libgif":g' gdraw/gimagereadgif.c || die
+	epatch "${FILESDIR}/${PN}-20060406-ft22.patch"
 	use ia64 && epatch "${FILESDIR}/${PN}-20060406-ia64.patch"
 }