rpms/dx/devel dx-magick.patch,NONE,1.1 dx.spec,1.19,1.20

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/dx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22606

Modified Files:
	dx.spec 
Added Files:
	dx-magick.patch 
Log Message:
* Fri Feb 26 2010 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-14
- fix FTBFS due to calls to non-public function from ImageMagick


dx-magick.patch:
 _im_image.c |   12 ------------
 1 file changed, 12 deletions(-)

--- NEW FILE dx-magick.patch ---
diff -up dx-4.4.4/src/exec/dxmods/_im_image.c.link dx-4.4.4/src/exec/dxmods/_im_image.c
--- dx-4.4.4/src/exec/dxmods/_im_image.c.link	2006-01-05 23:55:43.000000000 +0100
+++ dx-4.4.4/src/exec/dxmods/_im_image.c	2010-02-26 21:48:27.000000000 +0100
@@ -328,9 +328,6 @@ static Error write_im(RWImageArgs *iargs
             DestroyImage(image);
             DestroyImageInfo(new_frame_info);
             DestroyImageInfo(image_info);
-#if MagickLibVersion > 0x0537
-            DestroyConstitute();
-#endif
              DXSetError(ERROR_INTERNAL, "reason = %s, description = %s",
                         image->exception.reason,
                         image->exception.description);
@@ -345,9 +342,6 @@ static Error write_im(RWImageArgs *iargs
             DestroyImage(image);
             DestroyImageInfo(new_frame_info);
             DestroyImageInfo(image_info);
-#if MagickLibVersion > 0x0537
-            DestroyConstitute();
-#endif
             DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c");
         }
 	
@@ -374,9 +368,6 @@ static Error write_im(RWImageArgs *iargs
         DestroyImage(image);
         DestroyImageInfo(image_info);
         DestroyImageInfo(new_frame_info);
-#if MagickLibVersion > 0x0537
-        DestroyConstitute();
-#endif
         
         DEBUGMESSAGE("back from DestroyImage");
         
@@ -490,9 +481,6 @@ static Error write_im(RWImageArgs *iargs
         DXFree(copycolors);
         DestroyImage(image);
         DestroyImageInfo(image_info);
-#if MagickLibVersion > 0x0537
-        DestroyConstitute();
-#endif
     }
     return (OK);
 #else /* ndef HAVE_LIBMAGICK */


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- dx.spec	8 Dec 2009 21:53:05 -0000	1.19
+++ dx.spec	26 Feb 2010 21:27:32 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Open source version of IBM's Visualization Data Explorer
 Name: dx
 Version: 4.4.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 URL: http://www.opendx.org/
 Group: Applications/Engineering
 Source0: http://opendx.informatics.jax.org/source/dx-%{version}.tar.gz
@@ -14,6 +14,8 @@ Patch3: %{name}-errno.patch
 # fix NULL pointer dereference when running dxexec over ssh
 # without X forwarding
 Patch4: %{name}-null.patch
+# remove calls to non-public ImageMagick function to fix linking
+Patch5: %{name}-magick.patch
 License: IBM
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison
@@ -64,6 +66,7 @@ Editor, or in the scripting language, yo
 %patch2 -p1 -b .gcc43
 %patch3 -p1 -b .errno
 %patch4 -p1 -b .null
+%patch5 -p1 -b .magick
 # fix debuginfo rpmlint warnings
 chmod a-x src/exec/{dxmods,dpexec,hwrender}/*.{c,h}
 
@@ -128,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 
 %changelog
+* Fri Feb 26 2010 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-14
+- fix FTBFS due to calls to non-public function from ImageMagick
+
 * Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 4.4.4-13
 - Explicitly BR hdf-static in accordance with the Packaging
   Guidelines (hdf-devel is still static-only).