- up to 4.4.11.1

Changed files:
    kde4-kdepim.spec -> 1.162
    kdepim-akonadi.patch -> 1.2

diff --git a/kde4-kdepim.spec b/kde4-kdepim.spec
index cbc5d7b9ed485f312e3aa3b4a6eb5c9358280641..0945b726e27666cb8e8a91e06339c9f45f2c66d3 100644 (file)
--- a/kde4-kdepim.spec
+++ b/kde4-kdepim.spec
@@ -7,16 +7,15 @@ Summary(pl.UTF-8):    Zarządca informacji osobistej (PIM) dla KDE
 Summary(ru.UTF-8):     Персональный планировщик (PIM) для KDE
 Summary(uk.UTF-8):     Персональный планувальник (PIM) для KDE
 Name:          kde4-kdepim
-Version:       4.4.10
-Release:       3
+Version:       4.4.11.1
+Release:       1
 License:       GPL
 Group:         X11/Applications
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/kdepim-%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: c32690ed08a3eeb7010a2a0eefbf6f4c
+# Source0-md5: 2b91b3b4c3bff05802b24dae87c6f54c
 Patch100:      %{name}-branch.diff
 # http://mirrors.ludost.net/gentoo/distfiles/kleopatra-4.4.3-assuan2.patch.bz2
 Patch0:                kleopatra-4.4.3-assuan2.patch
-Patch1:                kdepim-akonadi.patch
 URL:           http://www.kde.org/
 BuildRequires: Qt3Support-devel >= %{qtver}
 BuildRequires: QtDesigner-devel >= %{qtver}
@@ -674,7 +673,6 @@ libksieve, libmimelib.
 %setup -q -n %{orgname}-%{version}
 #%patch100 -p0
 %patch0 -p0
-%patch1 -p1
 
 %build
 install -d build

diff --git a/kdepim-akonadi.patch b/kdepim-akonadi.patch
deleted file mode 100644 (file)
index bc01411..0000000
--- a/kdepim-akonadi.patch
+++ /dev/null
@@ -1,87 +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();
- }
-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/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