- update for 6.2.9

Changed files:
    ImageMagick-ac.patch -> 1.3
    ImageMagick-link.patch -> 1.3

diff --git a/ImageMagick-ac.patch b/ImageMagick-ac.patch
index bfa8a2790189b0ef6fedd9120341b486b4083525..fc3aca37fb1426d07ab598146904344f1c3af460 100644 (file)
--- a/ImageMagick-ac.patch
+++ b/ImageMagick-ac.patch
@@ -3,7 +3,7 @@
 @@ -737,16 +737,16 @@
  #
  have_fpx='no'
- LIB_FPX=''
+ FPX_LIBS=''
 +AC_LANG_PUSH(C++)
 +AC_REQUIRE_CPP
  if test "$with_fpx" != 'no'
@@ -28,10 +28,10 @@
  AC_SUBST(LIB_FPX)
  
 @@ -1935,7 +1935,6 @@
-         then
-           CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
-         fi
--        LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
-      fi
-     failed=0;
-     passed=0;
+     then
+       CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
+     fi
+-    LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
+    fi
+   failed=0;
+   passed=0;

diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index 73532588ddc93c52b30fc5a9416b4c1de6709ebc..e156023ba2873ccb10f76119b3ae4bf0f4dc51f1 100644 (file)
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -4,17 +4,17 @@
  if test "$no_x" != 'yes'
  then
    LDFLAGS="$LDFLAGS $X_LIBS"
--  LIB_X11="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-+  LIB_X11="-lX11 $X_EXTRA_LIBS"
-   LIBS="$LIB_X11 $LIBS"
+-  X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++  X11_LIBS="-lX11 $X_EXTRA_LIBS"
+   LIBS="$X11_LIBS $LIBS"
    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  
 @@ -1290,7 +1290,7 @@
-   AC_CHECK_LIB([Xext],[XShapeCombineMask],[LIB_XEXT='-lXext' ; AC_DEFINE(HasShape,1,X11 server supports shape extension)],[],[])
+   AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HasShape,1,X11 server supports shape extension)],[],[])
  
-   AC_CHECK_LIB(Xt,XtSetEventDispatcher,LIB_XT='-lXt',,)
--  LIBS="$LIB_XEXT $LIB_XT $LIBS"
-+  LIBS="$LIB_XEXT $LIBS"
+   AC_CHECK_LIB(Xt,XtSetEventDispatcher,XT_LIBS='-lXt',,)
+-  LIBS="$XEXT_LIBS $XT_LIBS $LIBS"
++  LIBS="$XEXT_LIBS $LIBS"
  fi
  if test "$no_x" != 'yes'
  then
@@ -22,11 +22,11 @@
  #
  if test "$with_modules" != 'no'
  then
--  MAGICK_DEP_LIBS="$LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JPEG $LIB_GS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_XT $LIB_BZLIB $LIB_ZLIB $LIB_GDI32 $LIB_THREAD $LIB_MATH $LIB_CCMALLOC $LIB_EFENCE $LIB_THREAD $LIBS_USER"
-+  MAGICK_DEP_LIBS="$LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JPEG $LIB_GS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_BZLIB $LIB_ZLIB $LIB_GDI32 $LIB_THREAD $LIB_MATH $LIB_CCMALLOC $LIB_EFENCE $LIB_THREAD $LIBS_USER"
+-  MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
++  MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
  else
--  MAGICK_DEP_LIBS="$LIB_JBIG $LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JP2 $LIB_JPEG $LIB_GS $LIB_PNG $LIB_FPX $LIB_FONTCONFIG $LIB_WMF $LIB_DPS $LIB_XEXT $LIB_XT $LIB_IPC $LIB_X11 $LIB_BZLIB $LIB_XML $LIB_GVC $LIB_ZLIB $LIB_GDI32 $LIB_THREAD $LIB_MATH $LIB_CCMALLOC $LIB_EFENCE $LIB_THREAD $LIBS_USER"
-+  MAGICK_DEP_LIBS="$LIB_JBIG $LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JP2 $LIB_JPEG $LIB_GS $LIB_PNG $LIB_FPX $LIB_WMF $LIB_DPS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_BZLIB $LIB_XML $LIB_GVC $LIB_ZLIB $LIB_GDI32 $LIB_THREAD $LIB_MATH $LIB_CCMALLOC $LIB_EFENCE $LIB_THREAD $LIBS_USER"
+-  MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $PNG_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
++  MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $PNG_LIBS $FPX_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
  fi
  AC_SUBST(MAGICK_DEP_LIBS)