[gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/

["Dennis Schridde" <devurandom@gmx.net>]

commit:     ca56132cd123b061963b6f19aa099e557edd4080
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Mon Aug  6 20:40:29 2012 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Mon Aug  6 20:40:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ca56132c

[kde-base/nepomuk-core-4.9.0-r1] Fix for KDE bug #304476 - nepomukfilewatch memleak

Bug: 430226
KDE-Bug: 304476

---
 ...notify-do-not-store-the-paths-to-be-added.patch |   80 ++++++++++++++++++++
 kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild |   28 +++++++
 2 files changed, 108 insertions(+), 0 deletions(-)

diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-do-not-store-the-paths-to-be-added.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-do-not-store-the-paths-to-be-added.patch
new file mode 100644
index 0000000..7c2cff2
--- /dev/null
+++ b/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-do-not-store-the-paths-to-be-added.patch
@@ -0,0 +1,80 @@
+diff --git a/services/filewatch/kinotify.cpp b/services/filewatch/kinotify.cpp
+index e8843c8..5e6ff05 100644
+--- a/services/filewatch/kinotify.cpp
++++ b/services/filewatch/kinotify.cpp
+@@ -79,8 +79,8 @@ public:
+     QHash<int, QByteArray> watchPathHash;
+     QHash<QByteArray, int> pathWatchHash;
+ 
+-    /// queue of paths to install watches for
+-    QQueue<QByteArray> pathsToWatch;
++    /// A list of all the current dirIterators
++    QQueue<QDirIterator*> dirIterators;
+ 
+     unsigned char eventBuffer[EVENT_BUFFER_SIZE];
+ 
+@@ -136,20 +136,6 @@ public:
+         }
+     }
+ 
+-    bool addWatchesRecursively( const QByteArray& path )
+-    {
+-        if ( !addWatch( path ) )
+-            return false;
+-
+-        const QString stringPath = QFile::decodeName(path);
+-        QDirIterator iter( stringPath, QDir::Dirs | QDir::NoDotAndDotDot );
+-        while( iter.hasNext() ) {
+-            pathsToWatch.enqueue( QFile::encodeName(iter.next()) );
+-        }
+-
+-        return true;
+-    }
+-
+     void removeWatch( int wd ) {
+         kDebug() << wd << watchPathHash[wd];
+         pathWatchHash.remove( watchPathHash.take( wd ) );
+@@ -159,19 +145,24 @@ public:
+     void _k_addWatches() {
+         // add the next batch of paths
+         for ( int i = 0; i < 100; ++i ) {
+-            if ( pathsToWatch.isEmpty() ||
+-                 !addWatchesRecursively( pathsToWatch.dequeue() ) ) {
+-                return;
++            QDirIterator* it = dirIterators.front();
++            if( it->hasNext() ) {
++                it->next();
++                addWatch( QFile::encodeName(it->filePath()) );
++            }
++            else {
++                delete dirIterators.dequeue();
++                if( dirIterators.isEmpty() ) {
++                    kDebug() << "Done adding watches";
++                    return;
++                }
+             }
+         }
+ 
+         // asyncroneously add the next batch
+-        if ( !pathsToWatch.isEmpty() ) {
++        if ( !dirIterators.isEmpty() ) {
+             QMetaObject::invokeMethod( q, "_k_addWatches", Qt::QueuedConnection );
+         }
+-        else {
+-            kDebug() << "All watches installed";
+-        }
+     }
+ 
+ private:
+@@ -245,7 +236,10 @@ bool KInotify::addWatch( const QString& path, WatchEvents mode, WatchFlags flags
+ 
+     d->mode = mode;
+     d->flags = flags;
+-    d->pathsToWatch.append( QFile::encodeName( path ) );
++    d->addWatch( QFile::encodeName(path) );
++    QDirIterator* iter = new QDirIterator( path, QDir::Dirs | QDir::NoDotAndDotDot,
++                                           QDirIterator::Subdirectories );
++    d->dirIterators.append( iter );
+     d->_k_addWatches();
+     return true;
+ }

diff --git a/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild
new file mode 100644
index 0000000..4c95084
--- /dev/null
+++ b/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Nepomuk core libraries"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=app-misc/strigi-0.7.7[dbus,qt4]
+	>=dev-libs/soprano-2.8.0[dbus,raptor,redland,virtuoso]
+	!~dev-db/virtuoso-server-6.1.5
+	!~dev-db/virtuoso-odbc-6.1.5
+	!~dev-db/virtuoso-jdbc-6.1.5
+"
+RDEPEND="${DEPEND}"
+
+add_blocker nepomuk '<4.8.80'
+
+RESTRICT="test"
+# bug 392989
+
+PATCHES=( "${FILESDIR}/${P}-kinotify-do-not-store-the-paths-to-be-added.patch" )