diff options
6 files changed, 251 insertions, 1 deletions
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo index 5506ba8f6fd..0f0ae77adc5 100644 --- a/misc/koffice/distinfo +++ b/misc/koffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.51 2012/06/30 08:30:35 dholland Exp $ +$NetBSD: distinfo,v 1.52 2013/03/23 10:15:26 joerg 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 @@ -26,14 +26,19 @@ SHA1 (patch-kexi_plugins_forms_widgets_kexiframe_cpp) = 8a19ef7efc3a15d0e54ae84c 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__exif__value.cc) = 6374644e9dc452dd9d8b140909412a384c59dd12 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 SHA1 (patch-krita_plugins_filters_levelfilter_kgradientslider.cc) = d821bc51bbedd6f8fe3e24995f1d6ac28452cd32 SHA1 (patch-krita_plugins_filters_levelfilter_kis__level__filter.cc) = ab06f83a1d754d33f2da0618499403909ea3b25f +SHA1 (patch-krita_plugins_viewplugins_scripting_kritacore_krs__iterator.h) = f855b2218d3fc1509cb339d3d7fc3539b3208ae4 +SHA1 (patch-krita_plugins_viewplugins_scripting_kritacore_krs__painter.cpp) = 39647e55b3b7b50e084ae5fc3fe0f8df220f774f 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_kformula_creationstrategy.h) = 7f11e46b38bb169c33692967ad673b18d9f5f94b +SHA1 (patch-lib_kross_api_object.h) = e359a6bf839c9297b47e20cc8c01b44a876d01b5 SHA1 (patch-lib_kwmf_kwmf_cc) = f260a63e1408f144c7ac71b5a7c5aea1ab452a60 diff --git a/misc/koffice/patches/patch-krita_core_kis__exif__value.cc b/misc/koffice/patches/patch-krita_core_kis__exif__value.cc new file mode 100644 index 00000000000..ece128e5fb3 --- /dev/null +++ b/misc/koffice/patches/patch-krita_core_kis__exif__value.cc @@ -0,0 +1,178 @@ +$NetBSD: patch-krita_core_kis__exif__value.cc,v 1.1 2013/03/23 10:15:26 joerg Exp $ + +--- krita/core/kis_exif_value.cc.orig 2013-02-28 15:55:48.000000000 +0000 ++++ krita/core/kis_exif_value.cc +@@ -24,16 +24,16 @@ + #include <kmdcodec.h> + + namespace { +-void set16Bit (unsigned char *data, ExifValue::ByteOrder order, const Q_UINT16* value) ++void set16Bit (unsigned char *data, ExifValue::ByteOrder order, Q_UINT16 value) + { + switch (order) { + case ExifValue::BYTE_ORDER_MOTOROLA: +- data[0] = (unsigned char) (*value >> 8); +- data[1] = (unsigned char) *value; ++ data[0] = (unsigned char) (value >> 8); ++ data[1] = (unsigned char) value; + break; + case ExifValue::BYTE_ORDER_INTEL: +- data[0] = (unsigned char) *value; +- data[1] = (unsigned char) (*value >> 8); ++ data[0] = (unsigned char) value; ++ data[1] = (unsigned char) (value >> 8); + break; + } + } +@@ -61,20 +61,20 @@ void get32Bit (const unsigned char *data + } + } + +-void set32Bit(unsigned char *data, ExifValue::ByteOrder order, const Q_UINT32* value) ++void set32Bit(unsigned char *data, ExifValue::ByteOrder order, Q_UINT32 value) + { + switch (order) { + case ExifValue::BYTE_ORDER_MOTOROLA: +- data[0] = (unsigned char) (*value >> 24); +- data[1] = (unsigned char) (*value >> 16); +- data[2] = (unsigned char) (*value >> 8); +- data[3] = (unsigned char) *value; ++ data[0] = (unsigned char) (value >> 24); ++ data[1] = (unsigned char) (value >> 16); ++ data[2] = (unsigned char) (value >> 8); ++ data[3] = (unsigned char) value; + break; + case ExifValue::BYTE_ORDER_INTEL: +- data[3] = (unsigned char) (*value >> 24); +- data[2] = (unsigned char) (*value >> 16); +- data[1] = (unsigned char) (*value >> 8); +- data[0] = (unsigned char) *value; ++ data[3] = (unsigned char) (value >> 24); ++ data[2] = (unsigned char) (value >> 16); ++ data[1] = (unsigned char) (value >> 8); ++ data[0] = (unsigned char) value; + break; + } + } +@@ -90,28 +90,28 @@ void get64Bit (const unsigned char *data + } + } + +-void set64Bit(unsigned char *data, ExifValue::ByteOrder order, const Q_UINT64* value) ++void set64Bit(unsigned char *data, ExifValue::ByteOrder order, Q_UINT64 value) + { + switch (order) { + case ExifValue::BYTE_ORDER_MOTOROLA: +- data[0] = (unsigned char) (*value >> 56); +- data[1] = (unsigned char) (*value >> 48); +- data[2] = (unsigned char) (*value >> 40); +- data[3] = (unsigned char) (*value >> 32); +- data[4] = (unsigned char) (*value >> 24); +- data[5] = (unsigned char) (*value >> 16); +- data[6] = (unsigned char) (*value >> 8); +- data[7] = (unsigned char) *value; ++ data[0] = (unsigned char) (value >> 56); ++ data[1] = (unsigned char) (value >> 48); ++ data[2] = (unsigned char) (value >> 40); ++ data[3] = (unsigned char) (value >> 32); ++ data[4] = (unsigned char) (value >> 24); ++ data[5] = (unsigned char) (value >> 16); ++ data[6] = (unsigned char) (value >> 8); ++ data[7] = (unsigned char) value; + break; + case ExifValue::BYTE_ORDER_INTEL: +- data[7] = (unsigned char) (*value >> 56); +- data[6] = (unsigned char) (*value >> 48); +- data[5] = (unsigned char) (*value >> 40); +- data[4] = (unsigned char) (*value >> 32); +- data[3] = (unsigned char) (*value >> 24); +- data[2] = (unsigned char) (*value >> 16); +- data[1] = (unsigned char) (*value >> 8); +- data[0] = (unsigned char) *value; ++ data[7] = (unsigned char) (value >> 56); ++ data[6] = (unsigned char) (value >> 48); ++ data[5] = (unsigned char) (value >> 40); ++ data[4] = (unsigned char) (value >> 32); ++ data[3] = (unsigned char) (value >> 24); ++ data[2] = (unsigned char) (value >> 16); ++ data[1] = (unsigned char) (value >> 8); ++ data[0] = (unsigned char) value; + break; + } + } +@@ -532,7 +532,7 @@ void ExifValue::convertToData(unsigned c + *data = new uchar[*size]; + for(uint i = 0; i < components(); i++) + { +- set16Bit( (*data) + 2 * i, order, &asExifNumber(i).m_short); ++ set16Bit( (*data) + 2 * i, order, asExifNumber(i).m_short); + } + return; + } +@@ -542,7 +542,7 @@ void ExifValue::convertToData(unsigned c + *data = new uchar[*size]; + for(uint i = 0; i < components(); i++) + { +- set32Bit( (*data) + 4 * i, order, &asExifNumber(i).m_long); ++ set32Bit( (*data) + 4 * i, order, asExifNumber(i).m_long); + } + return; + } +@@ -552,8 +552,8 @@ void ExifValue::convertToData(unsigned c + for(uint i = 0; i < components(); i++) + { + ExifNumber n = asExifNumber(i); +- set32Bit( (*data) + 8 * i, order, &n.m_rational.numerator); +- set32Bit( (*data) + 8 * i + 4, order, &n.m_rational.denominator); ++ set32Bit( (*data) + 8 * i, order, n.m_rational.numerator); ++ set32Bit( (*data) + 8 * i + 4, order, n.m_rational.denominator); + } + return; + case EXIF_TYPE_SBYTE: +@@ -577,7 +577,7 @@ void ExifValue::convertToData(unsigned c + *data = new uchar[*size]; + for(uint i = 0; i < components(); i++) + { +- set16Bit( (*data) + 2 * i, order, (Q_UINT16*)&asExifNumber(i).m_sshort); ++ set16Bit( (*data) + 2 * i, order, asExifNumber(i).m_sshort); + } + return; + case EXIF_TYPE_SLONG: +@@ -585,7 +585,7 @@ void ExifValue::convertToData(unsigned c + *data = new uchar[*size]; + for(uint i = 0; i < components(); i++) + { +- set32Bit( (*data) + 4 * i, order, (Q_UINT32*)&asExifNumber(i).m_slong); ++ set32Bit( (*data) + 4 * i, order, asExifNumber(i).m_slong); + } + return; + case EXIF_TYPE_SRATIONAL: +@@ -594,8 +594,8 @@ void ExifValue::convertToData(unsigned c + for(uint i = 0; i < components(); i++) + { + ExifNumber n = asExifNumber(i); +- set32Bit( (*data) + 4 * i, order, (Q_UINT32*)&asExifNumber(i).m_srational.numerator); +- set32Bit( (*data) + 4 * i + 4, order, (Q_UINT32*)&asExifNumber(i).m_srational.denominator); ++ set32Bit( (*data) + 4 * i, order, asExifNumber(i).m_srational.numerator); ++ set32Bit( (*data) + 4 * i + 4, order, asExifNumber(i).m_srational.denominator); + } + return; + case EXIF_TYPE_FLOAT: +@@ -603,7 +603,7 @@ void ExifValue::convertToData(unsigned c + *data = new uchar[*size]; + for(uint i = 0; i < components(); i++) + { +- set32Bit( (*data) + 4 * i, order, (Q_UINT32*)&asExifNumber(i).m_float); ++ set32Bit( (*data) + 4 * i, order, asExifNumber(i).m_float); + } + return; + case EXIF_TYPE_DOUBLE: +@@ -611,7 +611,7 @@ void ExifValue::convertToData(unsigned c + *data = new uchar[*size]; + for(uint i = 0; i < components(); i++) + { +- set64Bit( (*data) + 4 * i, order, (Q_UINT64*)&asExifNumber(i).m_double); ++ set64Bit( (*data) + 4 * i, order, asExifNumber(i).m_double); + } + return; + case EXIF_TYPE_UNKNOW: diff --git a/misc/koffice/patches/patch-krita_plugins_viewplugins_scripting_kritacore_krs__iterator.h b/misc/koffice/patches/patch-krita_plugins_viewplugins_scripting_kritacore_krs__iterator.h new file mode 100644 index 00000000000..67771166565 --- /dev/null +++ b/misc/koffice/patches/patch-krita_plugins_viewplugins_scripting_kritacore_krs__iterator.h @@ -0,0 +1,21 @@ +$NetBSD: patch-krita_plugins_viewplugins_scripting_kritacore_krs__iterator.h,v 1.1 2013/03/23 10:15:26 joerg Exp $ + +--- krita/plugins/viewplugins/scripting/kritacore/krs_iterator.h.orig 2013-02-28 16:16:06.000000000 +0000 ++++ krita/plugins/viewplugins/scripting/kritacore/krs_iterator.h +@@ -136,12 +136,12 @@ class Iterator : public Kross::Api::Clas + } + initiales = initiales.upper(); + // set/get general +- addFunction("set" + initiales, &Iterator::setPixel); +- addFunction("get" + initiales, &Iterator::getPixel); ++ this->addFunction("set" + initiales, &Iterator::setPixel); ++ this->addFunction("get" + initiales, &Iterator::getPixel); + kdDebug(41011) << ( "get" + initiales ) << endl; + // Various colorSpace +- addFunction("invertColor", &Iterator::invertColor); +- addFunction("darken", &Iterator::darken); ++ this->addFunction("invertColor", &Iterator::invertColor); ++ this->addFunction("darken", &Iterator::darken); + } + + ~Iterator() diff --git a/misc/koffice/patches/patch-krita_plugins_viewplugins_scripting_kritacore_krs__painter.cpp b/misc/koffice/patches/patch-krita_plugins_viewplugins_scripting_kritacore_krs__painter.cpp new file mode 100644 index 00000000000..e4092f0a9cc --- /dev/null +++ b/misc/koffice/patches/patch-krita_plugins_viewplugins_scripting_kritacore_krs__painter.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-krita_plugins_viewplugins_scripting_kritacore_krs__painter.cpp,v 1.1 2013/03/23 10:15:26 joerg Exp $ + +--- krita/plugins/viewplugins/scripting/kritacore/krs_painter.cpp.orig 2013-02-28 16:24:24.000000000 +0000 ++++ krita/plugins/viewplugins/scripting/kritacore/krs_painter.cpp +@@ -18,6 +18,7 @@ + + #include "krs_painter.h" + ++#include <kis_selection.h> + #include <kis_convolution_painter.h> + #include <kis_fill_painter.h> + #include <kis_paint_layer.h> diff --git a/misc/koffice/patches/patch-lib_kformula_creationstrategy.h b/misc/koffice/patches/patch-lib_kformula_creationstrategy.h new file mode 100644 index 00000000000..db5f6e989c4 --- /dev/null +++ b/misc/koffice/patches/patch-lib_kformula_creationstrategy.h @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_kformula_creationstrategy.h,v 1.1 2013/03/23 10:15:26 joerg Exp $ + +--- lib/kformula/creationstrategy.h.orig 2013-02-28 15:33:21.000000000 +0000 ++++ lib/kformula/creationstrategy.h +@@ -86,7 +86,7 @@ public: + */ + class OrdinaryCreationStrategy : public ElementCreationStrategy { + public: +- virtual BasicElement* createElement( QString type, const QDomElement& element = 0 ); ++ virtual BasicElement* createElement( QString type, const QDomElement& element); + + virtual TextElement* createTextElement( const QChar& ch, bool symbol=false ); + virtual EmptyElement* createEmptyElement(); diff --git a/misc/koffice/patches/patch-lib_kross_api_object.h b/misc/koffice/patches/patch-lib_kross_api_object.h new file mode 100644 index 00000000000..12949f523a9 --- /dev/null +++ b/misc/koffice/patches/patch-lib_kross_api_object.h @@ -0,0 +1,21 @@ +$NetBSD: patch-lib_kross_api_object.h,v 1.1 2013/03/23 10:15:26 joerg Exp $ + +--- lib/kross/api/object.h.orig 2013-02-28 16:43:45.000000000 +0000 ++++ lib/kross/api/object.h +@@ -135,6 +135,7 @@ namespace Kross { namespace Api { + }} + + #include "exception.h" ++#include <cstdlib> + + namespace Kross { namespace Api { + +@@ -142,7 +143,7 @@ template<class T> inline T* Object::from + { + T* t = (T*) object.data(); + if(! t) +- throw KSharedPtr<Exception>( new Exception(QString("Object \"%1\" invalid.").arg(object ? object->getClassName() : "")) ); ++ std::abort(); + return t; + } + |