diff options
| -rw-r--r-- | kde-base/kdepim/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/kdepim/files/digest-kdepim-3.4.2-r1 | 1 | ||||
| -rw-r--r-- | kde-base/kdepim/files/kdepim-3.4.2-partnode.patch | 20 | ||||
| -rw-r--r-- | kde-base/kdepim/kdepim-3.4.2-r1.ebuild | 38 | ||||
| -rw-r--r-- | kde-base/kmail/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/kmail/files/digest-kmail-3.4.2-r1 | 1 | ||||
| -rw-r--r-- | kde-base/kmail/files/kdepim-3.4.2-partnode.patch | 20 | ||||
| -rw-r--r-- | kde-base/kmail/kmail-3.4.2-r1.ebuild | 56 |
8 files changed, 150 insertions, 2 deletions
diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog index 9c3997cfa729..e4cfb9a033a5 100644 --- a/kde-base/kdepim/ChangeLog +++ b/kde-base/kdepim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdepim # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.163 2005/07/28 19:53:17 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.164 2005/08/02 11:29:08 greg_g Exp $ + +*kdepim-3.4.2-r1 (02 Aug 2005) + + 02 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdepim-3.4.2-partnode.patch, +kdepim-3.4.2-r1.ebuild: + Add patch to fix problem with attachments (kde bug 109003). 28 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdepim-3.4.1-r2.ebuild: Stable on hppa. diff --git a/kde-base/kdepim/files/digest-kdepim-3.4.2-r1 b/kde-base/kdepim/files/digest-kdepim-3.4.2-r1 new file mode 100644 index 000000000000..6ac9eb92b059 --- /dev/null +++ b/kde-base/kdepim/files/digest-kdepim-3.4.2-r1 @@ -0,0 +1 @@ +MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492 diff --git a/kde-base/kdepim/files/kdepim-3.4.2-partnode.patch b/kde-base/kdepim/files/kdepim-3.4.2-partnode.patch new file mode 100644 index 000000000000..98e55197db06 --- /dev/null +++ b/kde-base/kdepim/files/kdepim-3.4.2-partnode.patch @@ -0,0 +1,20 @@ +diff -Nur kdepim-3.4.2.orig/kmail/partNode.cpp kdepim-3.4.2/kmail/partNode.cpp +--- kdepim-3.4.2.orig/kmail/partNode.cpp 2005-05-23 14:11:54.000000000 +0200 ++++ kdepim-3.4.2/kmail/partNode.cpp 2005-08-02 12:05:32.000000000 +0200 +@@ -36,6 +36,7 @@ + #include "kmmimeparttree.h" + #include <mimelib/utility.h> + #include <qregexp.h> ++#include <kasciistricmp.h> + + /* + =========================================================================== +@@ -414,7 +415,7 @@ + partNode* partNode::findNodeForDwPart( DwBodyPart* part ) + { + partNode* found = 0; +- if( dwPart()->partId() == part->partId() ) ++ if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 ) + return this; + if( mChild ) + found = mChild->findNodeForDwPart( part ); diff --git a/kde-base/kdepim/kdepim-3.4.2-r1.ebuild b/kde-base/kdepim/kdepim-3.4.2-r1.ebuild new file mode 100644 index 000000000000..060843da8731 --- /dev/null +++ b/kde-base/kdepim/kdepim-3.4.2-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.2-r1.ebuild,v 1.1 2005/08/02 11:29:08 greg_g Exp $ + +inherit kde-dist eutils + +DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..." + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86" +IUSE="crypt gnokii pda" + +DEPEND="~kde-base/kdebase-${PV} + >=dev-libs/cyrus-sasl-2 + pda? ( app-pda/pilot-link dev-libs/libmal ) + gnokii? ( app-mobilephone/gnokii ) + crypt? ( >=app-crypt/gpgme-0.9.0-r1 )" + +src_unpack() { + kde_src_unpack + + # Fix compilation with gcc 3.2 (kde bug 106274). Applied for 3.4.3. + epatch "${FILESDIR}/kdepim-3.4.2-gcc32.patch" + + # Fix problem with attachments (kde bug 109003). Applied for 3.4.3. + epatch "${FILESDIR}/kdepim-3.4.2-partnode.patch" + + # Configure patch. Applied for 3.5. + epatch "${FILESDIR}/kdepim-3.4-configure.patch" + + # For the configure patch. + make -f admin/Makefile.common +} + +src_compile() { + local myconf="--with-sasl $(use_with gnokii)" + + kde_src_compile +} diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog index 96ad4ec2ece4..3dcc198512a6 100644 --- a/kde-base/kmail/ChangeLog +++ b/kde-base/kmail/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kmail # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.17 2005/07/28 21:16:18 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.18 2005/08/02 11:26:42 greg_g Exp $ + +*kmail-3.4.2-r1 (02 Aug 2005) + + 02 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdepim-3.4.2-partnode.patch, +kmail-3.4.2-r1.ebuild: + Add patch to fix problem with attachments (kde bug 109003). *kmail-3.4.2 (28 Jul 2005) diff --git a/kde-base/kmail/files/digest-kmail-3.4.2-r1 b/kde-base/kmail/files/digest-kmail-3.4.2-r1 new file mode 100644 index 000000000000..6ac9eb92b059 --- /dev/null +++ b/kde-base/kmail/files/digest-kmail-3.4.2-r1 @@ -0,0 +1 @@ +MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492 diff --git a/kde-base/kmail/files/kdepim-3.4.2-partnode.patch b/kde-base/kmail/files/kdepim-3.4.2-partnode.patch new file mode 100644 index 000000000000..98e55197db06 --- /dev/null +++ b/kde-base/kmail/files/kdepim-3.4.2-partnode.patch @@ -0,0 +1,20 @@ +diff -Nur kdepim-3.4.2.orig/kmail/partNode.cpp kdepim-3.4.2/kmail/partNode.cpp +--- kdepim-3.4.2.orig/kmail/partNode.cpp 2005-05-23 14:11:54.000000000 +0200 ++++ kdepim-3.4.2/kmail/partNode.cpp 2005-08-02 12:05:32.000000000 +0200 +@@ -36,6 +36,7 @@ + #include "kmmimeparttree.h" + #include <mimelib/utility.h> + #include <qregexp.h> ++#include <kasciistricmp.h> + + /* + =========================================================================== +@@ -414,7 +415,7 @@ + partNode* partNode::findNodeForDwPart( DwBodyPart* part ) + { + partNode* found = 0; +- if( dwPart()->partId() == part->partId() ) ++ if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 ) + return this; + if( mChild ) + found = mChild->findNodeForDwPart( part ); diff --git a/kde-base/kmail/kmail-3.4.2-r1.ebuild b/kde-base/kmail/kmail-3.4.2-r1.ebuild new file mode 100644 index 000000000000..a7bb2a1e1f4a --- /dev/null +++ b/kde-base/kmail/kmail-3.4.2-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.4.2-r1.ebuild,v 1.1 2005/08/02 11:26:42 greg_g Exp $ + +KMNAME=kdepim +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +DESCRIPTION="KDE mail client" +KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" +DEPEND="$(deprange 3.4.1 $MAXKDEVER kde-base/libkdenetwork) +$(deprange $PV $MAXKDEVER kde-base/libkdepim) +$(deprange 3.4.1 $MAXKDEVER kde-base/libkpimidentities) +$(deprange $PV $MAXKDEVER kde-base/mimelib) +$(deprange 3.4.1 $MAXKDEVER kde-base/libksieve) +$(deprange $PV $MAXKDEVER kde-base/certmanager) +$(deprange $PV $MAXKDEVER kde-base/libkcal) +$(deprange $PV $MAXKDEVER kde-base/kontact)" +RDEPEND="${DEPEND} +$(deprange $PV $MAXKDEVER kde-base/kdepim-kioslaves) +$(deprange 3.4.1 $MAXKDEVER kde-base/kmailcvt) +$(deprange-dual $PV $MAXKDEVER kde-base/kdebase-kioslaves)" + +KMCOPYLIB=" + libkdepim libkdepim/ + libkpimidentities libkpimidentities/ + libmimelib mimelib/ + libksieve libksieve/ + libkleopatra certmanager/lib/ + libkcal libkcal + libkpinterfaces kontact/interfaces/ + libkmime libkmime + libkpgp libkpgp" +KMEXTRACTONLY=" + libkdenetwork/ + libkdepim/ + libkpimidentities/ + libksieve/ + libkcal/ + mimelib/ + certmanager/ + korganizer/korganizeriface.h + kontact/interfaces/ + libkmime/ + libkpgp + dcopidlng" +KMCOMPILEONLY="libemailfunctions" +# the kmail plugins are installed with kmail +KMEXTRA=" + plugins/kmail/ + kontact/plugins/kmail/" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of this programs deps. + +# Fix problem with attachments (kde bug 109003). Applied for 3.4.3. +PATCHES1="${FILESDIR}/kdepim-3.4.2-partnode.patch" |