rpms/koffice/EL-5 koffice-1.6.3-magick_version.patch, NONE, 1.1 koffice.spec, 1.58, 1.59
Rex Dieter
rdieter at fedoraproject.org
Wed Aug 26 20:53:20 UTC 2009
- Previous message (by thread): rpms/Django/EL-4 .cvsignore, 1.9, 1.10 Django.spec, 1.13, 1.14 sources, 1.9, 1.10
- Next message (by thread): rpms/xemacs/F-11 xemacs-21.5.29-no-xft.patch, 1.1, 1.2 xemacs.spec, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/koffice/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5430
Modified Files:
koffice.spec
Added Files:
koffice-1.6.3-magick_version.patch
Log Message:
fix build for rhel5's older imagemagick
koffice-1.6.3-magick_version.patch:
kis_image_magick_converter.cc | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE koffice-1.6.3-magick_version.patch ---
diff -up koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc.magick_version koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc
--- koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc.magick_version 2009-08-26 15:42:15.323637145 -0500
+++ koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc 2009-08-26 15:47:18.470639483 -0500
@@ -457,7 +457,11 @@ KisImageBuilder_Result KisImageMagickCon
for (Q_UINT32 y = 0; y < image->rows; y ++)
{
+#if MagickLibVersion > 0x630
const PixelPacket *pp = AcquireCacheViewPixels(vi, 0, y, image->columns, 1, &ei);
+#else
+ const PixelPacket *pp = AcquireCacheView(vi, 0, y, image->columns, 1, &ei);
+#endif
if(!pp)
{
Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/EL-5/koffice.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- koffice.spec 26 Aug 2009 18:55:27 -0000 1.58
+++ koffice.spec 26 Aug 2009 20:53:20 -0000 1.59
@@ -32,6 +32,8 @@ Patch50: koffice-1.6.3-glibc_strrchr.pat
Patch100: koffice-%{svn}svn.patch
# Revert backport from https://bugs.kde.org/show_bug.cgi?id=168548
Patch101: koffice-1.6.3-quint32.patch
+# fix for older ImageMagick
+Patch102: koffice-1.6.3-magick_version.patch
# http://www.kde.org/info/security/advisory-20070730-1.txt
Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
@@ -266,6 +268,7 @@ Requires: %{name}-core = %{epoch}
%if 0%{?svn:1}
%patch100 -p1 -b .svn
%patch101 -p1 -b .quint32
+%patch102 -p1 -b .magick_version
%else
%patch1 -p0 -b .CVE-2007-3387
%patch2 -p0 -b .CVE-2007-4352-5392-5393
- Previous message (by thread): rpms/Django/EL-4 .cvsignore, 1.9, 1.10 Django.spec, 1.13, 1.14 sources, 1.9, 1.10
- Next message (by thread): rpms/xemacs/F-11 xemacs-21.5.29-no-xft.patch, 1.1, 1.2 xemacs.spec, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list