From a80de62439d143105b92e2b87ea4de520154e634 Mon Sep 17 00:00:00 2001 From: Andreas Hüttel Date: Wed, 6 Apr 2011 07:45:26 +0000 Subject: Start akonadi asynchronously on kde-4.6, bug 362199 Package-Manager: portage-2.1.9.45/cvs/Linux x86_64 --- kde-base/kontact/ChangeLog | 8 +++- kde-base/kontact/Manifest | 32 +++++++------ .../kontact/files/kontact-4.4.10-asyncako.patch | 25 ++++++++++ kde-base/kontact/kontact-4.4.10-r1.ebuild | 54 ++++++++++++++++++++++ 4 files changed, 103 insertions(+), 16 deletions(-) create mode 100644 kde-base/kontact/files/kontact-4.4.10-asyncako.patch create mode 100644 kde-base/kontact/kontact-4.4.10-r1.ebuild (limited to 'kde-base/kontact') diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog index 3f97e4949c95..95b1f4899b1a 100644 --- a/kde-base/kontact/ChangeLog +++ b/kde-base/kontact/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kontact # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.177 2011/03/24 23:59:14 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.178 2011/04/06 07:45:26 dilfridge Exp $ + +*kontact-4.4.10-r1 (06 Apr 2011) + + 06 Apr 2011; Andreas K. Huettel + +kontact-4.4.10-r1.ebuild, +files/kontact-4.4.10-asyncako.patch: + Start akonadi asynchronously on kde-4.6, bug 362199 24 Mar 2011; Andreas K. Huettel -kontact-4.4.5.ebuild: diff --git a/kde-base/kontact/Manifest b/kde-base/kontact/Manifest index e70834c77d1e..3df702c7a860 100644 --- a/kde-base/kontact/Manifest +++ b/kde-base/kontact/Manifest @@ -1,26 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 +AUX kontact-4.4.10-asyncako.patch 893 RMD160 eba1f4bffcfca8e9169e72a506fa4b6d4642658d SHA1 fad2b3b935a8531ca57ede97ef86f0c817b59fcf SHA256 5d7752db001ba0bd59e82a2a75b10c43aab15ce3c0c787e219e1a29df176d619 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 kontact-4.4.10-r1.ebuild 1275 RMD160 adc8da58db7ea1f80f40c14cc5005318ec4ad153 SHA1 f7dd7a9d93e2052870b88d40f56460246e77d0a0 SHA256 132c2e444ad885562d24d064631907e0b332b945622ce156f4ef61961b3fbef3 EBUILD kontact-4.4.10.ebuild 1225 RMD160 9900c202b06b9862bedbdfff6369b5914a0af247 SHA1 834bd8e0c581748a3b04864e9a400db92c62238b SHA256 c86c9720f80125f9212cb0516c4d089e16fd928d5bf3807adaa6447a69ca67b3 EBUILD kontact-4.4.9.ebuild 1218 RMD160 19c6d147d341122e20311b32e5521b018975598f SHA1 82c032b23b69da64aa3e05a4d8259483ea9fa621 SHA256 9c614b667f490cef85a42c423e766d46d2ad50e71e7d9638ec265b54d79e0ac6 -MISC ChangeLog 21206 RMD160 f73a793518da87217a022fd41daedea80d9a7e7c SHA1 01fcb52f42c419aa5b70f3af47f1b7d13b8e019a SHA256 c9a7de3ef07d0f278abb591d1b8a69f58cfef343ef465ddad876f453353d2c73 +MISC ChangeLog 21419 RMD160 874edcb85fe771fc2e3ff7d380d5ab9f3ffe250e SHA1 4a473a2381b45c35f70b8f60ba7de73de6367545 SHA256 aa5416e195c1fe51620e2a4642d30062928fc5f61c6cb7121b7d425e58587735 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJNi9rsAAoJENwGBM22xffecIMP/R7UuoqeOAFGDunjEgJy3Oce -qwiMNklx7Y6Y3NFMwdCqhrH0KMiZ0yB3TZ6m4qf4jAgtoJaib34PnSIq8YGgPzNe -ZQb105oahmBanKTW8+ZcSWJj0w3S44a0YH1NIUOZthQZpqhr/dEDMranpauo1521 -u5IZOSbnxsf+mAgttewmkeFNe8zVTMaWrzbwBeJHYfcXXEyU+84WCGYjTbRRFC3o -QSJh68Wzq0J0emgu1KbNTPUf/jsQbs6TeHQW3QM2b++LxuWg3k5J6x9K4As+BPty -Mu3Ez6WNAX0LypWYbeFbcYTf+ViasPUQbU+o6AVSP9BBPNneUGprN26XDKPPGiGE -oh4S7rhx2ip8Z90XjahjjVemLVz761a6q2So9OaYdA/LyPfS+PntKe24ViomYoyw -DxLkAlQ3Zv2Y65ZeGrpF/0aAHhQmfBSREM/wPlmCIAHlEkKi4T4LcW3Xc/ywMXm0 -e9vros63YDMo9mO/pSgx9Z31mPP5qNaZfxjOfLJIxtbNXxduT9+RgZ9DuD2jnPKx -Hxn+YO7iMANJ6U/WrpvhG/KW6mN6yCvNVFGwoSk903gn5WUUMpvNZFPFg10ZRJvo -6MSMylJQTKuPnYzaUf51+Bi1SFQP3p0dQJBrMcWr7hGPUlHNXXryr/BGA2CMOEg/ -A7YsDzK9m5QDsno5sZBW -=Bnb9 +iQIcBAEBCgAGBQJNnBrUAAoJENwGBM22xffeIo4P/1thLfiHbZ8ATVn4xrKuqnJ+ +3Kgo4sTFX2XrgziezhaTSD1KfNH1tFnSOUWKLqO1aEUeDoeZpgPwH/XLh9c/v7XM +o8KmG7MyeU+kTjio4fmWXwBK0rQj5AwkI7MDLVW4fLNUr5Iy75hTQQW7fMoCOC5n +izYK8aZRc9YndDb5MSJeiFk8Dy6vslaXaKQQHSH0Dm2VAlLAjybOzOtR9DBrXtu9 +8CJaF9EnT8ckpFI57RiHmXJv3D5fbAxHoCJ7P1h1DF5h+9+q4KU2OyvtStvae+R/ +Wrn+4NrBjinO5j88PZyCudqNhiJO6ZRB8ScVKLoKKjDiCKBIMzL0B5bRx/alo0Yk +sVPYrV9QbCVKDDDUhrbhY0k2PqBLssft1FDuTZ884T7H7olcYawC7JtUitRnUejr +SAOJJ0fiUVHboYy+OQEx8HsDJ3G9/xvCLSfzeQ6ew5M/dJaW26Xxg0id2zjsGO9P +J1tzaYKiBBObIV5NwYc9JLfMxBLnlwPM59KFDLgtztq+tip9bqX6f7MR5wI8hkap +JiFq3Oo1cETmk63atjQCyNhgUFyV1TwcKEEvuSQ8cNyVEUMYKVbjfyqirmAkgSmb +KCj+ZLv6Cyxk4iXZouec9NnjKU/FeecOynYfFr8e2mHWTLQUxNnCpzdEAjTfuz1u +AsYRiJW/XuEqH4ZN2fDF +=sd/s -----END PGP SIGNATURE----- diff --git a/kde-base/kontact/files/kontact-4.4.10-asyncako.patch b/kde-base/kontact/files/kontact-4.4.10-asyncako.patch new file mode 100644 index 000000000000..0558f8c598c0 --- /dev/null +++ b/kde-base/kontact/files/kontact-4.4.10-asyncako.patch @@ -0,0 +1,25 @@ +commit cfa404b7188e4c26bddbc9579728f6d25f8cd214 +Author: Stephen Kelly +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/kontact/src/main.cpp b/kontact/src/main.cpp +index 356aa57..cb4a235 100644 +--- a/kontact/src/main.cpp ++++ b/kontact/src/main.cpp +@@ -199,9 +199,11 @@ int main( int argc, char **argv ) + + KontactApp app; + ++#if !KDE_IS_VERSION(4,6,0) + // KDE 4.4: do akonadi startup before creating any window, since creating + // the window loads kmail. In 4.5 we'll do this startup async instead. + Akonadi::Control::start( 0 ); ++#endif + + // Qt doesn't treat the system tray as a window, and therefore Qt would quit + // the event loop when an error message is clicked away while Kontact is in the diff --git a/kde-base/kontact/kontact-4.4.10-r1.ebuild b/kde-base/kontact/kontact-4.4.10-r1.ebuild new file mode 100644 index 000000000000..fade83bfb1b0 --- /dev/null +++ b/kde-base/kontact/kontact-4.4.10-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.4.10-r1.ebuild,v 1.1 2011/04/06 07:45:26 dilfridge Exp $ + +EAPI="3" + +KMNAME="kdepim" +inherit kde4-meta + +DESCRIPTION="KDE personal information manager" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug +handbook" + +DEPEND=" + $(add_kdebase_dep kdepimlibs) + $(add_kdebase_dep libkdepim) +" +RDEPEND="${DEPEND} + $(add_kdebase_dep kdepim-runtime) +" + +PATCHES=( "${FILESDIR}/${P}"-asyncako.patch ) + +KMLOADLIBS="libkdepim" +KMSAVELIBS="true" + +# We remove plugins that are related to external kdepim programs. This way +# kontact doesn't have to depend on all programs it has plugins for. +# kcontactmanager gone from kdesvn +# +# xml targets from kmail/ are being uncommented by kde4-meta.eclass +KMEXTRACTONLY=" + kmail/ + kontact/plugins/akregator/ + kontact/plugins/kaddressbook/ + kontact/plugins/kjots/ + kontact/plugins/kmail/ + kontact/plugins/knode/ + kontact/plugins/knotes/ + kontact/plugins/korganizer/ + kontact/plugins/ktimetracker/ + kontact/plugins/planner/ + kontact/plugins/specialdates/ +" + +src_unpack() { + if use handbook; then + KMEXTRA+=" + doc/kontact-admin/ + " + fi + + kde4-meta_src_unpack +} -- cgit v1.2.3-65-gdbad