Fix cross-compiling with freetype while upstream sorts it out.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 44 insertions, 5 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index e42e953f3ad4..0223f6c8a0a6 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.497 2013/01/21 03:42:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.498 2013/01/21 05:18:23 vapier Exp $
+
+  21 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/imagemagick-6.7.8.7-freetype.patch, imagemagick-6.7.8.7.ebuild,
+  imagemagick-6.7.9.9.ebuild:
+  Fix cross-compiling with freetype while upstream sorts it out.
 
   21 Jan 2013; Mike Frysinger <vapier@gentoo.org> imagemagick-6.7.8.7.ebuild,
   imagemagick-6.7.9.9.ebuild:
diff --git a/media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch b/media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch
new file mode 100644
index 000000000000..ce1332f335a2
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch
@@ -0,0 +1,32 @@
+https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940
+
+--- a/configure
++++ b/configure
+@@ -26488,7 +26488,6 @@
+ 
+ # Assume that delegate headers reside under same directory as ImageMagick
+ # installation prefix.
+-MAGICK_CPPFLAGS="-I$INCLUDE_DIR/ImageMagick $MAGICK_CPPFLAGS"
+ 
+ #
+ # Find the X11 RGB database
+@@ -29490,8 +29490,8 @@
+     then
+       freetype_prefix=`${freetype_config} --prefix`
+       freetype_exec_prefix=`${freetype_config} --exec-prefix`
+-      LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
+-      CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2"
++      LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`"
++      CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`"
+     fi
+ 
+ dnl First see if there is a library
+@@ -35767,7 +35767,7 @@
+ MAGICK_CXXFLAGS="$CXXFLAGS"
+ MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/  */ /g'`
+ MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/  */ /g'`
+-MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
++MAGICK_LDFLAGS="$LDFLAGS"
+ MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
+ 
+ 
diff --git a/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild b/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
index cf434ccdde26..7161b3cfbc8e 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.9 2013/01/21 03:42:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.10 2013/01/21 05:18:23 vapier Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs versionator libtool
+inherit multilib toolchain-funcs versionator libtool eutils
 
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
 
@@ -67,6 +67,7 @@ REQUIRED_USE="corefonts? ( truetype )
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.7.8.7-freetype.patch
 	elibtoolize # for Darwin modules
 }
 
diff --git a/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild b/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild
index aa883bc7a078..45ba7608d8ad 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.2 2013/01/21 03:42:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.3 2013/01/21 05:18:23 vapier Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs versionator libtool
+inherit multilib toolchain-funcs versionator libtool eutils
 
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
 
@@ -67,6 +67,7 @@ REQUIRED_USE="corefonts? ( truetype )
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.7.8.7-freetype.patch
 	elibtoolize # for Darwin modules
 }