packages: kde4-koffice/kde4-koffice.spec, kde4-koffice/kde4-koffice-libpng....

[arekm]

Author: arekm                        Date: Sat Jan 30 08:28:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; libpng fix

---- Files affected:
packages/kde4-koffice:
   kde4-koffice.spec (1.54 -> 1.55) , kde4-koffice-libpng.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-koffice/kde4-koffice.spec
diff -u packages/kde4-koffice/kde4-koffice.spec:1.54 packages/kde4-koffice/kde4-koffice.spec:1.55
--- packages/kde4-koffice/kde4-koffice.spec:1.54	Fri Jan 15 02:38:28 2010
+++ packages/kde4-koffice/kde4-koffice.spec	Sat Jan 30 09:28:48 2010
@@ -20,11 +20,12 @@
 Summary(zh_CN.UTF-8):	KDE 的办公应用软件集。
 Name:		kde4-koffice
 Version:	2.1.1
-Release:	2
+Release:	3
 License:	GPL/LGPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{origname}-%{version}/%{origname}-%{version}.tar.bz2
 # Source0-md5:	9955f30f43ed3f6970870f55015a1a18
+Patch0:		%{name}-libpng.patch
 URL:		http://www.koffice.org/
 BuildRequires:	GraphicsMagick-devel
 BuildRequires:	OpenEXR-devel
@@ -312,6 +313,7 @@
 
 %prep
 %setup -q -n %{origname}-%{version}
+%patch0 -p0
 
 %build
 install -d build
@@ -778,6 +780,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2010/01/30 08:28:48  arekm
+- rel 3; libpng fix
+
 Revision 1.54  2010/01/15 01:38:28  sparky
 - BR: Qt3Support-devel, QtScript-devel, QtSvg-devel, boost-devel, qt4-build,
   rpm-pythonprov

================================================================
Index: packages/kde4-koffice/kde4-koffice-libpng.patch
diff -u /dev/null packages/kde4-koffice/kde4-koffice-libpng.patch:1.1
--- /dev/null	Sat Jan 30 09:28:54 2010
+++ packages/kde4-koffice/kde4-koffice-libpng.patch	Sat Jan 30 09:28:48 2010
@@ -0,0 +1,11 @@
+--- krita/ui/kis_png_converter.cpp.old	2010-01-20 17:48:11.890898029 +0100
++++ krita/ui/kis_png_converter.cpp	2010-01-20 17:50:13.477553307 +0100
+@@ -404,7 +404,7 @@
+ 
+     png_byte signature[8];
+     iod->peek((char*)signature, 8);
+-    if (!png_check_sig(signature, 8)) {
++    if (!png_sig_cmp(signature, 0, 8) == 0) {
+         iod->close();
+         return (KisImageBuilder_RESULT_BAD_FETCH);
+     }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-koffice/kde4-koffice.spec?r1=1.54&r2=1.55&f=u