diff options
Diffstat (limited to 'extra/nepomuk-core')
| -rw-r--r-- | extra/nepomuk-core/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/nepomuk-core/fix-crash-on-new-install.patch | 37 |
2 files changed, 3 insertions, 40 deletions
diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index 2aa1f8536..8356e2e5b 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179326 2013-03-05 15:20:29Z andrea $ +# $Id: PKGBUILD 181871 2013-04-05 08:54:13Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.10.1 +pkgver=4.10.2 pkgrel=1 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" @@ -11,7 +11,7 @@ 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") -sha1sums=('23661174669b32b12e7c930d700b08a4f7efd275') +sha1sums=('e17ca2b7eb3b1745806be7576d6340777f4ce0d0') build() { mkdir build diff --git a/extra/nepomuk-core/fix-crash-on-new-install.patch b/extra/nepomuk-core/fix-crash-on-new-install.patch deleted file mode 100644 index 4e921fb52..000000000 --- a/extra/nepomuk-core/fix-crash-on-new-install.patch +++ /dev/null @@ -1,37 +0,0 @@ -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" ); |