summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2006-01-12 13:31:21 +0000
committerHanno Böck <hanno@gentoo.org>2006-01-12 13:31:21 +0000
commit143136f53da4399fb2f3b0776885e80fa432ff11 (patch)
tree03d1718ed9ea7c946e14c78436da0bbafa9c5772 /app-office
parentAlso remove check for XvMC and remove dependency as it's not used at all either. (diff)
downloadgentoo-2-143136f53da4399fb2f3b0776885e80fa432ff11.tar.gz
gentoo-2-143136f53da4399fb2f3b0776885e80fa432ff11.tar.bz2
gentoo-2-143136f53da4399fb2f3b0776885e80fa432ff11.zip
krita gcc41 fix
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/krita/ChangeLog8
-rw-r--r--app-office/krita/files/krita-1.4.2-gcc41.patch21
-rw-r--r--app-office/krita/krita-1.4.2.ebuild6
3 files changed, 31 insertions, 4 deletions
diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index b8abc078d033..cdbf6ea8ab91 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/krita
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.24 2005/12/20 19:23:58 carlo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.25 2006/01/12 13:31:21 hanno Exp $
+
+ 12 Jan 2006; Hanno Boeck <hanno@gentoo.org>
+ +files/krita-1.4.2-gcc41.patch, krita-1.4.2.ebuild:
+ Fix for gcc 4.1.
20 Dec 2005; Carsten Lohrke <carlo@gentoo.org> -krita-1.4.1.ebuild:
clean up
diff --git a/app-office/krita/files/krita-1.4.2-gcc41.patch b/app-office/krita/files/krita-1.4.2-gcc41.patch
new file mode 100644
index 000000000000..5e7f5d915826
--- /dev/null
+++ b/app-office/krita/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/krita/krita-1.4.2.ebuild b/app-office/krita/krita-1.4.2.ebuild
index ac3321220467..1db769e461c5 100644
--- a/app-office/krita/krita-1.4.2.ebuild
+++ b/app-office/krita/krita-1.4.2.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/krita/krita-1.4.2.ebuild,v 1.10 2005/12/16 01:39:37 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.4.2.ebuild,v 1.11 2006/01/12 13:31:21 hanno Exp $
MAXKOFFICEVER=${PV}
KMNAME=koffice
@@ -37,4 +37,6 @@ KMEXTRACTONLY="lib/"
KMEXTRA="filters/krita"
+PATCHES="${FILESDIR}/krita-1.4.2-gcc41.patch"
+
need-kde 3.3