diff --git a/ImageMagick-6.0.7-vsnprintf.patch b/ImageMagick-6.0.7-vsnprintf.patch new file mode 100644 index 0000000..628da20 --- /dev/null +++ b/ImageMagick-6.0.7-vsnprintf.patch @@ -0,0 +1,14 @@ +--- ImageMagick-6.0.7/magick/studio.h.vsnprintf 2005-03-03 23:05:58.000000000 -0500 ++++ ImageMagick-6.0.7/magick/studio.h 2005-03-03 23:06:36.000000000 -0500 +@@ -161,11 +161,6 @@ + strlcpy(char *,const char *,size_t); + #endif + +-#if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_PROTOTYPE) +-extern int +- vsnprintf(char *,size_t,const char *,va_list); +-#endif +- + #if defined(__WINDOWS__) || defined(POSIX) + # include + # include diff --git a/ImageMagick.spec b/ImageMagick.spec index caec3db..505546c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -24,6 +24,7 @@ Patch4: ImageMagick-6.0.6-hp2xx.patch Patch5: ImageMagick-5.4.7-localdoc.patch Patch6: ImageMagick-5.5.7-stdin.patch Patch7: ImageMagick-5.5.7-automake.patch +Patch8: ImageMagick-6.0.7-vsnprintf.patch Url: http://www.imagemagick.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel @@ -113,6 +114,7 @@ however. %patch5 -p1 -b .ImageMagick # KH: %patch6 -p1 -b .stdin #%patch7 -p1 -b .amake +%patch8 -p1 -b .vsnprintf %build libtoolize --copy --force @@ -262,6 +264,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VER} %changelog * Wed Mar 2 2005 Matthias Clasen 6.0.7.1-7 - rebuild with gcc4 +- remove an extraneous vsnprintf prototype which causes + gcc4 to complain * Mon Oct 11 2004 Tim Waugh 6.0.7.1-4 - The devel subpackage requires XFree86-devel (bug #126509).