summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2011-12-12 01:20:17 +0000
committerJonathan Callen <abcd@gentoo.org>2011-12-12 01:20:17 +0000
commit505fbce9ce290916293f9cc95b92e4b90e144723 (patch)
tree7e703566329c1825e8503cf60a18bed390c3197f /kde-base/kontact
parentrm old files (diff)
downloadgentoo-2-505fbce9ce290916293f9cc95b92e4b90e144723.tar.gz
gentoo-2-505fbce9ce290916293f9cc95b92e4b90e144723.tar.bz2
gentoo-2-505fbce9ce290916293f9cc95b92e4b90e144723.zip
rm old files
(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kontact')
-rw-r--r--kde-base/kontact/ChangeLog6
-rw-r--r--kde-base/kontact/files/kontact-4.4.10-asyncako.patch25
2 files changed, 5 insertions, 26 deletions
diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index 2a407e9f1293..f7bd90720385 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-base/kontact/ChangeLog
@@ -1,6 +1,10 @@
# 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.200 2011/12/11 18:52:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.201 2011/12/12 01:20:17 abcd Exp $
+
+ 12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+ -files/kontact-4.4.10-asyncako.patch:
+ rm old files
*kontact-4.7.4 (11 Dec 2011)
diff --git a/kde-base/kontact/files/kontact-4.4.10-asyncako.patch b/kde-base/kontact/files/kontact-4.4.10-asyncako.patch
deleted file mode 100644
index 0558f8c598c0..000000000000
--- a/kde-base/kontact/files/kontact-4.4.10-asyncako.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/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