- updated for 6.1.0-9, thx to qboosh

Changed files:
    ImageMagick-libpath.patch -> 1.12
    ImageMagick-system-libltdl.patch -> 1.2

diff --git a/ImageMagick-libpath.patch b/ImageMagick-libpath.patch
index 131ca907c41f9498948cd8a36e796925e72e7d93..6f3fbbfc026dcd88ba764aac7a3cb516739d1d89 100644 (file)
--- a/ImageMagick-libpath.patch
+++ b/ImageMagick-libpath.patch
@@ -9,9 +9,9 @@
  then
    # Find out where libtool hides its uninstalled libraries (as libtool_objdir)
    eval `./libtool --config|grep '^objdir='|sed -e 's/^objdir/libtool_objdir/'`
---- ImageMagick-5.5.7/Makefile.am.orig 2003-05-15 17:24:39.000000000 +0200
-+++ ImageMagick-5.5.7/Makefile.am      2003-07-18 08:27:25.000000000 +0200
-@@ -97,11 +97,12 @@
+--- ImageMagick-6.0.8/PerlMagick/Makefile.am.orig      2004-09-12 19:25:25.000000000 +0200
++++ ImageMagick-6.0.8/PerlMagick/Makefile.am   2004-09-19 12:25:10.924398496 +0200
+@@ -45,11 +45,12 @@
        cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
  
  install-exec-perl: $(PERLMAKEFILE)

diff --git a/ImageMagick-system-libltdl.patch b/ImageMagick-system-libltdl.patch
index fbb53dc6f3e58e3f1baf95f050e9ce52a918bcd7..95d3988d139aed4cec8b4aa3ee311e6fbe4649e2 100644 (file)
--- a/ImageMagick-system-libltdl.patch
+++ b/ImageMagick-system-libltdl.patch
@@ -1,6 +1,19 @@
---- ImageMagick-5.5.1/configure.ac.orig        Fri Nov  1 14:37:40 2002
-+++ ImageMagick-5.5.1/configure.ac     Fri Nov  1 14:41:30 2002
-@@ -148,7 +148,7 @@
+diff -ur ImageMagick-6.1.0.orig/Makefile.am ImageMagick-6.1.0/Makefile.am
+--- ImageMagick-6.1.0.orig/Makefile.am 2004-10-10 05:04:44.000000000 +0200
++++ ImageMagick-6.1.0/Makefile.am      2004-10-13 21:31:13.000000000 +0200
+@@ -113,7 +113,7 @@
+       $(UTILITIES_EXTRA_DIST) \
+       $(WAND_EXTRA_DIST)
+ 
+-lib_LTLIBRARIES = $(LIBLTDL) $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP)
++lib_LTLIBRARIES = $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP)
+ 
+ check_PROGRAMS = \
+       $(TESTS_CHECK_PGRMS) \
+diff -ur ImageMagick-6.1.0.orig/configure.ac ImageMagick-6.1.0/configure.ac
+--- ImageMagick-6.1.0.orig/configure.ac        2004-10-13 21:23:06.000000000 +0200
++++ ImageMagick-6.1.0/configure.ac     2004-10-13 21:26:22.000000000 +0200
+@@ -260,7 +260,7 @@
  
  # Configure libltdl
  #AC_CONFIG_SUBDIRS(ltdl)
@@ -8,15 +21,21 @@
 +AC_LIBLTDL_INSTALLABLE(ltdl)
  AC_LIB_LTDL
  # Substitute INCLTDL and LIBLTDL in the Makefiles
- AC_SUBST(INCLTDL)
---- ImageMagick-5.5.1/utilities/Makefile.am.orig       Fri Oct 11 22:07:21 2002
-+++ ImageMagick-5.5.1/utilities/Makefile.am    Fri Nov  1 15:11:18 2002
-@@ -58,7 +58,7 @@
+ #AC_SUBST(INCLTDL)
+diff -ur ImageMagick-6.1.0.orig/ltdl/Makefile.am ImageMagick-6.1.0/ltdl/Makefile.am
+--- ImageMagick-6.1.0.orig/ltdl/Makefile.am    2004-09-11 22:00:34.000000000 +0200
++++ ImageMagick-6.1.0/ltdl/Makefile.am 2004-10-13 21:26:22.000000000 +0200
+@@ -28,12 +28,8 @@
+ #endif
  
- # Libtool libraries, dependencies, and linker flags used by most executables
- if WITH_MODULES
--COMMONLDADD   = $(MAGICK_LIB) $(top_builddir)/ltdl/libltdlc.la
-+COMMONLDADD   = $(MAGICK_LIB)
- COMMONLDFLAGS = @LDFLAGS@ @DLLDFLAGS@
+ if WITH_LTDL
+-  LIBLTDL=ltdl/libltdl.la
+-if INSTALL_LTDL
+-  LTDL_INSTALLHEADERS =  $(LTDL_HDRS)
+-else
++  LIBLTDL=-lltdl
+   LTDL_NOINST_HDRS = $(LTDL_HDRS)
+-endif # INSTALL_LTDL
  else
- COMMONLDADD   = $(MAGICK_LIB)
+   LIBLTDL=
+ endif # WITH_LTDL