rpms/koffice/F-11 koffice-1.6.3-magick_version.patch, NONE, 1.1 koffice.spec, 1.108, 1.109
Rex Dieter
rdieter at fedoraproject.org
Sun Sep 20 16:47:18 UTC 2009
- Previous message (by thread): rpms/dvdauthor/F-11 dvdauthor.spec,1.12,1.13
- Next message (by thread): rpms/python-jinja2/F-10 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 python-jinja2.spec, 1.3, 1.4 sources, 1.4, 1.5 python-jinja2-docs.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/koffice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10873
Modified Files:
koffice.spec
Added Files:
koffice-1.6.3-magick_version.patch
Log Message:
* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-25.20090306svn
- rebuild (GraphicsMagick)
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/F-11/koffice.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- koffice.spec 26 Aug 2009 17:43:42 -0000 1.108
+++ koffice.spec 20 Sep 2009 16:47:17 -0000 1.109
@@ -11,7 +11,7 @@ BuildRequires: libutempter-devel
Name: koffice
Epoch: 2
Version: 1.6.3
-Release: 24.%{svn}svn%{?dist}
+Release: 25.%{svn}svn%{?dist}
Summary: An integrated office suite
Group: Applications/Productivity
@@ -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
@@ -761,6 +764,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-25.20090306svn
+- rebuild (GraphicsMagick)
+
* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
- -kformula: Requires: lyx-cmex10-fonts
- Previous message (by thread): rpms/dvdauthor/F-11 dvdauthor.spec,1.12,1.13
- Next message (by thread): rpms/python-jinja2/F-10 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 python-jinja2.spec, 1.3, 1.4 sources, 1.4, 1.5 python-jinja2-docs.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list