1 files changed, 56 insertions, 0 deletions
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..d632a9d79
--- /dev/null
+++ b/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,56 @@
+--- koffice/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h.ORI	2012-04-26 20:22:29.322777779 +0200
++++ koffice/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h	2012-04-26 20:23:21.216311169 +0200
+@@ -137,12 +137,12 @@
+             }
+             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()
+--- koffice/filters/chalk/png/kis_png_converter.cc.gcc47	2012-04-26 16:38:35.805156927 -0400
++++ koffice/filters/chalk/png/kis_png_converter.cc	2012-04-26 16:49:27.179323394 -0400
+@@ -43,6 +43,8 @@
+ #include <kis_paint_layer.h>
+ #include <kis_group_layer.h>
+ 
++#include <zlib.h>
++
+ namespace {
+ 
+     const TQ_UINT8 PIXEL_BLUE = 0;
+@@ -222,6 +224,7 @@
+     
+     // Read image profile
+     png_charp profile_name, profile_data;
++    unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data);
+     int compression_type;
+     png_uint_32 proflen;
+     int number_of_passes = 1;
+@@ -230,7 +233,7 @@
+         number_of_passes = png_set_interlace_handling(png_ptr);
+ 
+     KisProfile* profile = 0;
+-    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &proflen))
++    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &proflen))
+     {
+         TQByteArray profile_rawdata;
+         // XXX: Hardcoded for icc type -- is that correct for us?
+@@ -627,7 +630,7 @@
+         } else { // Profile
+             char* name = new char[(*it)->type().length()+1];
+             strcpy(name, (*it)->type().ascii());
+-            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size());
++            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (unsigned char*)(*it)->annotation().data(), (*it) -> annotation() . size());
+         }
+         ++it;
+     }