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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 66 insertions, 19 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/Manifest b/app-office/kword/Manifest
index a3db00dfc64d..02c864ddfffa 100644
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff 15961 RMD160 ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4 SHA1 a3d1d85567ccf729a2237f4aa837f7e025ce00ae SHA256 ed9b3ee5b1590aae930dc2829b9a463fac9cee5ab3e412423a4991109f507942
 AUX koffice-xpdf-CVE-2007-0104.diff 3185 RMD160 1ea990a06dfdc709362a6cb0fbb69851da86a3d6 SHA1 bef37ffafbae9a509363f7bc63806ab7162576b9 SHA256 36585b64bc23c9e352c0ff4edff9788add81381049dff5ae1d9de708f9696bfe
 AUX koffice-xpdf-CVE-2007-3387.diff 601 RMD160 7f620ec00ca05da91596f2d750d32ed8aa8bec95 SHA1 bff4f540389a77320bc87e2dedece50b82932e59 SHA256 8f4df5133452dba1469ec605393503d2b233d7aaccbbee0e5e42b79c24be9062
+AUX kword-1.6.3-gcc44.patch 1281 RMD160 79639290e96e1591627918a25f64b566ce547c80 SHA1 a9f32253e9b0bc78d96d8a1286972576d776cd2f SHA256 47b5e3e6df0794ae89cd1e0f7333e3a591e540f5dd48aba2064cc95967f743cb
 AUX kword-gcc43.patch 889 RMD160 e532b436acd9395eb9b58027d24420269d6d6a86 SHA1 0976929632092684cdee838d68f780dbb3d8614d SHA256 711283969b08992c7d04a3aa19ba11ceff721a9524302fe787a8e3d808c193b7
 DIST koffice-1.6.1.tar.bz2 56999028 RMD160 ee4fa84a53f92035c0ab9427e0acb18feca701db SHA1 891fb0a28ec3c4b070c4d6c2eae7fee1d2e37761 SHA256 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728
 DIST koffice-1.6.3.tar.bz2 56829391 RMD160 e474ba48fa983fafb61ad58fb79cddda69ec6908 SHA1 de84214dec913eac1d47dab04dd93f3d81729fd3 SHA256 c3975f0a59f50aaa5547f1709b6fad54f746fd06815859b374676b426dce12cb
@@ -11,16 +9,9 @@ DIST koffice-1.6.3_p20090204.tar.bz2 105139802 RMD160 c9207791de8df4c32a19e1d6a3
 DIST koffice-2.0.0.tar.bz2 82132346 RMD160 4376b13567d41d529e0e5d29d74158e557cc6961 SHA1 5751fefee936169b695f160ecad362a7a8cc5380 SHA256 8cfc35acf4b6d306245e7705899167fd1b67a861136551ab02a0cd7542eb72e9
 EBUILD kword-1.6.1-r1.ebuild 1351 RMD160 abe4f0e2af069b3381710c635eb9bc9c5fc843f8 SHA1 4034d36a2106b0a4d0a0ed6c98506feacf90361d SHA256 bc1736aa874d01d147502b888e14f25e2348cb7a32c346cc8d7566a408f1f4e1
 EBUILD kword-1.6.3-r1.ebuild 1357 RMD160 2bec58a8d51b8bedb9d3c47dc259c41bf9dd236d SHA1 7bd4828127527b2aa87dbabaa0519720e79a6544 SHA256 8349bf065e61b557a451e2a4150ce035cf63ad777a5a5e5165a2a08fe9651978
-EBUILD kword-1.6.3-r2.ebuild 1558 RMD160 1044f4e2e0b7482e943f37ba50a349d37df2c936 SHA1 c0ca12b81917f1a04b7f018ac164c0838aec6905 SHA256 5552326ad748da133f823eb00d5c273258d2d50c50276e955794e41b562f42e5
+EBUILD kword-1.6.3-r2.ebuild 1596 RMD160 25a96831e738190f3c94c3b8ffb6d02bd4563e71 SHA1 5de210746fc5cdb060272c1998e47820c648cbb7 SHA256 938b3c9fe6806cd3f5d42255e2b4f77e2ae17cc33698c01696776ac52aa36803
 EBUILD kword-1.6.3.ebuild 1299 RMD160 06a087a676c6f887dd8eef1a4dc319e0b633aada SHA1 5240142570cf772ac6a367051303642250689126 SHA256 f6ca317b9bf9e392831b80236bc58401555f4ef4bdc2e9c79795a25eb1f227cc
-EBUILD kword-1.6.3_p20090204.ebuild 1258 RMD160 0f7cdf131c39c36a767efed9020713a218a11ccc SHA1 f394dc7726b4981e7f8a9835dc6aa82b751c36ec SHA256 29901c0b015f03343ab66c07f4d403191e64026fe55ef7837ab922b8ce7ca51f
+EBUILD kword-1.6.3_p20090204.ebuild 1322 RMD160 4537bd329412402a506725c585b925c8901052c6 SHA1 ab9ac9b6d299ef7a8a088fdd01b5bcb801e67b53 SHA256 cf1a521cb031f86e90c4d61426d5d1505241bbc99abf90a415364574e6b89be7
 EBUILD kword-2.0.0.ebuild 686 RMD160 260c673e59b71860e1235f3f98a613713c20f34b SHA1 c2946dee354973acfabbacdc2462b066556b2d66 SHA256 173063b9b3209b7b481592a6f6f62c95afdcf5830628bd9fe4750f194a32daef
-MISC ChangeLog 14732 RMD160 0070aed5bfc0da6e33190f29bf496c5d96f800a9 SHA1 4cfdce472379b6fb904a9270ca55c2a4404540cd SHA256 c072b90e3e897ccf2caefcab46c6c235d490b6e0cea4628a05c14f872b646715
+MISC ChangeLog 14935 RMD160 518798e1f15cb71cefa828d94e055d9ac4fb2fd1 SHA1 3c9af6ee35b24b21eb97dc0f7b8196e38aad5175 SHA256 768b59130d4db2ca8c9551a707b51d4f4c6753ec70ba609782129fd2fb0e64e5
 MISC metadata.xml 283 RMD160 fbaac5a3e6372bbdfbd1c8e2f21667b24177083a SHA1 234fa1319e29712e6ac237921eeaae0a591d0602 SHA256 40523c9d7d6ebd6453db54f4912636eaa7b089efdeb7c4f2ee8cbf0abebeb57e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoeSLcACgkQHB6c3gNBRYcUaQCffYIbdGMmmxsoomV3f+ShE6Dm
-3DUAoKUJtzXUXQMlj8kzyYVIH4xVy726
-=W7OM
------END PGP SIGNATURE-----
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