Added patch for gcc 4.4, bug 270960, thanks to Oschtan

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 62 insertions, 6 deletions

diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index ffd654828a8d..496e297498b3 100644
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kword
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.120 2009/05/28 08:17:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.121 2009/06/01 03:25:54 tampakrap Exp $
+
+  01 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  kword-1.6.3-r2.ebuild, kword-1.6.3_p20090204.ebuild,
+  +files/kword-1.6.3-gcc44.patch:
+  Added patch for gcc 4.4, bug 270960, thanks to Oschtan
 
 *kword-2.0.0 (28 May 2009)
 
diff --git a/app-office/kword/files/kword-1.6.3-gcc44.patch b/app-office/kword/files/kword-1.6.3-gcc44.patch
new file mode 100644
index 000000000000..47c969bdcc55
--- /dev/null
+++ b/app-office/kword/files/kword-1.6.3-gcc44.patch
@@ -0,0 +1,47 @@
+--- kword-1.6.3_p20090204-orig/work/kword-1.6.3_p20090519/filters/kword/pdf/xpdf/goo/gfile.cc	2009-05-25 15:51:25.000000000 +0100
++++ kword-1.6.3_p20090204/work/kword-1.6.3_p20090519/filters/kword/pdf/xpdf/goo/gfile.cc	2009-05-25 15:51:20.000000000 +0100
+@@ -277,7 +277,7 @@
+ GString *grabPath(const char *fileName) {
+ #ifdef VMS
+   //---------- VMS ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, ']')))
+     return new GString(fileName, p + 1 - fileName);
+@@ -287,7 +287,7 @@
+ 
+ #elif defined(__EMX__) || defined(WIN32)
+   //---------- OS/2+EMX and Win32 ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, '/')))
+     return new GString(fileName, p - fileName);
+@@ -300,7 +300,7 @@
+ 
+ #elif defined(ACORN)
+   //---------- RISCOS ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, '.')))
+     return new GString(fileName, p - fileName);
+@@ -307,7 +307,7 @@
+ 
+ #elif defined(MACOS)
+   //---------- MacOS ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, ':')))
+     return new GString(fileName, p - fileName);
+@@ -315,7 +315,7 @@
+ 
+ #else
+   //---------- Unix ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, '/')))
+     return new GString(fileName, p - fileName);
diff --git a/app-office/kword/kword-1.6.3-r2.ebuild b/app-office/kword/kword-1.6.3-r2.ebuild
index 7d9155e9642e..3fe3f26db9ef 100644
--- a/app-office/kword/kword-1.6.3-r2.ebuild
+++ b/app-office/kword/kword-1.6.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3-r2.ebuild,v 1.8 2008/05/18 01:06:05 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3-r2.ebuild,v 1.9 2009/06/01 03:25:54 tampakrap Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -43,9 +43,10 @@ KMEXTRA="filters/kword"
 
 need-kde 3.5
 
-PATCHES="${FILESDIR}/koffice-xpdf-CVE-2007-3387.diff
+PATCHES=( "${FILESDIR}/koffice-xpdf-CVE-2007-3387.diff
 	${FILESDIR}/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
-	${FILESDIR}/kword-gcc43.patch"
+	${FILESDIR}/${PN}-gcc43.patch
+	${FILESDIR}/${P}-gcc44.patch" )
 
 src_unpack() {
 	kde-meta_src_unpack unpack
diff --git a/app-office/kword/kword-1.6.3_p20090204.ebuild b/app-office/kword/kword-1.6.3_p20090204.ebuild
index e1cf6c369b0f..1b6bacfe7fd1 100644
--- a/app-office/kword/kword-1.6.3_p20090204.ebuild
+++ b/app-office/kword/kword-1.6.3_p20090204.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3_p20090204.ebuild,v 1.2 2009/02/08 22:23:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3_p20090204.ebuild,v 1.3 2009/06/01 03:25:54 tampakrap Exp $
 
 ARTS_REQUIRED="never"
 
@@ -20,6 +20,7 @@ DEPEND="~app-office/koffice-libs-1.6.3_p20090204
 	>=app-text/wv2-0.1.8
 	>=media-gfx/imagemagick-5.5.2
 	>=app-text/libwpd-0.8.2"
+RDEPEND="${DEPEND}"
 
 KMCOPYLIB="libkformula lib/kformula
 	libkofficecore lib/kofficecore
@@ -41,6 +42,8 @@ KMEXTRA="filters/kword"
 
 need-kde 3.5
 
+PATCHES=( "${FILESDIR}/${P}-gcc44.patch" )
+
 src_unpack() {
 	kde-meta_src_unpack unpack