From 270c1ba7053478dbd1c632eea18d6e54d51e4ecc Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 22 Dec 2014 15:03:24 +0100 Subject: KDE 4.7.4 for Slackware 13.37 (06dec2011) --- deps/akonadi/akonadi.agentpluginloader.diff | 64 ----------------------------- 1 file changed, 64 deletions(-) delete mode 100644 deps/akonadi/akonadi.agentpluginloader.diff (limited to 'deps/akonadi/akonadi.agentpluginloader.diff') diff --git a/deps/akonadi/akonadi.agentpluginloader.diff b/deps/akonadi/akonadi.agentpluginloader.diff deleted file mode 100644 index 49228ef..0000000 --- a/deps/akonadi/akonadi.agentpluginloader.diff +++ /dev/null @@ -1,64 +0,0 @@ -commit c8e45b10c32679bf070af5b7ad9a22b91eb9a02c -Author: Sergio Martins -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::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(QThreadStorageData&, QFontCache**) - (qthreadstorage.h:92) - ==18802== by 0x53165BA: - QThreadStorage::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::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(); - -- cgit v1.2.3