[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD regression-crash.patch)

[Andrea Scarpino]

    Date: Tuesday, November 6, 2012 @ 08:29:52
  Author: andrea
Revision: 170350

KDE 4.9.3

Modified:
  nepomuk-core/trunk/PKGBUILD
Deleted:
  nepomuk-core/trunk/regression-crash.patch

------------------------+
 PKGBUILD               |   15 ++-------
 regression-crash.patch |   73 -----------------------------------------------
 2 files changed, 4 insertions(+), 84 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-06 13:29:48 UTC (rev 170349)
+++ PKGBUILD	2012-11-06 13:29:52 UTC (rev 170350)
@@ -2,25 +2,18 @@
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=nepomuk-core
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+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"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'regression-crash.patch')
-sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b'
-          'f49436046cfd98b172a53eeaffb0d5df6bf5e1ee')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('d235f033206fdd6d0dbad63143bfa89dde99b19d')
 
 build() {
-  # KDEBUG 307388
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/regression-crash.patch
-  cd ../
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \

Deleted: regression-crash.patch
===================================================================
--- regression-crash.patch	2012-11-06 13:29:48 UTC (rev 170349)
+++ regression-crash.patch	2012-11-06 13:29:52 UTC (rev 170350)
@@ -1,73 +0,0 @@
-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
-
-... which emitted the signal. So don't use a direct delete.
-
-BUG: 307388
-FIXED-IN: 4.9.3
----
-
-
---- a/services/filewatch/nepomukfilewatch.cpp
-+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -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
--    delete m_dirWatch;
-+    // Delete the KInotify and switch to KDirNotify dbus signals
-+    m_dirWatch->deleteLater();
-     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
- }
- 
-