[nepomuk-core] proposed patch to fix/workaround isEmpty crash (#858271)

[Rex Dieter]

commit 82f44632f5e0478aea0922ac0027cbbbd1bb7446
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 1 13:10:40 2012 -0500

    proposed patch to fix/workaround isEmpty crash (#858271)

 nepomuk-core-4.9.2-isEmpty_crash.patch |   14 ++++++++++++++
 nepomuk-core.spec                      |   11 ++++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/nepomuk-core-4.9.2-isEmpty_crash.patch b/nepomuk-core-4.9.2-isEmpty_crash.patch
new file mode 100644
index 0000000..f9cb638
--- /dev/null
+++ b/nepomuk-core-4.9.2-isEmpty_crash.patch
@@ -0,0 +1,14 @@
+diff -up nepomuk-core-4.9.2/services/filewatch/nepomukfilewatch.cpp.isEmpty_crash nepomuk-core-4.9.2/services/filewatch/nepomukfilewatch.cpp
+--- nepomuk-core-4.9.2/services/filewatch/nepomukfilewatch.cpp.isEmpty_crash	2012-09-27 19:43:41.000000000 -0500
++++ nepomuk-core-4.9.2/services/filewatch/nepomukfilewatch.cpp	2012-10-01 13:08:47.588285323 -0500
+@@ -322,8 +322,8 @@ void Nepomuk2::FileWatch::connectToKDirW
+ #ifdef BUILD_KINOTIFY
+ void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached()
+ {
+-    // we do it the brutal way for now hoping with new kernels and defaults this will never happen
+-    delete m_dirWatch;
++    // Delete the KInotify and switch to KDirNotify dbus signals
++    m_dirWatch->deleteLater();
+     m_dirWatch = 0;
+     connectToKDirWatch();
+ }
diff --git a/nepomuk-core.spec b/nepomuk-core.spec
index e84d02c..19511f2 100644
--- a/nepomuk-core.spec
+++ b/nepomuk-core.spec
@@ -9,7 +9,7 @@
 
 Name:    nepomuk-core
 Version: 4.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Nepomuk Core utilities and libraries
 
 License: LGPLv2 or LGPLv3
@@ -23,6 +23,10 @@ URL:     http://www.kde.org/
 %endif
 Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstream patches
+# proposed by dfaure, should help fix http://bugzilla.redhat.com/858271
+Patch100: nepomuk-core-4.9.2-isEmpty_crash.patch
+
 BuildRequires:  doxygen
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  pkgconfig
@@ -64,6 +68,8 @@ Requires: %{name} = %{version}-%{release}
 %prep
 %setup -q
 
+%patch100 -p1 -b .isEmpty_crash
+
 
 %build
 mkdir -p %{_target_platform}
@@ -124,6 +130,9 @@ make -C %{_target_platform}/autotests/test test  ||:
 
 
 %changelog
+* Mon Oct 01 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.2-2
+- proposed patch to fix/workaround isEmpty crash (#858271)
+
 * Fri Sep 28 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.2-1
 - 4.9.2