SOURCES: ImageMagick-ac.patch, ImageMagick-link.patch - updated for 4.5.0-0

[witekfl]

Author: witekfl                      Date: Wed Oct 29 20:10:33 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 4.5.0-0

---- Files affected:
SOURCES:
   ImageMagick-ac.patch (1.6 -> 1.7) , ImageMagick-link.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/ImageMagick-ac.patch
diff -u SOURCES/ImageMagick-ac.patch:1.6 SOURCES/ImageMagick-ac.patch:1.7
--- SOURCES/ImageMagick-ac.patch:1.6	Tue May 27 10:23:43 2008
+++ SOURCES/ImageMagick-ac.patch	Wed Oct 29 21:10:27 2008
@@ -1,32 +1,5 @@
 --- ImageMagick-6.4.1/configure.ac.orig	2008-05-11 07:11:08.000000000 +0200
 +++ ImageMagick-6.4.1/configure.ac	2008-05-27 09:28:15.000000000 +0200
-@@ -1585,16 +1585,16 @@
- #
- have_fpx='no'
- FPX_LIBS=''
-+AC_LANG_PUSH(C++)
-+AC_REQUIRE_CPP
- if test "$with_fpx" != 'no'; then
-     AC_MSG_RESULT([-------------------------------------------------------------])
-     AC_MSG_RESULT([Checking for FlashPIX support])
-     AC_MSG_RESULT([-------------------------------------------------------------])
-     failed=0
-     passed=0
--    AC_LANG_PUSH(C++)
-     AC_CHECK_HEADER(fpxlib.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
-     AC_CHECK_LIB(fpx,FPX_OpenImageByFilename,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
--    AC_LANG_POP
-     AC_MSG_CHECKING([if FlashPIX package is complete])
-     if test $passed -gt 0; then
-         if test $failed -gt 0; then
-@@ -1611,6 +1611,7 @@
-         AC_MSG_RESULT([no])
-     fi
- fi
-+AC_LANG_POP
- AM_CONDITIONAL(FPX_DELEGATE, test "$have_fpx" = 'yes')
- AC_SUBST(FPX_LIBS)
- 
 @@ -2191,9 +2192,6 @@
          if test -d "${xml2_prefix}/include/libxml2"; then
              CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"

================================================================
Index: SOURCES/ImageMagick-link.patch
diff -u SOURCES/ImageMagick-link.patch:1.6 SOURCES/ImageMagick-link.patch:1.7
--- SOURCES/ImageMagick-link.patch:1.6	Tue May 27 10:23:44 2008
+++ SOURCES/ImageMagick-link.patch	Wed Oct 29 21:10:28 2008
@@ -1,15 +1,15 @@
---- ImageMagick-6.4.1/configure.ac.orig	2008-05-27 09:39:33.000000000 +0200
-+++ ImageMagick-6.4.1/configure.ac	2008-05-27 09:41:47.000000000 +0200
-@@ -1443,7 +1443,7 @@
-     AC_MSG_RESULT([Checking for X11 support])
-     AC_MSG_RESULT([-------------------------------------------------------------])
+--- ImageMagick-6.4.5/configure.ac.orig	2008-10-29 20:33:00.000000000 +0100
++++ ImageMagick-6.4.5/configure.ac	2008-10-29 20:43:12.000000000 +0100
+@@ -1265,7 +1265,7 @@
+     AC_MSG_CHECKING([for X11])
+     AC_MSG_RESULT([])
      LDFLAGS="$LDFLAGS $X_LIBS"
 -    X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 +    X11_LIBS="-lX11 $X_EXTRA_LIBS"
      LIBS="$X11_LIBS $LIBS"
      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  
-@@ -1470,7 +1470,7 @@
+@@ -1292,7 +1292,7 @@
      #
      AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HAVE_SHAPE,1,X11 server supports shape extension)],[],[])
      AC_CHECK_LIB(Xt,XtSetEventDispatcher,XT_LIBS='-lXt',,)
@@ -18,15 +18,15 @@
  fi
  if test "$no_x" != 'yes'; then
    have_x='yes'
-@@ -3047,9 +3047,9 @@
+@@ -3134,9 +3134,9 @@
  AC_SUBST(MAGICK_LTDLDEPS)
  
  if test "$with_modules" != 'no'; then
 -    MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS"
 +    MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS"
  else
--    MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $DJVU_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS"
-+    MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $DJVU_LIBS $FPX_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS"
+-    MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS"
++    MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS"
  fi
  AC_SUBST(MAGICK_DEP_LIBS)
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ImageMagick-ac.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ImageMagick-link.patch?r1=1.6&r2=1.7&f=u