Hello community, here is the log from the commit of package dx for openSUSE:Factory checked in at Tue Mar 23 22:17:30 CET 2010. -------- --- dx/dx.changes 2010-02-09 14:58:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/dx/dx.changes 2010-03-22 18:09:44.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 22 17:35:29 CET 2010 - pgajdos@suse.cz + +- fixed build with new ImageMagick + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dx.spec ++++++ --- /var/tmp/diff_new_pack.JX63hb/_old 2010-03-23 22:00:34.000000000 +0100 +++ /var/tmp/diff_new_pack.JX63hb/_new 2010-03-23 22:00:34.000000000 +0100 @@ -25,7 +25,7 @@ %endif BuildRequires: fdupes Version: 4.4.4 -Release: 228 +Release: 229 Summary: IBM Open Visualization Data Explorer License: IBM Public License .. Group: Productivity/Graphics/Visualization/Other ++++++ dx-4.4.4-imagemagick.patch ++++++ --- /var/tmp/diff_new_pack.JX63hb/_old 2010-03-23 22:00:34.000000000 +0100 +++ /var/tmp/diff_new_pack.JX63hb/_new 2010-03-23 22:00:34.000000000 +0100 @@ -1,6 +1,8 @@ ---- configure.ac.orig 2009-07-13 17:39:51.000000000 +0200 -+++ configure.ac 2009-07-13 17:41:42.000000000 +0200 -@@ -801,8 +801,8 @@ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -801,8 +801,8 @@ then failed=0; passed=0; @@ -10,7 +12,7 @@ AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) AC_MSG_CHECKING(if ImageMagick package is complete) if test $passed -gt 0 -@@ -835,8 +835,13 @@ +@@ -835,8 +835,13 @@ dnl routine. This allows us to simplify dnl format configuration libraries. if test "$HAVE_MC" = "yes" ; then @@ -25,3 +27,43 @@ AC_MSG_CHECKING(if ImageMagick package is complete) if test $passed -gt 0 then +Index: src/exec/dxmods/_im_image.c +=================================================================== +--- src/exec/dxmods/_im_image.c.orig ++++ src/exec/dxmods/_im_image.c +@@ -329,7 +329,7 @@ static Error write_im(RWImageArgs *iargs + DestroyImageInfo(new_frame_info); + DestroyImageInfo(image_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + DXSetError(ERROR_INTERNAL, "reason = %s, description = %s", + image->exception.reason, +@@ -346,7 +346,7 @@ static Error write_im(RWImageArgs *iargs + DestroyImageInfo(new_frame_info); + DestroyImageInfo(image_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c"); + } +@@ -375,7 +375,7 @@ static Error write_im(RWImageArgs *iargs + DestroyImageInfo(image_info); + DestroyImageInfo(new_frame_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + + DEBUGMESSAGE("back from DestroyImage"); +@@ -491,7 +491,7 @@ static Error write_im(RWImageArgs *iargs + DestroyImage(image); + DestroyImageInfo(image_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + } + return (OK); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de