summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2011-12-12 00:46:46 +0000
committerJonathan Callen <abcd@gentoo.org>2011-12-12 00:46:46 +0000
commit7940e70a98a9dd58429f0c52596dc98982f5f3af (patch)
tree9d87aec4d5ecf1b58c9e5e55d62db432adb5b415 /kde-base/kaddressbook
parentAdd a warning for bug #391193. (diff)
downloadgentoo-2-7940e70a98a9dd58429f0c52596dc98982f5f3af.tar.gz
gentoo-2-7940e70a98a9dd58429f0c52596dc98982f5f3af.tar.bz2
gentoo-2-7940e70a98a9dd58429f0c52596dc98982f5f3af.zip
rm old files
(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kaddressbook')
-rw-r--r--kde-base/kaddressbook/ChangeLog6
-rw-r--r--kde-base/kaddressbook/files/kaddressbook-4.4.10-asyncako.patch27
2 files changed, 5 insertions, 28 deletions
diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 96b1561568d2..ae65fa4e05ed 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kaddressbook
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.203 2011/12/11 18:52:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.204 2011/12/12 00:46:46 abcd Exp $
+
+ 12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+ -files/kaddressbook-4.4.10-asyncako.patch:
+ rm old files
*kaddressbook-4.7.4 (11 Dec 2011)
diff --git a/kde-base/kaddressbook/files/kaddressbook-4.4.10-asyncako.patch b/kde-base/kaddressbook/files/kaddressbook-4.4.10-asyncako.patch
deleted file mode 100644
index ac2acd394c59..000000000000
--- a/kde-base/kaddressbook/files/kaddressbook-4.4.10-asyncako.patch
+++ /dev/null
@@ -1,27 +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/kaddressbook/main.cpp b/kaddressbook/main.cpp
-index 4c8ca42..200f8ec 100644
---- a/kaddressbook/main.cpp
-+++ b/kaddressbook/main.cpp
-@@ -49,11 +49,13 @@ int main( int argc, char **argv )
- MainWindow *window = new MainWindow;
- window->show();
-
-+#if !KDE_IS_VERSION(4,6,0)
- if ( !Akonadi::Control::start( window ) ) {
- //TODO: add message box after string freeze
- kWarning() << "Unable to start Akonadi server, exit application";
- return 1;
- }
-+#endif
-
- return app.exec();
- }