SOURCES (AC-branch): ImageMagick-libpath.patch, ImageMagick-system...

[psz]

Author: psz                          Date: Sat Feb 18 23:35:55 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merging changes from HEAD to comply version bump

---- Files affected:
SOURCES:
   ImageMagick-libpath.patch (1.11 -> 1.11.2.1) , ImageMagick-system-libltdl.patch (1.1 -> 1.1.4.1) 

---- Diffs:

================================================================
Index: SOURCES/ImageMagick-libpath.patch
diff -u SOURCES/ImageMagick-libpath.patch:1.11 SOURCES/ImageMagick-libpath.patch:1.11.2.1
--- SOURCES/ImageMagick-libpath.patch:1.11	Fri Jul 18 22:09:28 2003
+++ SOURCES/ImageMagick-libpath.patch	Sun Feb 19 00:35:49 2006
@@ -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)

================================================================
Index: SOURCES/ImageMagick-system-libltdl.patch
diff -u SOURCES/ImageMagick-system-libltdl.patch:1.1 SOURCES/ImageMagick-system-libltdl.patch:1.1.4.1
--- SOURCES/ImageMagick-system-libltdl.patch:1.1	Fri Nov  1 15:35:28 2002
+++ SOURCES/ImageMagick-system-libltdl.patch	Sun Feb 19 00:35:50 2006
@@ -1,6 +1,32 @@
---- 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 @@
+--- ./ltdl/Makefile.am.org	2005-09-28 17:06:38.000000000 +0000
++++ ./ltdl/Makefile.am	2005-09-28 17:07:54.000000000 +0000
+@@ -28,12 +28,8 @@
+ #endif
+ 
+ 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
+   LIBLTDL=
+ endif # WITH_LTDL
+--- ./Makefile.am.org	2005-09-28 17:04:01.000000000 +0000
++++ ./Makefile.am	2005-09-28 17:05:13.000000000 +0000
+@@ -113,7 +113,6 @@
+ 	$(WAND_EXTRA_DIST)
+ 
+ lib_LTLIBRARIES = $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP)
+-noinst_LTLIBRARIES = $(LIBLTDL)
+ 
+ check_PROGRAMS = \
+ 	$(TESTS_CHECK_PGRMS) \
+--- ./configure.ac.org	2005-09-28 17:05:32.000000000 +0000
++++ ./configure.ac	2005-09-28 17:06:18.000000000 +0000
+@@ -293,7 +293,7 @@
  
  # Configure libltdl
  #AC_CONFIG_SUBDIRS(ltdl)
@@ -8,15 +34,4 @@
 +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 @@
- 
- # 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@
- else
- COMMONLDADD	= $(MAGICK_LIB)
+ #AC_SUBST(INCLTDL)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ImageMagick-libpath.patch?r1=1.11&r2=1.11.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/ImageMagick-system-libltdl.patch?r1=1.1&r2=1.1.4.1&f=u