- updated to 6.5.8-6

[packages/ImageMagick.git] / ImageMagick-link.patch

diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index 73532588ddc93c52b30fc5a9416b4c1de6709ebc..c59c8b15c01ec09265602a7078fc6151992b0fdb 100644 (file)
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,32 +1,32 @@
---- ImageMagick-6.2.6/configure.ac.orig        2006-03-14 23:34:03.535115000 +0100
-+++ ImageMagick-6.2.6/configure.ac     2006-03-14 23:53:45.212965250 +0100
-@@ -1260,7 +1260,7 @@
- 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"
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+--- ImageMagick-6.4.5/configure.ac.orig        2009-07-22 09:24:59.000000000 +0200
++++ ImageMagick-6.4.5/configure.ac     2009-07-22 09:29:05.000000000 +0200
+@@ -1306,7 +1306,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"
  
-@@ -1290,7 +1290,7 @@
-   AC_CHECK_LIB([Xext],[XShapeCombineMask],[LIB_XEXT='-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"
+@@ -1333,7 +1333,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',,)
+-    LIBS="$XEXT_LIBS $XT_LIBS $LIBS"
++    LIBS="$XEXT_LIBS $LIBS"
  fi
- if test "$no_x" != 'yes'
- then
-@@ -2710,9 +2710,9 @@
- #
- 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"
+ if test "$no_x" != 'yes'; then
+   have_x='yes'
+@@ -3219,9 +3219,9 @@
+ AC_SUBST(MAGICK_LTDLDEPS)
+ 
+ if test "$with_modules" != 'no'; then
+-    MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_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 $CL_LIBS $THREAD_LIBS"
++    MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_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 $CL_LIBS $THREAD_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 $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_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 $CL_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 $FFTW_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 $CL_LIBS $THREAD_LIBS"
  fi
  AC_SUBST(MAGICK_DEP_LIBS)