rpms/koffice/devel koffice-1.6.3-quint32.patch, NONE, 1.1 koffice.spec, 1.99, 1.100

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29149

Modified Files:
	koffice.spec 
Added Files:
	koffice-1.6.3-quint32.patch 
Log Message:
revert an upstream DWORD->quint32 commit (kdebug#168548)


koffice-1.6.3-quint32.patch:

--- NEW FILE koffice-1.6.3-quint32.patch ---
diff -up koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc.quint32 koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc
--- koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc.quint32	2009-03-06 15:55:16.000000000 -0600
+++ koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc	2009-03-07 13:42:40.000000000 -0600
@@ -242,7 +242,7 @@ KisImageBuilder_Result KisTIFFConverter:
     // Read image profile
     kdDebug() << "Reading profile" << endl;
     KisProfile* profile = 0;
-    quint32 EmbedLen;
+    DWORD EmbedLen;
     LPBYTE EmbedBuffer;
 
     if (TIFFGetField(image, TIFFTAG_ICCPROFILE, &EmbedLen, &EmbedBuffer)) {


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- koffice.spec	6 Mar 2009 21:58:19 -0000	1.99
+++ koffice.spec	7 Mar 2009 19:45:28 -0000	1.100
@@ -31,6 +31,8 @@
 #  svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/koffice \
 #  > koffice-%{svn}svn.patch
 Patch100: koffice-%{svn}svn.patch
+# Revert backport from  https://bugs.kde.org/show_bug.cgi?id=168548
+Patch101: koffice-1.6.3-quint32.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
@@ -258,6 +260,7 @@
 %patch50 -p1 -b glibc_strrchr
 
 %patch100 -p1 -b .svn
+%patch101 -p1 -b .quint32
 
 make -f admin/Makefile.common
 
@@ -275,7 +278,7 @@
   --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
   --disable-final
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -k
 
 
 %install