From 256cacdfbdc98cbbd9ee52c03413a64f7005d968 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Apr 03 2009 17:19:15 +0000
Subject: Sync from devel:

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

---

diff --git a/kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch b/kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch
new file mode 100644
index 0000000..0b7ad49
--- /dev/null
+++ b/kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch
@@ -0,0 +1,12 @@
+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).
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 694f5c1..a849716 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -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 @@ Group:          Applications/Multimedia
 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 @@ Provides:  libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel =
 
 %prep
 %setup -q -n kdegraphics-%{version}
+%patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
 # upstream patches
 
@@ -219,6 +223,9 @@ fi
 
 
 %changelog
+* Fri Apr 03 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.2.2-3
+- work around Kolourpaint crash with Qt 4.5 (kde#183850)
+
 * Wed Apr 01 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.2-2
 - optimize scriptlets