rev 10884 - in trunk/packages/koffice/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-06-06 18:47:53 +0000 (Fri, 06 Jun 2008)
New Revision: 10884

Added:
   trunk/packages/koffice/debian/patches/33_g++_arm.diff
Modified:
   trunk/packages/koffice/debian/changelog
Log:
patch for #484770


Modified: trunk/packages/koffice/debian/changelog
===================================================================
--- trunk/packages/koffice/debian/changelog	2008-06-06 14:33:21 UTC (rev 10883)
+++ trunk/packages/koffice/debian/changelog	2008-06-06 18:47:53 UTC (rev 10884)
@@ -1,3 +1,9 @@
+koffice (1:1.6.3-6) unstable; urgency=low
+
+  * Fix FTBFS when --enable-final is not used with g++ 4.3.  (Closes: #484770)
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 06 Jun 2008 20:54:15 +0200
+
 koffice (1:1.6.3-5) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:

Added: trunk/packages/koffice/debian/patches/33_g++_arm.diff
===================================================================
--- trunk/packages/koffice/debian/patches/33_g++_arm.diff	                        (rev 0)
+++ trunk/packages/koffice/debian/patches/33_g++_arm.diff	2008-06-06 18:47:53 UTC (rev 10884)
@@ -0,0 +1,38 @@
+Patch by Aurelien Jarno.
+The problem is due to missing includes and appears when:
+ g++ 4.3 is used
+ --enable-final is not used
+
+Currently this concerns arm and armel.
+
+--- koffice-1.6.3.orig/filters/kword/wordperfect/import/TextRunStyle.cxx
++++ koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx
+@@ -33,6 +33,8 @@
+ #include "WriterProperties.hxx"
+ #include "DocumentElement.hxx"
+ 
++#include <cstring>
++
+ #ifdef _MSC_VER
+ #include <minmax.h>
+ #endif
+--- koffice-1.6.3.orig/filters/kword/wordperfect/import/TableStyle.cxx
++++ koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx
+@@ -27,6 +27,7 @@
+ /* "This product is not manufactured, approved, or supported by 
+  * Corel Corporation or Corel Corporation Limited."
+  */
++#include <cstring>
+ #include <math.h>
+ #include "FilterInternal.hxx"
+ #include "TableStyle.hxx"
+--- koffice-1.6.3.orig/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
++++ koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
+@@ -27,6 +27,8 @@
+ #include <klocale.h>
+ #include <kdebug.h>
+ 
++#include <cstdlib>
++
+ using namespace KexiDB;
+