* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick/files: imagemagick-6.7.8.7-freetype.patch
@ 2013-01-21 5:18 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2013-01-21 5:18 UTC (permalink / raw
To: gentoo-commits
vapier 13/01/21 05:18:23
Added: imagemagick-6.7.8.7-freetype.patch
Log:
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)
Revision Changes Path
1.1 media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch?rev=1.1&content-type=text/plain
Index: imagemagick-6.7.8.7-freetype.patch
===================================================================
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"
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick/files: imagemagick-6.7.8.7-freetype.patch
@ 2014-05-14 17:02 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2014-05-14 17:02 UTC (permalink / raw
To: gentoo-commits
ssuominen 14/05/14 17:02:27
Removed: imagemagick-6.7.8.7-freetype.patch
Log:
old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-14 17:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-14 17:02 [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick/files: imagemagick-6.7.8.7-freetype.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2013-01-21 5:18 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox