Fix remaining build problems.

3 files changed, 40 insertions, 1 deletions

diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 5e79e47a1a0..5506ba8f6fd 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2011/12/05 22:52:24 joerg Exp $
+$NetBSD: distinfo,v 1.51 2012/06/30 08:30:35 dholland Exp $
 
 SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae
 RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4
@@ -21,6 +21,11 @@ SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53
 SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c
 SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7
 SHA1 (patch-filters_krita_png_kis__png__converter.h) = f19ed6af46344b3516580ca91974d0d8382e5201
+SHA1 (patch-kexi_plugins_forms_widgets_kexidblabel_cpp) = 39bf8dcc00a024461cc54b4991f1dfb8a7bdc41b
+SHA1 (patch-kexi_plugins_forms_widgets_kexiframe_cpp) = 8a19ef7efc3a15d0e54ae84c0df822a8c12caba6
+SHA1 (patch-kexi_plugins_importexport_csv_kexicsvexport_cpp) = d8e82dd72e29fcd50f0670d70cbf48550fa5d2be
+SHA1 (patch-kexi_plugins_importexport_csv_kexicsvimportdialog_cpp) = b25cd22aecb32ae9f9a95725c68a335083da0fa4
+SHA1 (patch-kplato_kduration_cc) = 71e1f3a01a365665429831434afff364b465ea44
 SHA1 (patch-krita_core_kis__perspective__math.cpp) = 10aaf4139f8e0ff28eeabbb0ec37476ef3e0af3d
 SHA1 (patch-krita_plugins_filters_colorsfilters_kis__brightness__contrast__filter.cc) = 9aad3be4f47d3f51e1c6ba57880111672f62e39a
 SHA1 (patch-krita_plugins_filters_colorsfilters_kis__perchannel__filter.cc) = c1cf879ef38b86d0c10d12e7997934bfd17a5d43
@@ -28,3 +33,7 @@ SHA1 (patch-krita_plugins_filters_levelfilter_kgradientslider.cc) = d821bc51bbed
 SHA1 (patch-krita_plugins_filters_levelfilter_kis__level__filter.cc) = ab06f83a1d754d33f2da0618499403909ea3b25f
 SHA1 (patch-krita_ui_kcurve.cc) = 35fb18ba3a6861dbb279383e96fa83339cf435aa
 SHA1 (patch-kspread_digest.cc) = 378d86e2f406cb520aa1215100585488e64a68b1
+SHA1 (patch-kspread_plugins_scripting_kspreadcore_krs__cell_cpp) = 1d6a06cd0ab3e3d83fa5f79c755e35ed4a57d93b
+SHA1 (patch-kspread_plugins_scripting_kspreadcore_krs__cell_h) = 9ce39191d28092ce26d12b2a8f7a2b5c66ea82a8
+SHA1 (patch-kword_KWView_cpp) = 72a2a375ca974b39484c705b19187a1fc4581232
+SHA1 (patch-lib_kwmf_kwmf_cc) = f260a63e1408f144c7ac71b5a7c5aea1ab452a60
diff --git a/misc/koffice/patches/patch-kplato_kduration_cc b/misc/koffice/patches/patch-kplato_kduration_cc
new file mode 100644
index 00000000000..d4df247e2ba
--- /dev/null
+++ b/misc/koffice/patches/patch-kplato_kduration_cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-kplato_kduration_cc,v 1.1 2012/06/30 08:30:35 dholland Exp $
+
+Use valid C++.
+
+--- kplato/kptduration.cc~	2007-05-30 21:43:39.000000000 +0000
++++ kplato/kptduration.cc
+@@ -187,7 +187,7 @@ QString Duration::toString(Format format
+     return result;
+ }
+ 
+-Duration::Duration Duration::fromString(const QString &s, Format format, bool *ok) {
++Duration Duration::fromString(const QString &s, Format format, bool *ok) {
+     if (ok) *ok = false;
+     QRegExp matcher;
+     Duration tmp;
diff --git a/misc/koffice/patches/patch-kword_KWView_cpp b/misc/koffice/patches/patch-kword_KWView_cpp
new file mode 100644
index 00000000000..03ff570c1ef
--- /dev/null
+++ b/misc/koffice/patches/patch-kword_KWView_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-kword_KWView_cpp,v 1.1 2012/06/30 08:30:35 dholland Exp $
+
+Fix C++ dialect.
+
+--- kword/KWView.cpp~	2007-05-30 21:34:52.000000000 +0000
++++ kword/KWView.cpp
+@@ -595,7 +595,7 @@ void KWView::setupActions()
+                         actionCollection(), "edit_sldatabase" );
+ 
+ 
+-    (void) new KWMailMergeLabelAction::KWMailMergeLabelAction( i18n("Drag Mail Merge Variable"), 0,
++    (void) new KWMailMergeLabelAction( i18n("Drag Mail Merge Variable"), 0,
+                     this, SLOT(editMailMergeDataBase()), actionCollection(), "mailmerge_draglabel" );
+ 
+ //    (void) new KWMailMergeComboAction::KWMailMergeComboAction(i18n("Insert Mailmerge Var"),0,this,SLOT(JWJWJW()),actionCollection(),"mailmerge_varchooser");