diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2013-04-08 17:41:50 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2013-04-08 17:41:50 +0000 |
| commit | 44d6c6c250da42c15759d38a4f6f96183d344824 (patch) | |
| tree | 3baeb5c7a4e142e9e80c23d16d097cfdb61c668c /media-gfx/graphicsmagick/files | |
| parent | Add mirror and bindist restriction, bug 464938. (diff) | |
| download | gentoo-2-44d6c6c250da42c15759d38a4f6f96183d344824.tar.gz gentoo-2-44d6c6c250da42c15759d38a4f6f96183d344824.tar.bz2 gentoo-2-44d6c6c250da42c15759d38a4f6f96183d344824.zip | |
Update freetype cross-compile patch to drop eautoreconf usage (fixes bug #465122).
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'media-gfx/graphicsmagick/files')
| -rw-r--r-- | media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch index e8b7aaa16360..d6504e6d0ffe 100644 --- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch +++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch @@ -1,8 +1,8 @@ https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940 ---- GraphicsMagick-1.3.18/configure.ac -+++ GraphicsMagick-1.3.18/configure.ac -@@ -1305,7 +1305,6 @@ +--- GraphicsMagick-1.3.18/configure ++++ GraphicsMagick-1.3.18/configure +@@ -22249,7 +22249,6 @@ # directory as GraphicsMagick installation prefix. #LDFLAGS="$LDFLAGS -L$LIB_DIR" #CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR" @@ -10,7 +10,7 @@ https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537 # # Find the X11 RGB database -@@ -2273,8 +2272,8 @@ +@@ -25994,8 +25993,8 @@ then freetype_prefix=`${freetype_config} --prefix` freetype_exec_prefix=`${freetype_config} --exec-prefix` @@ -20,8 +20,8 @@ https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537 + CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`" fi - dnl First see if there is a library -@@ -3354,7 +3353,7 @@ + if test "$LIB_TTF" = '' +@@ -29605,7 +29604,7 @@ MAGICK_API_CFLAGS=$CFLAGS MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'` |