diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2007-02-15 17:57:41 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2007-02-15 17:57:41 +0000 |
| commit | 4fb6c9296accdb831c6b9e33dc3992bf9afa7571 (patch) | |
| tree | 8777b25147bbe70e33a0f8ce40225b113565829f /media-gfx | |
| parent | remove games-emulation/mupen64:asm (diff) | |
| download | gentoo-2-4fb6c9296accdb831c6b9e33dc3992bf9afa7571.tar.gz gentoo-2-4fb6c9296accdb831c6b9e33dc3992bf9afa7571.tar.bz2 gentoo-2-4fb6c9296accdb831c6b9e33dc3992bf9afa7571.zip | |
Fix bug #155804.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/imagemagick/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/imagemagick/files/imagemagick-6.3.0.5-no-lMagick.patch | 15 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild | 4 |
3 files changed, 23 insertions, 3 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index f9bc81a83cbe..aee75f1cc816 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.212 2007/02/08 16:01:46 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.213 2007/02/15 17:57:41 jer Exp $ + + 15 Feb 2007; Jeroen Roovers <jer@gentoo.org> + +files/imagemagick-6.3.0.5-no-lMagick.patch, imagemagick-6.3.0.5.ebuild: + Fix bug #155804 while sekretarz is MIA. Cross fingers. Thanks to kojiro for + the final patch. 08 Feb 2007; Daniel Drake <dsd@gentoo.org> -files/imagemagick-6.2.5.4-docs.patch, diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-no-lMagick.patch b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-no-lMagick.patch new file mode 100644 index 000000000000..4140ba617866 --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-no-lMagick.patch @@ -0,0 +1,15 @@ +--- PerlMagick/Makefile.PL.in.orig 2006-09-19 10:53:54.000000000 -0400 ++++ PerlMagick/Makefile.PL.in 2007-02-15 08:39:41.000000000 -0500 +@@ -53,10 +53,10 @@ + 'CCFLAGS' => "$Config{'ccflags'} @CFLAGS@", + + # Linker flags for building an executable +- 'LDFLAGS' => "-L../magick/.libs -lMagick $Config{'ldflags'}", ++ 'LDFLAGS' => "-L../magick/.libs $Config{'ldflags'}", + + # Linker flags for building a dynamically loadable module +- 'LDDLFLAGS' => "-L../magick/.libs -lMagick $Config{'lddlflags'}", ++ 'LDDLFLAGS' => "-L../magick/.libs $Config{'lddlflags'}", + + # Install PerlMagick binary into ImageMagick bin directory + 'INSTALLBIN' => '@BIN_DIR@', diff --git a/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild b/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild index 75055785dd92..bf93883609b4 100644 --- a/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild,v 1.11 2007/02/11 11:24:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild,v 1.12 2007/02/15 17:57:41 jer Exp $ inherit eutils multilib perl-app @@ -54,7 +54,7 @@ src_unpack() { chmod +x config.sub einfo ${S} epatch "${FILESDIR}"/${PN}-6.3.0.5-docs.patch -# epatch "${FILESDIR}"/imagemagick-perl.patch + epatch "${FILESDIR}"/${P}-no-lMagick.patch # from bug #146713, sent upstream epatch "${FILESDIR}"/${P}-configure-windows-fonts.patch |