- patches from rawhide.

Changed files:
    ImageMagick-libpath.patch -> 1.2

diff --git a/ImageMagick-libpath.patch b/ImageMagick-libpath.patch
index 36b354f84e2305672b43ed6df83a833d8470f81f..f2b27dcfcd97081517732fceaabee6fd18660d28 100644 (file)
--- a/ImageMagick-libpath.patch
+++ b/ImageMagick-libpath.patch
@@ -1,11 +1,11 @@
---- ImageMagick-4.1.0/PerlMagick/Makefile.PL.in.libpath        Mon Sep 14 01:48:37 1998
-+++ ImageMagick-4.1.0/PerlMagick/Makefile.PL.in        Mon Sep 14 01:49:37 1998
-@@ -4,7 +4,7 @@
+--- ImageMagick-4.2.8/PerlMagick/Makefile.PL.in.libpath        Wed Aug  4 19:54:38 1999
++++ ImageMagick-4.2.8/PerlMagick/Makefile.PL.in        Tue Aug 17 17:36:01 1999
+@@ -6,7 +6,7 @@
  WriteMakefile(
      'NAME'    => 'Image::Magick',
      'VERSION_FROM' => 'Magick.pm', # finds $VERSION
--    'LIBS'    => ['@LDFLAGS@ @MAGICKLIB@ @X11STUBSLIB@ @LIBS@'],
-+    'LIBS'    => ['@LDFLAGS@ -L@top_srcdir@/magick/.libs @MAGICKLIB@ @X11STUBSLIB@ @LIBS@'],
-     'DEFINE'  => '',     # e.g., '-DHAVE_SOMETHING' 
-     'INC'     => '-I@top_srcdir@/magick @CPPFLAGS@',
- );
+-    'LIBS'    => ['@LDFLAGS@ @MAGICKLIB@ @LIBS@'],
++    'LIBS'    => ['@LDFLAGS@ -L@top_srcdir@/magick/.libs @MAGICKLIB@ @LIBS@'],
+     'DEFINE'  => '@DEFS@',     # e.g., '-DHAVE_SOMETHING' 
+     'INC'     => '-I@top_srcdir@ @CPPFLAGS@',
+     ($Config{'archname'} =~ /-object$/i ? ('CAPI' => 'TRUE') : ()),