summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-office/koffice/Manifest27
-rw-r--r--app-office/krita/ChangeLog8
-rw-r--r--app-office/krita/Manifest15
-rw-r--r--app-office/krita/files/krita-1.4.2-gcc41.patch21
-rw-r--r--app-office/krita/krita-1.4.2.ebuild6
5 files changed, 53 insertions, 24 deletions
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index a336a962963f..d8accff092b1 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7185dbf038a28ae5e5e7b7256bd7fa51 koffice-1.4.2-r4.ebuild 1605
-MD5 4f2138db76b72bd0803d91c3e17f651e koffice-1.4.2-r6.ebuild 1605
-MD5 ee0123f66b6cf704b3371d41759b9a01 ChangeLog 20889
-MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-MD5 f8fa87af0dc83731a25154443f503548 koffice-1.4.2-r7.ebuild 1695
-MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
+MD5 bacd41abe652ac6adb305e5b797ef73f ChangeLog 21020
MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
-MD5 32ff061a8fba0e82d069a8a6fa6932e0 files/post-1.3-koffice-CAN-2005-3193.diff 6760
-MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r4 68
MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r6 68
MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r7 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDrMKl3og80iZgVQgRArawAJ9EEHchRz89GXzbANoni1SQmDEIiwCghUqv
-ComdDWd1F4r2k0vopCdjyRI=
-=xf3f
------END PGP SIGNATURE-----
+MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
+MD5 7d57f921f9a3827f925a3457413914b8 files/krita-1.4.2-gcc41.patch 656
+MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
+MD5 32ff061a8fba0e82d069a8a6fa6932e0 files/post-1.3-koffice-CAN-2005-3193.diff 6760
+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
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/Manifest b/app-office/krita/Manifest
index 3f3839bff31a..bd0597a31361 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -1,4 +1,15 @@
-MD5 8abda709081e8e168157034b69fb45bd ChangeLog 2896
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 29359ef0e7061df6b05d290713614bb6 ChangeLog 3016
MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-krita-1.4.2 68
-MD5 c34def31b95563ba50e63a495d586a6e krita-1.4.2.ebuild 957
+MD5 7d57f921f9a3827f925a3457413914b8 files/krita-1.4.2-gcc41.patch 656
+MD5 9455c7bd91075fa7af97dbd21f387b96 krita-1.4.2.ebuild 1002
MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDxlpmr2QksT29OyARAu8hAJ9Ht8VOs2ecJroAmeVEasBFokaZKwCfYs6J
+LMPvtjHDv/kjLn4SA12BCqM=
+=o083
+-----END PGP SIGNATURE-----
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