- updated for 5.3.4.

Changed files:
    ImageMagick-libpath.patch -> 1.6
    ImageMagick-perl-link.patch -> 1.2

diff --git a/ImageMagick-libpath.patch b/ImageMagick-libpath.patch
index a8d0c7d293c8caa614d7cbf499c848fe52334704..a503137425743efcc3907738058821d1186347ff 100644 (file)
--- a/ImageMagick-libpath.patch
+++ b/ImageMagick-libpath.patch
@@ -1,12 +1,11 @@
-diff -Nru ImageMagick-5.2.7/PerlMagick/Makefile.PL.in ImageMagick-5.2.7.new/PerlMagick/Makefile.PL.in
---- ImageMagick-5.2.7/PerlMagick/Makefile.PL.in        Wed Jan 24 01:16:51 2001
-+++ ImageMagick-5.2.7.new/PerlMagick/Makefile.PL.in    Wed Jan 24 01:26:11 2001
+--- ImageMagick-5.3.4/PerlMagick/Makefile.PL.in.orig   Tue May 15 23:04:15 2001
++++ ImageMagick-5.3.4/PerlMagick/Makefile.PL.in        Sat Jun  2 19:44:42 2001
 @@ -6,7 +6,7 @@
  WriteMakefile(
      'NAME'    => 'Image::Magick',
      'VERSION_FROM' => 'Magick.pm', # finds $VERSION
--    'LIBS'    => ['@LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'],
-+    'LIBS'    => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'],
+-    'LIBS'    => ['@LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'],
++    'LIBS'    => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'],
      'DEFINE'  => '@DEFS@',     # e.g., '-DHAVE_SOMETHING' 
      'INC'     => '-I../ -I@top_srcdir@ @CPPFLAGS@',
      ($Config{'archname'} =~ /-object$/i ? ('CAPI' => 'TRUE') : ()),

diff --git a/ImageMagick-perl-link.patch b/ImageMagick-perl-link.patch
index 17ddc6606ff4d4078e0dc7df69258551d127fade..8d11027fa75d2f5f63e4d4115e8d6de8ec63c954 100644 (file)
--- a/ImageMagick-perl-link.patch
+++ b/ImageMagick-perl-link.patch
@@ -1,22 +1,11 @@
---- ImageMagick-5.3.1/PerlMagick/Makefile.PL.in~       Wed Apr 18 00:17:02 2001
-+++ ImageMagick-5.3.1/PerlMagick/Makefile.PL.in        Wed Apr 18 00:18:45 2001
+--- ImageMagick-5.3.4/PerlMagick/Makefile.PL.in.orig   Sat Jun  2 19:45:35 2001
++++ ImageMagick-5.3.4/PerlMagick/Makefile.PL.in        Sat Jun  2 19:46:39 2001
 @@ -6,7 +6,7 @@
  WriteMakefile(
      'NAME'    => 'Image::Magick',
      'VERSION_FROM' => 'Magick.pm', # finds $VERSION
--    'LIBS'    => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'],
-+    'LIBS'    => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@ @LIB_WMF@'],
+-    'LIBS'    => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'],
++    'LIBS'    => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@ @LIB_WMF@'],
      'DEFINE'  => '@DEFS@',     # e.g., '-DHAVE_SOMETHING' 
      'INC'     => '-I../ -I@top_srcdir@ @CPPFLAGS@',
      ($Config{'archname'} =~ /-object$/i ? ('CAPI' => 'TRUE') : ()),
---- ImageMagick-5.3.1/PerlMagick/Makefile.PL~  Sun Apr  1 18:09:41 2001
-+++ ImageMagick-5.3.1/PerlMagick/Makefile.PL   Wed Apr 18 00:19:04 2001
-@@ -6,7 +6,7 @@
- WriteMakefile(
-     'NAME'    => 'Image::Magick',
-     'VERSION_FROM' => 'Magick.pm', # finds $VERSION
--    'LIBS'    => ['-L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -L/home/cristy/ImageMagick/magick -lMagick    -ltiff -lfreetype -ljpeg -lpng  -ldpstk -ldps -lXext -lXt  -lSM -lICE -lX11  -lbz2  -lz -lpthread  -lm'],
-+    'LIBS'    => ['-L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -L/home/cristy/ImageMagick/magick -lMagick    -ltiff -lfreetype -ljpeg -lpng  -ldpstk -ldps -lXext -lXt  -lSM -lICE -lX11  -lbz2  -lz -lpthread  -lm -lwmf'],
-     'DEFINE'  => '-DHAVE_CONFIG_H',     # e.g., '-DHAVE_SOMETHING' 
-     'INC'     => '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/freetype2 -D_REENTRANT -D_FILE_OFFSET_BITS=64 -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11',
-     ($Config{'archname'} =~ /-object$/i ? ('CAPI' => 'TRUE') : ()),