Date: Wednesday, October 3, 2012 @ 10:35:13
Author: andrea
Revision: 167754
upgpkg: nepomuk-core 4.9.2-2
New version of the patch
Modified:
nepomuk-core/trunk/PKGBUILD
nepomuk-core/trunk/regression-crash.patch
------------------------+
PKGBUILD | 4 +-
regression-crash.patch | 72 +++++++++++++++++++++++++++++++++++++++--------
2 files changed, 62 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-10-03 14:34:12 UTC (rev 167753)
+++ PKGBUILD 2012-10-03 14:35:13 UTC (rev 167754)
@@ -3,7 +3,7 @@
pkgname=nepomuk-core
pkgver=4.9.2
-pkgrel=1
+pkgrel=2
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')
@@ -13,7 +13,7 @@
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
'regression-crash.patch')
sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b'
- 'e6237844c0f9d5838b827068fe768394e0df0cff')
+ 'f49436046cfd98b172a53eeaffb0d5df6bf5e1ee')
build() {
# KDEBUG 307388
Modified: regression-crash.patch
===================================================================
--- regression-crash.patch 2012-10-03 14:34:12 UTC (rev 167753)
+++ regression-crash.patch 2012-10-03 14:35:13 UTC (rev 167754)
@@ -1,19 +1,20 @@
-commit 804e54f83ade8a377d392d350981ead07f60a9d3
-Author: David Faure <faure at kde.org>
-Date: Tue Oct 2 20:27:03 2012 +0200
+From: David Faure <faure at kde.org>
+Date: Tue, 02 Oct 2012 18:27:03 +0000
+Subject: Fix crash when watchUserLimitReached() leads to deleting the KInotify instance
+X-Git-Url: http://quickgit.kde.org/?p=nepomuk-core.git&a=commitdiff&h=804e54f83ade8a377d392d350981ead07f60a9d3
+---
+Fix crash when watchUserLimitReached() leads to deleting the KInotify instance
- Fix crash when watchUserLimitReached() leads to deleting the KInotify instance
-
- ... which emitted the signal. So don't use a direct delete.
-
- BUG: 307388
- FIXED-IN: 4.9.3
+... which emitted the signal. So don't use a direct delete.
-diff --git a/services/filewatch/nepomukfilewatch.cpp b/services/filewatch/nepomukfilewatch.cpp
-index 9fd5d9c..94db504 100644
+BUG: 307388
+FIXED-IN: 4.9.3
+---
+
+
--- a/services/filewatch/nepomukfilewatch.cpp
+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -323,7 +323,8 @@ void Nepomuk2::FileWatch::connectToKDirWatch()
+@@ -323,7 +323,8 @@
void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached()
{
// we do it the brutal way for now hoping with new kernels and defaults this will never happen
@@ -23,3 +24,50 @@
m_dirWatch = 0;
connectToKDirWatch();
}
+
+From: Dan Vrátil <dvratil at redhat.com>
+Date: Wed, 03 Oct 2012 11:27:22 +0000
+Subject: Add null-crash guards for m_dirWatch to FileWatch
+X-Git-Url: http://quickgit.kde.org/?p=nepomuk-core.git&a=commitdiff&h=32b44881dda4f243932c59c11bf39c91f30c224b
+---
+Add null-crash guards for m_dirWatch to FileWatch
+
+BUG: 307388
+---
+
+
+--- a/services/filewatch/nepomukfilewatch.cpp
++++ b/services/filewatch/nepomukfilewatch.cpp
+@@ -114,6 +114,7 @@
+
+ Nepomuk2::FileWatch::FileWatch( QObject* parent, const QList<QVariant>& )
+ : Service( parent )
++ , m_dirWatch( 0 )
+ {
+ // Create the configuration instance singleton (for thread-safety)
+ // ==============================================================
+@@ -324,8 +325,10 @@
+ {
+ // we do it the brutal way for now hoping with new kernels and defaults this will never happen
+ // Delete the KInotify and switch to KDirNotify dbus signals
+- m_dirWatch->deleteLater();
+- m_dirWatch = 0;
++ if( m_dirWatch ) {
++ m_dirWatch->deleteLater();
++ m_dirWatch = 0;
++ }
+ connectToKDirWatch();
+ }
+ #endif
+@@ -413,7 +416,9 @@
+ void Nepomuk2::FileWatch::slotDeviceTeardownRequested(const Nepomuk2::RemovableMediaCache::Entry* entry )
+ {
+ #ifdef BUILD_KINOTIFY
+- m_dirWatch->removeWatch( entry->mountPath() );
++ if( m_dirWatch ) {
++ m_dirWatch->removeWatch( entry->mountPath() );
++ }
+ #endif
+ }
+
+