rpms/kdegraphics/F-10 kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch, NONE, 1.1 kdegraphics.spec, 1.189, 1.190

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdegraphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17004/F-10

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch 
Log Message:
Sync from devel:

* Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
- work around Kolourpaint crash with Qt 4.5 (kde#183850)

kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch:

--- NEW FILE kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch ---
diff -ur kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp
--- kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp	2008-12-21 21:19:06.000000000 +0100
+++ kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp	2009-04-03 15:23:49.000000000 +0200
@@ -252,7 +252,7 @@
         // Copy RGB layer.
         *destPixmapPtr = QPixmap (oldPixmap.width (), oldPixmap.height ());
         QPainter p (destPixmapPtr);
-        p.drawPixmap (QPoint (0, 0), oldPixmap);
+        p.drawImage (QPoint (0, 0), oldPixmap.toImage());
         p.end ();
 
         // Copy mask layer (if any).


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- kdegraphics.spec	1 Apr 2009 23:20:07 -0000	1.189
+++ kdegraphics.spec	3 Apr 2009 17:19:14 -0000	1.190
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -17,6 +17,9 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
+# work around Kolourpaint crash with Qt 4.5 (kde#183850)
+# patch from the upstream bug report
+Patch0:         kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
@@ -90,6 +93,7 @@
 
 %prep
 %setup -q -n kdegraphics-%{version}
+%patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
 # upstream patches
 
@@ -219,6 +223,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-3
+- work around Kolourpaint crash with Qt 4.5 (kde#183850)
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets