Add patch
This commit is contained in:
parent
25f272aaa8
commit
ef74ce076d
|
@ -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 <sys/types.h>
|
||||||
|
# include <sys/stat.h>
|
|
@ -24,6 +24,7 @@ Patch4: ImageMagick-6.0.6-hp2xx.patch
|
||||||
Patch5: ImageMagick-5.4.7-localdoc.patch
|
Patch5: ImageMagick-5.4.7-localdoc.patch
|
||||||
Patch6: ImageMagick-5.5.7-stdin.patch
|
Patch6: ImageMagick-5.5.7-stdin.patch
|
||||||
Patch7: ImageMagick-5.5.7-automake.patch
|
Patch7: ImageMagick-5.5.7-automake.patch
|
||||||
|
Patch8: ImageMagick-6.0.7-vsnprintf.patch
|
||||||
Url: http://www.imagemagick.org/
|
Url: http://www.imagemagick.org/
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
||||||
BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
|
BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
|
||||||
|
@ -113,6 +114,7 @@ however.
|
||||||
%patch5 -p1 -b .ImageMagick
|
%patch5 -p1 -b .ImageMagick
|
||||||
# KH: %patch6 -p1 -b .stdin
|
# KH: %patch6 -p1 -b .stdin
|
||||||
#%patch7 -p1 -b .amake
|
#%patch7 -p1 -b .amake
|
||||||
|
%patch8 -p1 -b .vsnprintf
|
||||||
|
|
||||||
%build
|
%build
|
||||||
libtoolize --copy --force
|
libtoolize --copy --force
|
||||||
|
@ -262,6 +264,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VER}
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Mar 2 2005 Matthias Clasen <mclasen@redhat.com> 6.0.7.1-7
|
* Wed Mar 2 2005 Matthias Clasen <mclasen@redhat.com> 6.0.7.1-7
|
||||||
- rebuild with gcc4
|
- rebuild with gcc4
|
||||||
|
- remove an extraneous vsnprintf prototype which causes
|
||||||
|
gcc4 to complain
|
||||||
|
|
||||||
* Mon Oct 11 2004 Tim Waugh <twaugh@redhat.com> 6.0.7.1-4
|
* Mon Oct 11 2004 Tim Waugh <twaugh@redhat.com> 6.0.7.1-4
|
||||||
- The devel subpackage requires XFree86-devel (bug #126509).
|
- The devel subpackage requires XFree86-devel (bug #126509).
|
||||||
|
|
Loading…
Reference in New Issue