Date: Tuesday, October 4, 2011 @ 02:53:13 Author: andrea Revision: 139640
upgpkg: akonadi 1.6.2-1 upstream release Modified: akonadi/trunk/PKGBUILD Deleted: akonadi/trunk/fix-slow-kde-logout.patch ---------------------------+ PKGBUILD | 4 +- fix-slow-kde-logout.patch | 64 -------------------------------------------- 2 files changed, 2 insertions(+), 66 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-10-04 00:28:38 UTC (rev 139639) +++ PKGBUILD 2011-10-04 06:53:13 UTC (rev 139640) @@ -3,7 +3,7 @@ # Contributor: Pierre Schmitz <[email protected]> pkgname=akonadi -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2";) -md5sums=('8a78b2f9438ffc36d0f37d55839fb444') +md5sums=('07e2aa2e6953ac518f9306911747e264') build() { cd "${srcdir}" Deleted: fix-slow-kde-logout.patch =================================================================== --- fix-slow-kde-logout.patch 2011-10-04 00:28:38 UTC (rev 139639) +++ fix-slow-kde-logout.patch 2011-10-04 06:53:13 UTC (rev 139640) @@ -1,64 +0,0 @@ -commit c8e45b10c32679bf070af5b7ad9a22b91eb9a02c -Author: Sergio Martins <[email protected]> -Date: Mon Sep 12 13:48:33 2011 +0100 - - Fix crash on agent_launcher exit. - - Don't unload plugins here. They will be unloaded on application exit, - so it's redundant. - - Seems they are being unloaded too early, before QThreadStorage - cleanup occurs: - - ==18802== Invalid read of size 8 - ==18802== at 0x53178AE: QThreadStorage<QFontCache*>::deleteData(void*) (in - /data/installation/qt/qt-4.7/lib/libQtGui.so.4.7.1) - ==18802== by 0x5E8F8CF: QThreadStorageData::set(void*) - (qthreadstorage.cpp:165) - ==18802== by 0x5317940: void - qThreadStorage_setLocalData<QFontCache>(QThreadStorageData&, QFontCache**) - (qthreadstorage.h:92) - ==18802== by 0x53165BA: - QThreadStorage<QFontCache*>::setLocalData(QFontCache*) (qthreadstorage.h:148) - ==18802== by 0x531407A: QFontCache::cleanup() (qfont.cpp:2632) - ==18802== by 0x5406536: QFont::cleanup() (qfont_x11.cpp:182) - ==18802== by 0x5104E35: qt_cleanup() (qapplication_x11.cpp:2647) - ==18802== by 0x50603B2: QApplication::~QApplication() - (qapplication.cpp:1172) - ==18802== by 0x41B1F6: main (agentlauncher.cpp:28) - ==18802== Address 0x11a090b0 is not stack'd, malloc'd or (recently) free'd - - CCBUG: 261788 - -diff --git a/agentserver/agentpluginloader.cpp b/agentserver/agentpluginloader.cpp -index 2d62d3b..456a124 100644 ---- a/agentserver/agentpluginloader.cpp -+++ b/agentserver/agentpluginloader.cpp -@@ -25,13 +25,8 @@ using namespace Akonadi; - - AgentPluginLoader::~AgentPluginLoader() - { -- QHash<QString, QPluginLoader*>::iterator it = m_pluginLoaders.begin(); -- while ( it != m_pluginLoaders.end() ) { -- it.value()->unload(); -- ++it; -- } -- - qDeleteAll( m_pluginLoaders ); -+ m_pluginLoaders.clear(); - } - - QPluginLoader *AgentPluginLoader::load( const QString &pluginName ) -diff --git a/agentserver/agentpluginloader.h b/agentserver/agentpluginloader.h -index 77f5de9..c8c815f 100644 ---- a/agentserver/agentpluginloader.h -+++ b/agentserver/agentpluginloader.h -@@ -26,7 +26,7 @@ class AgentPluginLoader - { - public: - /** -- Unloads and deletes all instantiated QPluginLoaders. -+ Deletes all instantiated QPluginLoaders. - */ - ~AgentPluginLoader(); -
