kword fix for gcc43

Package-Manager: portage-2.1.5

4 files changed, 45 insertions, 7 deletions

diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index 1f8727a4bc4a..51c89a0e7d2c 100644
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kword
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.116 2007/11/18 08:58:26 dertobi123 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.117 2008/05/18 01:06:05 hanno Exp $
+
+  18 May 2008; Hanno Boeck <hanno@gentoo.org> +files/kword-gcc43.patch,
+  kword-1.6.3-r2.ebuild:
+  Fix for gcc 4.3.
 
   18 Nov 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   kword-1.6.3-r2.ebuild:
diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index e5e7e958f040..b2e35d7d93e6 100644
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,11 +1,22 @@
+-----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-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
 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 1533 RMD160 c69d9497f2764647e9f9cbe80e487be2aa6b41da SHA1 e21a897cad31f0a010f33f54aea683e4157da3ab SHA256 05532cbf3316efa0ee97fb7f14dfc085c2eff5ca62cc9b73865cc7453f414477
+EBUILD kword-1.6.3-r2.ebuild 1558 RMD160 1044f4e2e0b7482e943f37ba50a349d37df2c936 SHA1 c0ca12b81917f1a04b7f018ac164c0838aec6905 SHA256 5552326ad748da133f823eb00d5c273258d2d50c50276e955794e41b562f42e5
 EBUILD kword-1.6.3.ebuild 1299 RMD160 06a087a676c6f887dd8eef1a4dc319e0b633aada SHA1 5240142570cf772ac6a367051303642250689126 SHA256 f6ca317b9bf9e392831b80236bc58401555f4ef4bdc2e9c79795a25eb1f227cc
-MISC ChangeLog 14116 RMD160 3094ac2626e876136c9d85077cbb2d1669fce61a SHA1 6fa730917052d58117aa417facbdc284dba03bb9 SHA256 ebd616f113be4e31f4b76e8c04ce1c6e9aee5e3012ffa6cb445f4b44ddfea218
+MISC ChangeLog 14228 RMD160 fe0cba4da37971af6606042fb6d2e6072915f0cc SHA1 2bd56ebb6601859bcec1a5eb4b3ddea03dabf39c SHA256 515ac46c983d5a5414592baef6f599b95060f84c48613adaaf992c8c3892fa6a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgvgQkACgkQr2QksT29OyBrswCfawj1O8QS+5lgV9YcLtUYLsBO
+J0EAni4pMyckC+hDZ8N6J/vVq2u3QA5H
+=jt3Y
+-----END PGP SIGNATURE-----
diff --git a/app-office/kword/files/kword-gcc43.patch b/app-office/kword/files/kword-gcc43.patch
new file mode 100644
index 000000000000..7da230f4fac4
--- /dev/null
+++ b/app-office/kword/files/kword-gcc43.patch
@@ -0,0 +1,22 @@
+--- branches/koffice/1.6/koffice/filters/kword/wordperfect/import/TableStyle.cxx	2007/10/26 14:06:42	729649
++++ branches/koffice/1.6/koffice/filters/kword/wordperfect/import/TableStyle.cxx	2007/10/26 14:20:47	729650
+@@ -36,6 +36,8 @@
+ #include <minmax.h>
+ #endif
+ 
++#include <cstring>
++
+ TableCellStyle::TableCellStyle(const WPXPropertyList &xPropList, const char *psName) :
+ 	Style(psName),
+         mPropList(xPropList)
+--- branches/koffice/1.6/koffice/filters/kword/wordperfect/import/TextRunStyle.cxx	2007/10/26 17:51:34	729711
++++ branches/koffice/1.6/koffice/filters/kword/wordperfect/import/TextRunStyle.cxx	2007/10/26 17:51:55	729712
+@@ -37,6 +37,8 @@
+ #include <minmax.h>
+ #endif
+ 
++#include <cstring>
++
+ ParagraphStyle::ParagraphStyle(WPXPropertyList *pPropList, const WPXPropertyListVector &xTabStops, const WPXString &sName) :
+ 	mpPropList(pPropList),
+ 	mxTabStops(xTabStops),
diff --git a/app-office/kword/kword-1.6.3-r2.ebuild b/app-office/kword/kword-1.6.3-r2.ebuild
index 667b785bc11e..7d9155e9642e 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-2007 Gentoo Foundation
+# Copyright 1999-2008 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.7 2007/11/18 08:58:26 dertobi123 Exp $
+# $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 $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -44,7 +44,8 @@ KMEXTRA="filters/kword"
 need-kde 3.5
 
 PATCHES="${FILESDIR}/koffice-xpdf-CVE-2007-3387.diff
-		${FILESDIR}/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff"
+	${FILESDIR}/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
+	${FILESDIR}/kword-gcc43.patch"
 
 src_unpack() {
 	kde-meta_src_unpack unpack