diff options
-rw-r--r-- | kde-base/kdepim/ChangeLog | 8 | ||||
-rw-r--r-- | kde-base/kdepim/Manifest | 5 | ||||
-rw-r--r-- | kde-base/kdepim/files/digest-kdepim-3.4.1-r2 | 1 | ||||
-rw-r--r-- | kde-base/kdepim/files/kmail-3.4.1-shift+click-crash.diff | 10 | ||||
-rw-r--r-- | kde-base/kdepim/kdepim-3.4.1-r2.ebuild | 37 | ||||
-rw-r--r-- | kde-base/kmail/ChangeLog | 8 | ||||
-rw-r--r-- | kde-base/kmail/Manifest | 5 | ||||
-rw-r--r-- | kde-base/kmail/files/digest-kmail-3.4.1-r1 | 3 | ||||
-rw-r--r-- | kde-base/kmail/files/kmail-3.4.1-shift+click-crash.diff | 10 | ||||
-rw-r--r-- | kde-base/kmail/kmail-3.4.1-r1.ebuild | 55 |
10 files changed, 138 insertions, 4 deletions
diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog index 25cbf9e4e31e..e69b38a14712 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.151 2005/06/08 21:59:42 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.152 2005/07/01 00:56:23 carlo Exp $ + +*kdepim-3.4.1-r2 (01 Jul 2005) + + 01 Jul 2005; Carsten Lohrke <carlo@gentoo.org> + +files/kmail-3.4.1-shift+click-crash.diff, +kdepim-3.4.1-r2.ebuild: + fixing crash on shift+click in kmail reader, #97549 *kdepim-3.4.1-r1 (08 Jun 2005) diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest index d90fde98ed58..4487127633dd 100644 --- a/kde-base/kdepim/Manifest +++ b/kde-base/kdepim/Manifest @@ -1,9 +1,10 @@ MD5 53f145bb4ec5a11aad2e6cb113416a2a kdepim-3.2.3.ebuild 819 MD5 2877803bcd1808411419ee469c3740f7 kdepim-3.3.2-r1.ebuild 740 +MD5 4cc50d8551524092b2f158f785c3e9c5 kdepim-3.4.1-r2.ebuild 1096 MD5 65b93f8b6e76e1d92cd3ea8dd39ec4d6 kdepim-3.4.1.ebuild 899 MD5 20482ada2c85fc010b8f3e4b47d937f6 kdepim-3.4.1-r1.ebuild 1021 MD5 1e0eef07c12d5bc541dfd858974691d0 kdepim-3.3.2.ebuild 673 -MD5 1ae3abc089bfc8139681d4131f31c13e ChangeLog 19258 +MD5 698dc5765efd99f974e8c96f3e98d22a ChangeLog 19464 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 MD5 b94c24d965fab7c67e67ba859834c13c kdepim-3.4.0-r1.ebuild 1031 MD5 318e6b50444a5837fed2a5ea9ecc57e9 files/digest-kdepim-3.2.3 66 @@ -11,9 +12,11 @@ MD5 38f90eca12bd5623fc7f28e814efd1a2 files/digest-kdepim-3.3.2 66 MD5 1e18066c2900b78b7dad11a29ed0f002 files/digest-kdepim-3.4.1 67 MD5 1ec4778f0dbac85bc27bc2c2541e5c64 files/kdepim-3.4.0-fix-imap-resource-type.patch 1938 MD5 c516924ee249a2899621263d30ac3676 files/kdepim-3.3.2-kmail-imap-preview.diff 667 +MD5 465fb4ad98b38e7c5328429eaabb1000 files/kmail-3.4.1-shift+click-crash.diff 516 MD5 38f90eca12bd5623fc7f28e814efd1a2 files/digest-kdepim-3.3.2-r1 66 MD5 8c0ffea7b75b42449f4acada755ff36a files/digest-kdepim-3.4.0-r1 67 MD5 1e18066c2900b78b7dad11a29ed0f002 files/digest-kdepim-3.4.1-r1 67 +MD5 1e18066c2900b78b7dad11a29ed0f002 files/digest-kdepim-3.4.1-r2 67 MD5 f487b0894ac81c4e75d85875ce51d24a files/kdepim-3.4.0-akregator-fix.patch 2505 MD5 b6a29865e7aefe8e3858bd65de651d3d files/kdepim-3.4.1-akregator-unread.patch 673 MD5 0324965cf9c67cc4750d7a14cec3ef1f files/kdepim-3.4.1-kpilot-fix.patch 4635 diff --git a/kde-base/kdepim/files/digest-kdepim-3.4.1-r2 b/kde-base/kdepim/files/digest-kdepim-3.4.1-r2 new file mode 100644 index 000000000000..38792ff6b953 --- /dev/null +++ b/kde-base/kdepim/files/digest-kdepim-3.4.1-r2 @@ -0,0 +1 @@ +MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538 diff --git a/kde-base/kdepim/files/kmail-3.4.1-shift+click-crash.diff b/kde-base/kdepim/files/kmail-3.4.1-shift+click-crash.diff new file mode 100644 index 000000000000..caae8a4e5fa5 --- /dev/null +++ b/kde-base/kdepim/files/kmail-3.4.1-shift+click-crash.diff @@ -0,0 +1,10 @@ +--- kmail/kmreaderwin.cpp.orig 2005-07-01 01:26:44.000000000 +0200 ++++ kmail/kmreaderwin.cpp 2005-07-01 01:28:17.000000000 +0200 +@@ -2378,6 +2378,7 @@ + if ( me->button() == LeftButton && ( me->state() & ShiftButton ) ) { + // special processing for shift+click + mAtmCurrent = msgPartFromUrl( mUrlClicked ); ++ if ( mAtmCurrent < 0 ) return false; + mAtmCurrentName = mUrlClicked.path(); + slotHandleAttachment( KMHandleAttachmentCommand::Save ); // save + return true; // eat event diff --git a/kde-base/kdepim/kdepim-3.4.1-r2.ebuild b/kde-base/kdepim/kdepim-3.4.1-r2.ebuild new file mode 100644 index 000000000000..c47f2d93ac1f --- /dev/null +++ b/kde-base/kdepim/kdepim-3.4.1-r2.ebuild @@ -0,0 +1,37 @@ +# 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.1-r2.ebuild,v 1.1 2005/07/01 00:56:23 carlo Exp $ + +inherit kde-dist eutils + +DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..." + +KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64" +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 ) + !net-www/akregator" + +src_unpack() { + kde_src_unpack + + # Last minute fix. Applied for 3.4.2. + epatch "${FILESDIR}/${P}-kpilot-fix.patch" + + # Fix regression in akregator (kde bug 106345). Applied for 3.4.2. + epatch "${FILESDIR}/${P}-akregator-unread.patch" + + # see bug 97549 + epatch "${FILESDIR}/kmail-3.4.1-shift+click-crash.diff" +} + +src_compile() { + # needed to detect pi-notepad.h, used by the kpilot notepad conduit. + use pda && myconf="${myconf} --with-extra-includes=/usr/include/libpisock" + + kde_src_compile +} diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog index 70c884844d30..c642fccea5e8 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.11 2005/05/25 21:23:07 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.12 2005/07/01 00:53:18 carlo Exp $ + +*kmail-3.4.1-r1 (01 Jul 2005) + + 01 Jul 2005; Carsten Lohrke <carlo@gentoo.org> + +files/kmail-3.4.1-shift+click-crash.diff, +kmail-3.4.1-r1.ebuild: + fixing crash on shift+click in kmail reader, #97549 *kmail-3.4.1 (25 May 2005) diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest index 30efbd406043..e75914619176 100644 --- a/kde-base/kmail/Manifest +++ b/kde-base/kmail/Manifest @@ -1,6 +1,9 @@ MD5 d262cbbae3cf2786f68f81d732b6371d kmail-3.4.0.ebuild 1616 MD5 926284047207eb54439fae20ca5e7f56 kmail-3.4.1.ebuild 1615 -MD5 916f8f722e1ecd4f2313de42ab0faf24 ChangeLog 1877 +MD5 3a6dc174a379e092867eeb443e3a3a52 kmail-3.4.1-r1.ebuild 1673 +MD5 3e3a64ad821c510a39513fb555ca15f1 ChangeLog 2081 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 +MD5 465fb4ad98b38e7c5328429eaabb1000 files/kmail-3.4.1-shift+click-crash.diff 516 +MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1-r1 208 MD5 8c0ffea7b75b42449f4acada755ff36a files/digest-kmail-3.4.0 67 MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1 208 diff --git a/kde-base/kmail/files/digest-kmail-3.4.1-r1 b/kde-base/kmail/files/digest-kmail-3.4.1-r1 new file mode 100644 index 000000000000..1ff7d92e997f --- /dev/null +++ b/kde-base/kmail/files/digest-kmail-3.4.1-r1 @@ -0,0 +1,3 @@ +MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545 +MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503 +MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538 diff --git a/kde-base/kmail/files/kmail-3.4.1-shift+click-crash.diff b/kde-base/kmail/files/kmail-3.4.1-shift+click-crash.diff new file mode 100644 index 000000000000..caae8a4e5fa5 --- /dev/null +++ b/kde-base/kmail/files/kmail-3.4.1-shift+click-crash.diff @@ -0,0 +1,10 @@ +--- kmail/kmreaderwin.cpp.orig 2005-07-01 01:26:44.000000000 +0200 ++++ kmail/kmreaderwin.cpp 2005-07-01 01:28:17.000000000 +0200 +@@ -2378,6 +2378,7 @@ + if ( me->button() == LeftButton && ( me->state() & ShiftButton ) ) { + // special processing for shift+click + mAtmCurrent = msgPartFromUrl( mUrlClicked ); ++ if ( mAtmCurrent < 0 ) return false; + mAtmCurrentName = mUrlClicked.path(); + slotHandleAttachment( KMHandleAttachmentCommand::Save ); // save + return true; // eat event diff --git a/kde-base/kmail/kmail-3.4.1-r1.ebuild b/kde-base/kmail/kmail-3.4.1-r1.ebuild new file mode 100644 index 000000000000..a59db77881ee --- /dev/null +++ b/kde-base/kmail/kmail-3.4.1-r1.ebuild @@ -0,0 +1,55 @@ +# 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.1-r1.ebuild,v 1.1 2005/07/01 00:53:18 carlo Exp $ + +KMNAME=kdepim +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +DESCRIPTION="KDE mail client" +KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc" +IUSE="" +DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdenetwork) +$(deprange $PV $MAXKDEVER kde-base/libkdepim) +$(deprange $PV $MAXKDEVER kde-base/libkpimidentities) +$(deprange $PV $MAXKDEVER kde-base/mimelib) +$(deprange $PV $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 $PV $MAXKDEVER kde-base/kdebase-kioslaves) +$(deprange $PV $MAXKDEVER kde-base/kmailcvt)" + +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. + +PATCHES="${FILESDIR}/kmail-3.4.1-shift+click-crash.diff"
\ No newline at end of file |