diff options
author | dholland <dholland@pkgsrc.org> | 2012-06-30 08:29:59 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2012-06-30 08:29:59 +0000 |
commit | 1ce68f499dd9afa558febbc22615981947e17059 (patch) | |
tree | f446da1b31d5ab05a3b42dba61500914a6736f91 /misc | |
parent | c0440f26dfde07f878044afcddeb8b5a7ae6b015 (diff) | |
download | pkgsrc-1ce68f499dd9afa558febbc22615981947e17059.tar.gz |
Add upstream patches taken from https://bugs.kde.org/show_bug.cgi?id=149906
to fix build problems.
Diffstat (limited to 'misc')
7 files changed, 110 insertions, 0 deletions
diff --git a/misc/koffice/patches/patch-kexi_plugins_forms_widgets_kexidblabel_cpp b/misc/koffice/patches/patch-kexi_plugins_forms_widgets_kexidblabel_cpp new file mode 100644 index 00000000000..7865c10dea2 --- /dev/null +++ b/misc/koffice/patches/patch-kexi_plugins_forms_widgets_kexidblabel_cpp @@ -0,0 +1,12 @@ +$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 diff --git a/misc/koffice/patches/patch-kexi_plugins_forms_widgets_kexiframe_cpp b/misc/koffice/patches/patch-kexi_plugins_forms_widgets_kexiframe_cpp new file mode 100644 index 00000000000..a2902b14c63 --- /dev/null +++ b/misc/koffice/patches/patch-kexi_plugins_forms_widgets_kexiframe_cpp @@ -0,0 +1,12 @@ +$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 diff --git a/misc/koffice/patches/patch-kexi_plugins_importexport_csv_kexicsvexport_cpp b/misc/koffice/patches/patch-kexi_plugins_importexport_csv_kexicsvexport_cpp new file mode 100644 index 00000000000..68265e8b58c --- /dev/null +++ b/misc/koffice/patches/patch-kexi_plugins_importexport_csv_kexicsvexport_cpp @@ -0,0 +1,12 @@ +$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 diff --git a/misc/koffice/patches/patch-kexi_plugins_importexport_csv_kexicsvimportdialog_cpp b/misc/koffice/patches/patch-kexi_plugins_importexport_csv_kexicsvimportdialog_cpp new file mode 100644 index 00000000000..d8feba6c119 --- /dev/null +++ b/misc/koffice/patches/patch-kexi_plugins_importexport_csv_kexicsvimportdialog_cpp @@ -0,0 +1,12 @@ +$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 diff --git a/misc/koffice/patches/patch-kspread_plugins_scripting_kspreadcore_krs__cell_cpp b/misc/koffice/patches/patch-kspread_plugins_scripting_kspreadcore_krs__cell_cpp new file mode 100644 index 00000000000..04f0494b22d --- /dev/null +++ b/misc/koffice/patches/patch-kspread_plugins_scripting_kspreadcore_krs__cell_cpp @@ -0,0 +1,24 @@ +$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 (); + diff --git a/misc/koffice/patches/patch-kspread_plugins_scripting_kspreadcore_krs__cell_h b/misc/koffice/patches/patch-kspread_plugins_scripting_kspreadcore_krs__cell_h new file mode 100644 index 00000000000..e7e837b13bd --- /dev/null +++ b/misc/koffice/patches/patch-kspread_plugins_scripting_kspreadcore_krs__cell_h @@ -0,0 +1,15 @@ +$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". diff --git a/misc/koffice/patches/patch-lib_kwmf_kwmf_cc b/misc/koffice/patches/patch-lib_kwmf_kwmf_cc new file mode 100644 index 00000000000..812d3544873 --- /dev/null +++ b/misc/koffice/patches/patch-lib_kwmf_kwmf_cc @@ -0,0 +1,23 @@ +$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; |