diff options
| author |   Hanno Boeck <hanno@gentoo.org> | 2006-01-12 13:34:57 +0000 |
|---|---|---|
| committer | Hanno Boeck <hanno@gentoo.org> | 2006-01-12 13:34:57 +0000 |
| commit | 5b859cdc0900bf28f54a130d22082e9d10554984 (patch) | |
| tree | 0ab408f56e8b270c5780109205047c4a68c0f4f7 /app-office | |
| parent | Stable on sparc (diff) | |
| download | historical-5b859cdc0900bf28f54a130d22082e9d10554984.tar.gz historical-5b859cdc0900bf28f54a130d22082e9d10554984.tar.bz2 historical-5b859cdc0900bf28f54a130d22082e9d10554984.zip | |
koffice gcc41 fix
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/koffice/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/koffice/Manifest | 10 | ||||
| -rw-r--r-- | app-office/koffice/files/krita-1.4.2-gcc41.patch | 21 | ||||
| -rw-r--r-- | app-office/koffice/koffice-1.4.2-r7.ebuild | 5 |
4 files changed, 40 insertions, 4 deletions
diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog index ce0272d8dea9..84ce8ea153d1 100644 --- a/app-office/koffice/ChangeLog +++ b/app-office/koffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/koffice -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.149 2005/12/24 03:37:56 yoswink Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.150 2006/01/12 13:34:57 hanno Exp $ + + 12 Jan 2006; Hanno Boeck <hanno@gentoo.org> + +files/krita-1.4.2-gcc41.patch, koffice-1.4.2-r7.ebuild: + Fix (krita) for gcc 4.1. 24 Dec 2005; Jose Luis Rivero <yoswink@gentoo.org> koffice-1.4.2-r6.ebuild: diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest index d8accff092b1..708ca6ae0172 100644 --- a/app-office/koffice/Manifest +++ b/app-office/koffice/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 bacd41abe652ac6adb305e5b797ef73f ChangeLog 21020 MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r4 68 @@ -11,3 +14,10 @@ MD5 7185dbf038a28ae5e5e7b7256bd7fa51 koffice-1.4.2-r4.ebuild 1605 MD5 4f2138db76b72bd0803d91c3e17f651e koffice-1.4.2-r6.ebuild 1605 MD5 6a1d2ec12afd0fcb1117d7f8e22d7152 koffice-1.4.2-r7.ebuild 1732 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDxls1r2QksT29OyARAjRxAKCWmD9x3q635dKPAV1X2g0Gl+gQyACeO0+E +xeJn3byQRXNEXXdZ6UULzos= +=PvG1 +-----END PGP SIGNATURE----- diff --git a/app-office/koffice/files/krita-1.4.2-gcc41.patch b/app-office/koffice/files/krita-1.4.2-gcc41.patch new file mode 100644 index 000000000000..5e7f5d915826 --- /dev/null +++ b/app-office/koffice/files/krita-1.4.2-gcc41.patch @@ -0,0 +1,21 @@ +--- branches/koffice/1.4/koffice/krita/core/kis_filter_registry.h 2005/05/27 09:18:23 418647 ++++ branches/koffice/1.4/koffice/krita/core/kis_filter_registry.h 2005/10/24 15:53:42 473737 +@@ -26,7 +26,6 @@ + #include "kis_types.h" + #include "kis_generic_registry.h" + #include "kaction.h" +-#include "kis_filter.h" + + class QString; + class KisView; +--- branches/koffice/1.4/koffice/krita/core/kis_clipboard.h 2005/05/27 09:18:23 418647 ++++ branches/koffice/1.4/koffice/krita/core/kis_clipboard.h 2005/10/18 12:57:53 471689 +@@ -35,7 +35,7 @@ + + public: + +- virtual KisClipboard::~KisClipboard(); ++ virtual ~KisClipboard(); + + static KisClipboard* instance(); + diff --git a/app-office/koffice/koffice-1.4.2-r7.ebuild b/app-office/koffice/koffice-1.4.2-r7.ebuild index fe5279355ad7..f7939e586ef1 100644 --- a/app-office/koffice/koffice-1.4.2-r7.ebuild +++ b/app-office/koffice/koffice-1.4.2-r7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2-r7.ebuild,v 1.2 2005/12/20 19:25:39 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2-r7.ebuild,v 1.3 2006/01/12 13:34:57 hanno Exp $ inherit kde @@ -46,6 +46,7 @@ need-kde 3.3 PATCHES="${FILESDIR}/kspread-1.4.2-gcc41.patch ${FILESDIR}/kexi-1.4.2-gcc41.patch + ${FILESDIR}/krita-1.4.2-gcc41.patch ${FILESDIR}/post-1.3-koffice-CAN-2005-3193.diff" src_compile() { |