diff options
| author | root <root@rshg054.dnsready.net> | 2013-02-26 00:04:24 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-02-26 00:04:24 -0800 |
| commit | 6c56414fe7bf470adb65cbd5ece3dce77ea9c617 (patch) | |
| tree | 4190641f9a1d00a142902d10b7fbc068751e3821 /extra/nepomuk-core | |
| parent | 099ae9e11de65606b67c6344d4f62fcd74f20a36 (diff) | |
Tue Feb 26 00:04:24 PST 2013
Diffstat (limited to 'extra/nepomuk-core')
| -rw-r--r-- | extra/nepomuk-core/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/nepomuk-core/fix-crash-on-new-install.patch | 37 |
2 files changed, 44 insertions, 4 deletions
diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index d54b48cce..d77cfbd93 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178513 2013-02-24 20:21:43Z eric $ +# $Id: PKGBUILD 178526 2013-02-25 10:11:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core pkgver=4.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" arch=('i686' 'x86_64') @@ -11,13 +11,16 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'fix-recursive-indexing.patch') + 'fix-recursive-indexing.patch' + 'fix-crash-on-new-install.patch') sha1sums=('affc4d3063db773e5b05ff746a4c64adbec29264' - 'faa0f661fe642af01ac72eda7347dfc659e091e1') + 'faa0f661fe642af01ac72eda7347dfc659e091e1' + '5e3b84f0d0f8a868d4aafedf0f3c7ab631ee4263') build() { cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/fix-recursive-indexing.patch + patch -p1 -i "${srcdir}"/fix-crash-on-new-install.patch cd ../ mkdir build diff --git a/extra/nepomuk-core/fix-crash-on-new-install.patch b/extra/nepomuk-core/fix-crash-on-new-install.patch new file mode 100644 index 000000000..4e921fb52 --- /dev/null +++ b/extra/nepomuk-core/fix-crash-on-new-install.patch @@ -0,0 +1,37 @@ +commit b94e9f73bd86593928988e5626511acea805b7be +Author: Edward Toroshchin <kde@hades.name> +Date: Sun Feb 3 17:57:23 2013 +0100 + + fileindexer: initialize objects in correct order + + The IndexCleaner job created in IndexScheduler could complete before + m_eventMonitor is initialized, which leads to crash in slotCleaningDone. + + REVIEW: 108754 + +diff --git a/services/fileindexer/indexscheduler.cpp b/services/fileindexer/indexscheduler.cpp +index a13de1b..3ad7819 100644 +--- a/services/fileindexer/indexscheduler.cpp ++++ b/services/fileindexer/indexscheduler.cpp +@@ -51,10 +51,6 @@ Nepomuk2::IndexScheduler::IndexScheduler( QObject* parent ) + QFile::remove(KStandardDirs::locateLocal("data", QLatin1String("nepomuk/file-indexer-error-log"))); + } + +- m_cleaner = new IndexCleaner(this); +- connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) ); +- m_cleaner->start(); +- + FileIndexerConfig* indexConfig = FileIndexerConfig::self(); + connect( indexConfig, SIGNAL(includeFolderListChanged(QStringList,QStringList)), + this, SLOT(slotIncludeFolderListChanged(QStringList,QStringList)) ); +@@ -106,6 +102,10 @@ Nepomuk2::IndexScheduler::IndexScheduler( QObject* parent ) + connect( m_eventMonitor, SIGNAL(powerManagementStatusChanged(bool)), + this, SLOT(slotScheduleIndexing()) ); + ++ m_cleaner = new IndexCleaner(this); ++ connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) ); ++ m_cleaner->start(); ++ + // Special settings for the queues + KConfig config( "nepomukstrigirc" ); + KConfigGroup cfg = config.group( "Indexing" ); |