SOURCES: ImageMagick-ac.patch, ImageMagick-link.patch - up

[arekm]

Author: arekm                        Date: Sat Feb 24 14:21:08 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up

---- Files affected:
SOURCES:
   ImageMagick-ac.patch (1.3 -> 1.4) , ImageMagick-link.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/ImageMagick-ac.patch
diff -u SOURCES/ImageMagick-ac.patch:1.3 SOURCES/ImageMagick-ac.patch:1.4
--- SOURCES/ImageMagick-ac.patch:1.3	Mon Aug 21 11:01:03 2006
+++ SOURCES/ImageMagick-ac.patch	Sat Feb 24 15:21:02 2007
@@ -1,6 +1,6 @@
 --- ImageMagick-5.4.5/configure.ac.old	Mon Jul  1 22:29:23 2002
 +++ ImageMagick-5.4.5/configure.ac	Mon Jul  1 22:30:03 2002
-@@ -737,16 +737,16 @@
+@@ -1370,16 +1370,16 @@
  #
  have_fpx='no'
  FPX_LIBS=''
@@ -19,19 +19,23 @@
      AC_MSG_CHECKING(if FlashPIX package is complete)
      if test $passed -gt 0
      then
-@@ -765,6 +765,7 @@
+@@ -1399,6 +1399,7 @@
          AC_MSG_RESULT(no)
      fi
  fi
 +AC_LANG_POP
  AM_CONDITIONAL(HasFPX, test "$have_fpx" = 'yes')
- AC_SUBST(LIB_FPX)
+ AC_SUBST(FPX_LIBS)
  
-@@ -1935,7 +1935,6 @@
+@@ -1949,10 +1950,6 @@
      then
        CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
      fi
--    LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
+-    if test "${xml2_prefix}" != '/usr'
+-    then
+-      LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
+-    fi
     fi
    failed=0;
    passed=0;
+

================================================================
Index: SOURCES/ImageMagick-link.patch
diff -u SOURCES/ImageMagick-link.patch:1.3 SOURCES/ImageMagick-link.patch:1.4
--- SOURCES/ImageMagick-link.patch:1.3	Mon Aug 21 11:01:03 2006
+++ SOURCES/ImageMagick-link.patch	Sat Feb 24 15:21:03 2007
@@ -18,15 +18,16 @@
  fi
  if test "$no_x" != 'yes'
  then
-@@ -2710,9 +2710,9 @@
+@@ -2726,9 +2726,9 @@
  #
  if test "$with_modules" != 'no'
  then
 -  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="$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"
+-  MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $PNG_LIBS $DJVU_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 $DJVU_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)
  
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ImageMagick-ac.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/ImageMagick-link.patch?r1=1.3&r2=1.4&f=u