Add upstream patches taken from https://bugs.kde.org/show_bug.cgi?id=149906
to fix build problems.


(dholland)

$NetBSD: patch-kexi_plugins_forms_widgets_kexidblabel_cpp,v 1.1 2012/06/30 08:29:59 dholland Exp $

Upstream patch from: https://bugs.kde.org/show_bug.cgi?id=149906

--- kexi/plugins/forms/widgets/kexidblabel.cpp.orig
+++ kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -648,3 +648,5 @@
 #define SuperClassName QLabel
 #include "kexiframeutils_p.cpp"
 #include "kexidblabel.moc"
+#undef ClassName
+#undef SuperClassName

$NetBSD: patch-kexi_plugins_forms_widgets_kexiframe_cpp,v 1.1 2012/06/30 08:29:59 dholland Exp $

Upstream patch from: https://bugs.kde.org/show_bug.cgi?id=149906

--- kexi/plugins/forms/widgets/kexiframe.cpp.orig
+++ kexi/plugins/forms/widgets/kexiframe.cpp
@@ -75,3 +75,5 @@
 #define SuperClassName QFrame
 #include "kexiframeutils_p.cpp"
 #include "kexiframe.moc"
+#undef ClassName
+#undef SuperClassName

$NetBSD: patch-kexi_plugins_importexport_csv_kexicsvexport_cpp,v 1.1 2012/06/30 08:29:59 dholland Exp $

Upstream patch from: https://bugs.kde.org/show_bug.cgi?id=149906

--- kexi/plugins/importexport/csv/kexicsvexport.cpp.orig
+++ kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -269,3 +269,5 @@
 	}
 	return true;
 }
+
+#undef _ERR

$NetBSD: patch-kexi_plugins_importexport_csv_kexicsvimportdialog_cpp,v 1.1 2012/06/30 08:29:59 dholland Exp $

Upstream patch from: https://bugs.kde.org/show_bug.cgi?id=149906

--- kexi/plugins/importexport/csv/kexicsvimportdialog.cpp.orig
+++ kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -1660,3 +1660,5 @@
 }
 
 #include "kexicsvimportdialog.moc"
+
+#undef _ERR

$NetBSD: patch-kspread_plugins_scripting_kspreadcore_krs__cell_cpp,v 1.1 2012/06/30 08:29:59 dholland Exp $

Upstream patch from: https://bugs.kde.org/show_bug.cgi?id=149906

--- kspread/plugins/scripting/kspreadcore/krs_cell.cpp.orig	2008-08-22 19:45:44.000000000 -0400
+++ kspread/plugins/scripting/kspreadcore/krs_cell.cpp	2008-08-22 19:45:44.000000000 -0400
@@ -174,7 +174,7 @@
 	return m_cell->text();
 }
 
-bool Cell::setText(const QString& text, bool asString) {
+bool Cell::setText(const QString& text) {
 
 	//FIXME: there is some problem with asString parameter, when it's set
 	//to true KSpread says: ASSERT: "f" in Dependencies.cpp (621)
@@ -189,7 +189,7 @@
 	KSpread::DataManipulator *dm = new KSpread::DataManipulator ();
 	dm->setSheet (m_sheet);
 	dm->setValue (text);
-	dm->setParsing (!asString);
+	dm->setParsing (true);
 	dm->add (QPoint (m_col, m_row));
 	dm->execute ();
 

$NetBSD: patch-kspread_plugins_scripting_kspreadcore_krs__cell_h,v 1.1 2012/06/30 08:29:59 dholland Exp $

Upstream patch from: https://bugs.kde.org/show_bug.cgi?id=149906

--- kspread/plugins/scripting/kspreadcore/krs_cell.h.orig	2008-08-22 19:45:44.000000000 -0400
+++ kspread/plugins/scripting/kspreadcore/krs_cell.h	2008-08-22 19:45:44.000000000 -0400
@@ -135,7 +135,7 @@
 		* will be handled as string else we try to parse the
 		* string to the expected value.
 		*/
-		bool setText(const QString& text, bool asString = false);
+		bool setText(const QString& text);
 
 		/**
 		* Return the textcolor as RGB-value in the format "#RRGGBB".

$NetBSD: patch-lib_kwmf_kwmf_cc,v 1.1 2012/06/30 08:29:59 dholland Exp $

Upstream patch from: https://bugs.kde.org/show_bug.cgi?id=149906

--- lib/kwmf/kwmf.cc.orig
+++ lib/kwmf/kwmf.cc
@@ -29,6 +29,7 @@
 #include <qfile.h>
 #include <qpointarray.h>
 #include <kwmf.h>
+#include <wmfstruct.h>
 #include <qrect.h>
 
 #define PI (3.14159265358979323846)
@@ -430,7 +431,7 @@
         S32 reserved;
         S16 checksum;
     };
-    #define APMHEADER_KEY 0x9AC6CDD7L
+    // #define APMHEADER_KEY 0x9AC6CDD7L
 
     WmfPlaceableHeader pheader;
     WmfEnhMetaHeader eheader;