diff options
| -rw-r--r-- | kde-base/kmail/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/kmail/Manifest | 32 | ||||
| -rw-r--r-- | kde-base/kmail/files/kmail-4.4.10-asyncako.patch | 53 | ||||
| -rw-r--r-- | kde-base/kmail/kmail-4.4.10-r1.ebuild | 84 |
4 files changed, 161 insertions, 16 deletions
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog index 6d79db60e9f8..f71274c1e6ba 100644 --- a/kde-base/kmail/ChangeLog +++ b/kde-base/kmail/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kmail # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.242 2011/03/24 23:59:13 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.243 2011/04/06 07:40:14 dilfridge Exp $ + +*kmail-4.4.10-r1 (06 Apr 2011) + + 06 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org> + +kmail-4.4.10-r1.ebuild, +files/kmail-4.4.10-asyncako.patch: + Start akonadi asynchronously on kde-4.6, bug 362199 24 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kmail-4.4.5.ebuild: diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest index 1c148ed478a6..b1b94f442592 100644 --- a/kde-base/kmail/Manifest +++ b/kde-base/kmail/Manifest @@ -1,27 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 +AUX kmail-4.4.10-asyncako.patch 1627 RMD160 9deb7f97cfe6d72d96f09f7456457911d813d030 SHA1 fe7cd7fce8b1d61f7aca442229e40d142acac1cb SHA256 a99241b70730b329e2a3d00cfa2bcd782dbe910e213bfa82a840eb427df59d2f AUX kmail-4.4.9-nodbus.patch 3922 RMD160 3bca508b6b8934a1c5f0e84788f7fab5f382b143 SHA1 18e8579fafce9c0685b7285c0acfe40c56834a93 SHA256 c70b1ca83ec89cc66c77e45d68632b412bbdbf0ec6bf989cb7674461ae114e68 DIST kdepim-4.4.10.tar.bz2 9071402 RMD160 bbdb5f1ecfef5fa94241c2055255433322ae57a5 SHA1 b9c45e80dddc3bff201df6ddd76fdf4f1f18d5c3 SHA256 9e1770cb8d4bf1f95c3a2006877e7b49bc2a641591c990d07411d7424ea33099 DIST kdepim-4.4.9.tar.bz2 9084259 RMD160 d11b5090bdf27c3ffd4558d9c3e6cd30aa6a7e88 SHA1 efe91c4309fb09f49c816a6557a157170c8f0360 SHA256 28a3e60118efb86822fb5376ee29359e509737d8339fa91d8a4da950a6b1215f +EBUILD kmail-4.4.10-r1.ebuild 1792 RMD160 f6fff5f8c155d9b6c28cdddbb8ecf74e187a0e34 SHA1 375ab9ab96c338eab29a9680c1641accfa5bbd37 SHA256 683efbf5555bf63b75d2e0210e1f8eee3725c53122a5e2cdee51ee620df35d92 EBUILD kmail-4.4.10.ebuild 1743 RMD160 94b42d3986fe926ca2b5f683260ad8d28292fac5 SHA1 3576e8fa7f5736cf6cc8b5cf69da0d4268f687ba SHA256 cc5b227e6eb0cef8f890c46963e6826d704d3f377fd20c9963c02b8b503a24d1 EBUILD kmail-4.4.9.ebuild 1731 RMD160 0289f87c9834d00a472687724faeeeaeab182afa SHA1 4ad270666949efc554cdba840dc875446e45db11 SHA256 8b742fe2a7df9157c42ddc85323361581c9ff4c9c9e9738be9fe8247593ebbf2 -MISC ChangeLog 31909 RMD160 c11966ef600cce542d373c8766e7569a778a9673 SHA1 5eb98ac05ab9bc5185da16e4c7dec289b5465f21 SHA256 3d5552faa39da2e25456a7f8c4ed863b2cd2087c6fb2678eaae3aabcb35a63f6 +MISC ChangeLog 32116 RMD160 6ab63a72613d65382028890c487795e63d1f6efc SHA1 b47c0eb43f7bfb95a5932664d53b8c3f87412bb0 SHA256 5021eef31746bb00d734dafd27bfb7dac39b1a60ed5422d5f359b1388b05b7c0 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJNi9rqAAoJENwGBM22xffeS2IP/RWYdM2uR9Fj7XyqKjs+ef29 -Fx8GVuGXqZgdfxxtaI59SvdCxt0SbLQ4gWlhXXEZlsNGHVr5/wB+QLq27aGljQTA -kX3qbx36KJbXws/L0r1razkCuzv50rELPvl8BB12MwavPcvIGGDgowNhRWHYSzso -jdlmgxhBeY0NMRyjSEwrbOZFG3unx4kFb1uJZMNWNoSrVfdiOn+mzfoUEdzPV8vr -YnsXsIRx1nhoUqyGeP9tgSsatwsuWmzUKzV4DDYZKadMKrtQvm0wz7rxx+dRW1En -Rl890HtgAKHBbbjY/0UDFfdFYCVGU+NOeL8fn4rR21/UEBjUzXDftQHrP9E96Eak -f7zaT2CwqbC9BNs8x8wK2LZR1/pS3RBK7iIVLc4MRTzJZrlo69bnfGHtWhALq/AH -R88ZnvbM5fJaZMmBICskHqXkTDbaBbgC2wOR1QjpgCCkoJz0frPTtU7OK7U52JgI -y8aEeKzCWNo5pWzcNlg3/O32ESxcyZZxgWBcMP9f+bTIzukXwZbY7tK7PVtvYrav -12MZ6qQ7f8xvNjEwC/6em/3jFWXvbTxO4DoQ5ZwzbonwaLE6mQ2awb4+F/IHtNrl -bVzwR9P9GqasBkabAGv292vTTB+Ct0KS/dwvYFVPOOyT3J076CziT956nzVchFeI -e0x2F33RV2fFysEWSOdz -=FI5P +iQIcBAEBCgAGBQJNnBmcAAoJENwGBM22xffe+mQQAKRIvqku7SAltsabE49U4N+L +sDzZLei6Q97I5b6UujH4iPVH3DlCHe/rt3oR78tGlE6WLv6jqUS2Evi09NmhT7OD +yqXBfzYBHxHO9lfXxytB0kv5u4wqGQsuVwO5gg3OH362a0lU4OotFmczEc1C4q/s +QXqRWtTIciT70nX0lU1CD7iIRsBXEccrbMHqn5VLA53ZDxWMbsz1A7P5P+2hD6pm +jvrJdvwRdzRE/we9JD4L6YlMWdfWaQrVl9hdAyB8CjZnkmlDZBNhbYT9g6Ci1dl4 ++Elk7hEZDtlaBFUA2nzIIihtn1Zw/eyepTl7irOE7R5+lq4EfLUez0xw+wV5QBZh +QBDJ+vywp1z9m8rpq+5Z64PO59dXPcWIg9nUeMSl0aFVwlRIyzp58qvN8MoniDni +FETAiYqa65WhAXOF6KmfhBwuc6Z6pIW51nixA5TZOIC2FBrBHBTf2h+uziUUBeth +ePT3/R7GPSnVnIBBr/irlgRPc03DJohbYUQAYtDLRpyMMID/cirVPoyI8mekzFt7 +yhgHCEuk+9nNZcDl8b5MpEtxWMiU+2B/xoYBg4Z6kOlwDT+1ExrVaROmuZgRMJTA +xH9YJt3899AJkITNdPy0ye5/TkG1AKOdoU+qnUsty43sFUd75w+7xKy97UR2U140 +nRcC4SLJ6pPa/zxhwDZI +=vI7j -----END PGP SIGNATURE----- diff --git a/kde-base/kmail/files/kmail-4.4.10-asyncako.patch b/kde-base/kmail/files/kmail-4.4.10-asyncako.patch new file mode 100644 index 000000000000..b8c07165de72 --- /dev/null +++ b/kde-base/kmail/files/kmail-4.4.10-asyncako.patch @@ -0,0 +1,53 @@ +commit cfa404b7188e4c26bddbc9579728f6d25f8cd214 +Author: Stephen Kelly <steveire@gmail.com> +Date: Tue Apr 5 11:09:43 2011 +0200 + + Start kdepim 4.4 asynchronously if built against 4.6. + + The synchronous mechanism doesn't have enough time to start + before it reports failure. + +diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp +index a31973a..10b14e4 100644 +--- a/kmail/kmmainwidget.cpp ++++ b/kmail/kmmainwidget.cpp +@@ -165,6 +165,9 @@ using KMail::TemplateParser; + + #include <errno.h> // ugh + ++#include <akonadi/control.h> ++#include <akonadi/servermanager.h> ++ + #include "kmmainwidget.moc" + + K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList ) +@@ -186,6 +189,10 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient, + mVacationIndicatorActive( false ), + mGoToFirstUnreadMessageInSelectedFolder( false ) + { ++#if KDE_IS_VERSION(4,6,0) ++ Akonadi::Control::widgetNeedsAkonadi(this); ++ Akonadi::ServerManager::start(); ++#endif + // must be the first line of the constructor: + mStartupDone = false; + mWasEverShown = false; +diff --git a/kmail/main.cpp b/kmail/main.cpp +index f39ca5f..c2dd1c3 100644 +--- a/kmail/main.cpp ++++ b/kmail/main.cpp +@@ -145,12 +145,14 @@ int main(int argc, char *argv[]) + app.setEventLoopReached(); + app.delayedInstanceCreation(); + ++#if !KDE_IS_VERSION(4,6,0) + // Start Akonadi + if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) { + //TODO: add message box after string freeze + kWarning() << "Unable to start Akonadi server, exit application"; + return 1; + } ++#endif + + // Go! + int ret = qApp->exec(); diff --git a/kde-base/kmail/kmail-4.4.10-r1.ebuild b/kde-base/kmail/kmail-4.4.10-r1.ebuild new file mode 100644 index 000000000000..8d5c3bfff122 --- /dev/null +++ b/kde-base/kmail/kmail-4.4.10-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.10-r1.ebuild,v 1.1 2011/04/06 07:40:14 dilfridge Exp $ + +EAPI="3" + +KMNAME="kdepim" +VIRTUALX_REQUIRED=test +inherit kde4-meta + +DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE." +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug +handbook" + +DEPEND=" + $(add_kdebase_dep kdelibs 'semantic-desktop') + $(add_kdebase_dep kdepimlibs 'semantic-desktop') + $(add_kdebase_dep libkdepim) + $(add_kdebase_dep libkleo) + $(add_kdebase_dep libkpgp) +" +RDEPEND="${DEPEND} + $(add_kdebase_dep kdepim-runtime) +" + +add_blocker kmailcvt +add_blocker libksieve +add_blocker messagecore +add_blocker messagelist +add_blocker messageviewer +add_blocker mimelib + +KMEXTRACTONLY=" + korganizer/org.kde.Korganizer.Calendar.xml + libkleo/ + libkpgp/ +" +KMEXTRA=" + kmailcvt/ + ksendemail/ + libksieve/ + messagecore/ + messagelist/ + messageviewer/ + mimelib/ + plugins/kmail/ +" +KMLOADLIBS="libkdepim" + +PATCHES=( + "${FILESDIR}/${PN}-4.4.9-nodbus.patch" + "${FILESDIR}/${PN}-4.4.10-asyncako.patch" +) + +src_configure() { + # Bug 308903 + use ppc64 && append-flags -mminimal-toc + + mycmakeargs=( + -DWITH_IndicateQt=OFF + ) + + kde4-meta_src_configure +} + +src_compile() { + kde4-meta_src_compile kmail_xml + kde4-meta_src_compile +} + +pkg_postinst() { + kde4-meta_pkg_postinst + + if ! has_version kde-base/kdepim-kresources:${SLOT}; then + echo + elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}" + echo + fi + if ! has_version kde-base/kleopatra:${SLOT}; then + echo + elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}" + echo + fi +} |