[arch-commits] Commit in akonadi/repos (10 files)
Andrea Scarpino
andrea at archlinux.org
Tue Oct 4 06:53:59 UTC 2011
Date: Tuesday, October 4, 2011 @ 02:53:59
Author: andrea
Revision: 139641
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
akonadi/repos/extra-i686/PKGBUILD
(from rev 139640, akonadi/trunk/PKGBUILD)
akonadi/repos/extra-i686/akonadi.install
(from rev 139640, akonadi/trunk/akonadi.install)
akonadi/repos/extra-x86_64/PKGBUILD
(from rev 139640, akonadi/trunk/PKGBUILD)
akonadi/repos/extra-x86_64/akonadi.install
(from rev 139640, akonadi/trunk/akonadi.install)
Deleted:
akonadi/repos/extra-i686/PKGBUILD
akonadi/repos/extra-i686/akonadi.install
akonadi/repos/extra-i686/fix-slow-kde-logout.patch
akonadi/repos/extra-x86_64/PKGBUILD
akonadi/repos/extra-x86_64/akonadi.install
akonadi/repos/extra-x86_64/fix-slow-kde-logout.patch
----------------------------------------+
extra-i686/PKGBUILD | 64 +++++++++++++++----------------
extra-i686/akonadi.install | 22 +++++-----
extra-i686/fix-slow-kde-logout.patch | 64 -------------------------------
extra-x86_64/PKGBUILD | 64 +++++++++++++++----------------
extra-x86_64/akonadi.install | 22 +++++-----
extra-x86_64/fix-slow-kde-logout.patch | 64 -------------------------------
6 files changed, 86 insertions(+), 214 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-10-04 06:53:13 UTC (rev 139640)
+++ extra-i686/PKGBUILD 2011-10-04 06:53:59 UTC (rev 139641)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=akonadi
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
-arch=('i686' 'x86_64')
-url='http://pim.kde.org/akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8a78b2f9438ffc36d0f37d55839fb444')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
- make
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
-}
Copied: akonadi/repos/extra-i686/PKGBUILD (from rev 139640, akonadi/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-04 06:53:59 UTC (rev 139641)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=akonadi
+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')
+url='http://pim.kde.org/akonadi'
+license=('LGPL')
+depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
+install="${pkgname}.install"
+source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('07e2aa2e6953ac518f9306911747e264')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
+ make
+}
+
+package() {
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/akonadi.install
===================================================================
--- extra-i686/akonadi.install 2011-10-04 06:53:13 UTC (rev 139640)
+++ extra-i686/akonadi.install 2011-10-04 06:53:59 UTC (rev 139641)
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: akonadi/repos/extra-i686/akonadi.install (from rev 139640, akonadi/trunk/akonadi.install)
===================================================================
--- extra-i686/akonadi.install (rev 0)
+++ extra-i686/akonadi.install 2011-10-04 06:53:59 UTC (rev 139641)
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/fix-slow-kde-logout.patch
===================================================================
--- extra-i686/fix-slow-kde-logout.patch 2011-10-04 06:53:13 UTC (rev 139640)
+++ extra-i686/fix-slow-kde-logout.patch 2011-10-04 06:53:59 UTC (rev 139641)
@@ -1,64 +0,0 @@
-commit c8e45b10c32679bf070af5b7ad9a22b91eb9a02c
-Author: Sergio Martins <iamsergio at gmail.com>
-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();
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-10-04 06:53:13 UTC (rev 139640)
+++ extra-x86_64/PKGBUILD 2011-10-04 06:53:59 UTC (rev 139641)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=akonadi
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
-arch=('i686' 'x86_64')
-url='http://pim.kde.org/akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8a78b2f9438ffc36d0f37d55839fb444')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
- make
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
-}
Copied: akonadi/repos/extra-x86_64/PKGBUILD (from rev 139640, akonadi/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-10-04 06:53:59 UTC (rev 139641)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=akonadi
+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')
+url='http://pim.kde.org/akonadi'
+license=('LGPL')
+depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
+install="${pkgname}.install"
+source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('07e2aa2e6953ac518f9306911747e264')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
+ make
+}
+
+package() {
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/akonadi.install
===================================================================
--- extra-x86_64/akonadi.install 2011-10-04 06:53:13 UTC (rev 139640)
+++ extra-x86_64/akonadi.install 2011-10-04 06:53:59 UTC (rev 139641)
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: akonadi/repos/extra-x86_64/akonadi.install (from rev 139640, akonadi/trunk/akonadi.install)
===================================================================
--- extra-x86_64/akonadi.install (rev 0)
+++ extra-x86_64/akonadi.install 2011-10-04 06:53:59 UTC (rev 139641)
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/fix-slow-kde-logout.patch
===================================================================
--- extra-x86_64/fix-slow-kde-logout.patch 2011-10-04 06:53:13 UTC (rev 139640)
+++ extra-x86_64/fix-slow-kde-logout.patch 2011-10-04 06:53:59 UTC (rev 139641)
@@ -1,64 +0,0 @@
-commit c8e45b10c32679bf070af5b7ad9a22b91eb9a02c
-Author: Sergio Martins <iamsergio at gmail.com>
-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();
-
More information about the arch-commits
mailing list