[koffice] Qt 4.8 FTBFS (rhbz#736659)

[Jaroslav Reznik]

commit e0a452c94ed167ccca8cde99f2ff9c300f805564
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Thu Sep 8 16:06:13 2011 +0200

    Qt 4.8 FTBFS (rhbz#736659)

 koffice-2.3.3-no-qdebug-pixmap.patch |   11 +++++++++++
 koffice.spec                         |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/koffice-2.3.3-no-qdebug-pixmap.patch b/koffice-2.3.3-no-qdebug-pixmap.patch
new file mode 100644
index 0000000..7fa2ff7
--- /dev/null
+++ b/koffice-2.3.3-no-qdebug-pixmap.patch
@@ -0,0 +1,11 @@
+diff -up koffice-2.3.3/plugins/chartshape/kdchart/kdchart/KDChartBackgroundAttributes.cpp.no-qdebug-pixmap koffice-2.3.3/plugins/chartshape/kdchart/kdchart/KDChartBackgroundAttributes.cpp
+--- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp.no-qdebug-pixmap	2011-02-17 13:10:38.000000000 +0100
++++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-09-08 15:03:31.932039128 +0200
+@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh
+ 	<< "visible="<<ba.isVisible()
+ 	<< "brush="<<ba.brush()
+ 	<< "pixmapmode="<<ba.pixmapMode()
+-	<< "pixmap="<<ba.pixmap()
+ 	<< ")";
+     return dbg;
+ }
diff --git a/koffice.spec b/koffice.spec
index a033f15..3c730ff 100644
--- a/koffice.spec
+++ b/koffice.spec
@@ -16,7 +16,7 @@
 Name:           koffice
 Epoch:          3 
 Version:        2.3.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -28,6 +28,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
 Patch50: koffice-2.3.2-gcc46.patch
+# qt 4.8 FTBFS
+# https://bugzilla.redhat.com/show_bug.cgi?id=736659 - see upstream references (qt, kde)
+Patch51: koffice-2.3.3-no-qdebug-pixmap.patch
 ## upstream patches
 # backport support for libwpg 0.2 from Calligra master:
 # http://gitweb.kde.org/calligra.git/commit/9cda7aed2ea103750172e61f5c800a474913fa59
@@ -499,6 +502,7 @@ Requires:       libxml2-devel
 %prep
 %setup -q
 %patch50 -p1 -b .gcc46
+%patch51 -p1 -b .no-qdebug-pixmap
 %patch100 -p1 -b .libwpg02
 %patch101 -p0 -b .kexi_fix_inserting_required_value
 
@@ -1208,6 +1212,9 @@ fi
 
 
 %changelog
+* Thu Sep 08 2011 Jaroslav Reznik <jreznik at redhat.com> - 3:2.3.3-10
+- Qt 4.8 FTBFS (rhbz#736659)
+
 * Fri Jul 15 2011 Marek Kasik <mkasik at redhat.com> - 3:2.3.3-9
 - Rebuild (poppler-0.17.0)