SOURCES: ImageMagick-ac.patch, ImageMagick-ldflags.patch, ImageMagick-libpa...

hawk hawk at pld-linux.org
Tue May 27 10:23:49 CEST 2008 

Author: hawk                         Date: Tue May 27 08:23:49 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 6.4.1

---- Files affected:
SOURCES:
   ImageMagick-ac.patch (1.5 -> 1.6) , ImageMagick-ldflags.patch (1.1 -> 1.2) , ImageMagick-libpath.patch (1.14 -> 1.15) , ImageMagick-link.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/ImageMagick-ac.patch
diff -u SOURCES/ImageMagick-ac.patch:1.5 SOURCES/ImageMagick-ac.patch:1.6
--- SOURCES/ImageMagick-ac.patch:1.5	Mon Sep 17 17:01:48 2007
+++ SOURCES/ImageMagick-ac.patch	Tue May 27 10:23:43 2008
@@ -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
-@@ -1370,16 +1370,16 @@
+--- 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=''
@@ -10,8 +10,8 @@
      AC_MSG_RESULT([-------------------------------------------------------------])
      AC_MSG_RESULT([Checking for FlashPIX support])
      AC_MSG_RESULT([-------------------------------------------------------------])
-     failed=0;
-     passed=0;
+     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`,)
@@ -19,15 +19,15 @@
      AC_MSG_CHECKING([if FlashPIX package is complete])
      if test $passed -gt 0; then
          if test $failed -gt 0; then
-@@ -1399,6 +1399,7 @@
-         AC_MSG_RESULT(no)
+@@ -1611,6 +1611,7 @@
+         AC_MSG_RESULT([no])
      fi
  fi
 +AC_LANG_POP
- AM_CONDITIONAL(HasFPX, test "$have_fpx" = 'yes')
+ AM_CONDITIONAL(FPX_DELEGATE, test "$have_fpx" = 'yes')
  AC_SUBST(FPX_LIBS)
  
-@@ -1949,9 +1950,6 @@
+@@ -2191,9 +2192,6 @@
          if test -d "${xml2_prefix}/include/libxml2"; then
              CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
          fi
@@ -35,5 +35,5 @@
 -            LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
 -        fi
      fi
-     failed=0;
-     passed=0;
+     failed=0
+     passed=0

================================================================
Index: SOURCES/ImageMagick-ldflags.patch
diff -u SOURCES/ImageMagick-ldflags.patch:1.1 SOURCES/ImageMagick-ldflags.patch:1.2
--- SOURCES/ImageMagick-ldflags.patch:1.1	Sun Feb 25 20:55:42 2007
+++ SOURCES/ImageMagick-ldflags.patch	Tue May 27 10:23:43 2008
@@ -1,11 +1,11 @@
---- ImageMagick-6.3.2/configure.ac~	2007-02-25 20:25:43.000000000 +0100
-+++ ImageMagick-6.3.2/configure.ac	2007-02-25 20:28:04.000000000 +0100
-@@ -2763,7 +2763,17 @@
- MAGICK_CXXFLAGS=$CXXFLAGS
+--- ImageMagick-6.4.1/configure.ac.orig	2008-05-27 09:44:58.000000000 +0200
++++ ImageMagick-6.4.1/configure.ac	2008-05-27 09:46:59.000000000 +0200
+@@ -3086,7 +3086,17 @@
+ MAGICK_CXXFLAGS="$CXXFLAGS"
  MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/  */ /g'`
  MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/  */ /g'`
 -MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-+MAGICK_LDFLAGS=-L$LIB_DIR
++MAGICK_LDFLAGS="-L$LIB_DIR"
 +for flag in $LDFLAGS
 +do
 +  case "$flag" in
@@ -16,6 +16,6 @@
 +      ;;
 +  esac
 +done
- MAGICK_LIBS="-lMagick $MAGICK_DEP_LIBS"
+ MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
  
  AC_SUBST(MAGICK_CFLAGS)

================================================================
Index: SOURCES/ImageMagick-libpath.patch
diff -u SOURCES/ImageMagick-libpath.patch:1.14 SOURCES/ImageMagick-libpath.patch:1.15
--- SOURCES/ImageMagick-libpath.patch:1.14	Mon Sep 17 17:01:48 2007
+++ SOURCES/ImageMagick-libpath.patch	Tue May 27 10:23:43 2008
@@ -1,9 +1,9 @@
---- ImageMagick-5.5.7/configure.ac.orig	2003-05-31 16:41:34.000000000 +0200
-+++ ImageMagick-5.5.7/configure.ac	2003-07-18 08:27:51.000000000 +0200
-@@ -2194,7 +2194,7 @@
+--- ImageMagick-6.4.1/configure.ac.orig	2008-05-27 09:43:02.000000000 +0200
++++ ImageMagick-6.4.1/configure.ac	2008-05-27 09:43:54.000000000 +0200
+@@ -2952,7 +2952,7 @@
  # Determine path to pick up Magick library from for use with building PerlMagick
  MAGICKLIBDIR="${LIB_DIR}"
- MAGICKLIB="-L${MAGICKLIBDIR} -lMagick"
+ MAGICKLIB="-L${MAGICKLIBDIR} -lMagickCore"
 -if test $with_perl_static = 'yes'; then
 +if test $with_perl_static = 'yes' -o $with_perl_dynamic = 'yes'; then
      # Find out where libtool hides its uninstalled libraries (as libtool_objdir)

================================================================
Index: SOURCES/ImageMagick-link.patch
diff -u SOURCES/ImageMagick-link.patch:1.5 SOURCES/ImageMagick-link.patch:1.6
--- SOURCES/ImageMagick-link.patch:1.5	Mon Sep 17 17:01:48 2007
+++ SOURCES/ImageMagick-link.patch	Tue May 27 10:23:44 2008
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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([-------------------------------------------------------------])
      LDFLAGS="$LDFLAGS $X_LIBS"
@@ -9,24 +9,24 @@
      LIBS="$X11_LIBS $LIBS"
      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  
-@@ -1290,7 +1290,7 @@
+@@ -1470,7 +1470,7 @@
      #
-     AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HasShape,1,X11 server supports shape extension)],[],[])
+     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
    have_x='yes'
-@@ -2726,9 +2726,9 @@
- # Build library dependency list for libMagick
- #
+@@ -3047,9 +3047,9 @@
+ AC_SUBST(MAGICK_LTDLDEPS)
+ 
  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 $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $GOMP_LIBS $THREAD_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 $MATH_LIBS $CCMALLOC_LIBS $EFENCE_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 $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 $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 $GOMP_LIBS $THREAD_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 $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_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 $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"
  fi
  AC_SUBST(MAGICK_DEP_LIBS)
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ImageMagick-ac.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ImageMagick-ldflags.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ImageMagick-libpath.patch?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ImageMagick-link.patch?r1=1.5&r2=1.6&f=u

More information about the pld-cvs-commit mailing list