packages: ImageMagick/ImageMagick-link.patch, ImageMagick/ImageMagick-lt.pa...

[lisu]

Author: lisu                         Date: Mon Dec 27 12:43:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 6.6.6-7

---- Files affected:
packages/ImageMagick:
   ImageMagick-link.patch (1.11 -> 1.12) , ImageMagick-lt.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/ImageMagick/ImageMagick-link.patch
diff -u packages/ImageMagick/ImageMagick-link.patch:1.11 packages/ImageMagick/ImageMagick-link.patch:1.12
--- packages/ImageMagick/ImageMagick-link.patch:1.11	Sun Oct 24 07:46:56 2010
+++ packages/ImageMagick/ImageMagick-link.patch	Mon Dec 27 13:43:12 2010
@@ -1,6 +1,6 @@
---- 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 @@
+--- ImageMagick-6.6.6-7/configure.ac~	2010-12-27 13:22:18.249041767 +0100
++++ ImageMagick-6.6.6-7/configure.ac	2010-12-27 13:26:49.729041767 +0100
+@@ -1360,7 +1360,7 @@
      AC_MSG_CHECKING([for X11])
      AC_MSG_RESULT([])
      LDFLAGS="$LDFLAGS $X_LIBS"
@@ -9,7 +9,7 @@
      LIBS="$X11_LIBS $LIBS"
      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  
-@@ -1333,7 +1333,7 @@
+@@ -1387,7 +1387,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,14 +18,14 @@
  fi
  if test "$no_x" != 'yes'; then
    have_x='yes'
-@@ -3219,9 +3219,9 @@
+@@ -3430,9 +3430,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 $FREETYPE_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"
+-    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 $LZMA_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 $FREETYPE_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="$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 $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_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)

================================================================
Index: packages/ImageMagick/ImageMagick-lt.patch
diff -u packages/ImageMagick/ImageMagick-lt.patch:1.1 packages/ImageMagick/ImageMagick-lt.patch:1.2
--- packages/ImageMagick/ImageMagick-lt.patch:1.1	Sat Oct 23 22:21:42 2010
+++ packages/ImageMagick/ImageMagick-lt.patch	Mon Dec 27 13:43:12 2010
@@ -1,12 +1,12 @@
---- ImageMagick-6.6.5-2/configure.ac.orig	2010-10-23 16:19:33.019743558 +0200
-+++ ImageMagick-6.6.5-2/configure.ac	2010-10-23 16:51:41.847742720 +0200
-@@ -385,10 +385,6 @@
-             AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.])
-             CC="$PTHREAD_CC"
-         fi
--        if test "$CXX" != "$PTHREAD_CXX"; then
--          AC_MSG_WARN([Replacing compiler $CXX with compiler $PTHREAD_CXX to support pthreads.])
--          CXX="$PTHREAD_CXX"
+--- ImageMagick-6.6.6-7/configure.ac~	2010-12-27 13:27:17.432375100 +0100
++++ ImageMagick-6.6.6-7/configure.ac	2010-12-27 13:30:28.809041767 +0100
+@@ -381,10 +381,6 @@
+         DEF_THREAD="$PTHREAD_CFLAGS"
+         CFLAGS="$CFLAGS $DEF_THREAD"
+         CXXFLAGS="$CXXFLAGS $DEF_THREAD"
+-        if test "$CC" != "$PTHREAD_CC"; then
+-            AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.])
+-            CC="$PTHREAD_CC"
 -        fi
          AC_DEFINE(THREAD_SUPPORT,1,[Define if you have POSIX threads libraries and header files.])
      fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ImageMagick/ImageMagick-link.patch?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ImageMagick/ImageMagick-lt.patch?r1=1.1&r2=1.2&f=u