diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2008-05-18 01:06:05 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2008-05-18 01:06:05 +0000 |
| commit | 46c08f7f82db5866f3e06ec5f7a0eb08be9c77a3 (patch) | |
| tree | e838f06a4196f36fd5479afe3c347ee0f5600def /app-office | |
| parent | Version bumped. (diff) | |
| download | gentoo-2-46c08f7f82db5866f3e06ec5f7a0eb08be9c77a3.tar.gz gentoo-2-46c08f7f82db5866f3e06ec5f7a0eb08be9c77a3.tar.bz2 gentoo-2-46c08f7f82db5866f3e06ec5f7a0eb08be9c77a3.zip | |
kword fix for gcc43
(Portage version: 2.1.5)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/kword/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/kword/files/kword-gcc43.patch | 22 | ||||
| -rw-r--r-- | app-office/kword/kword-1.6.3-r2.ebuild | 7 |
3 files changed, 32 insertions, 5 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/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 |