Backport patch from upstream to fix recursive file indexing.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 148 insertions, 15 deletions

diff --git a/kde-base/nepomuk-core/ChangeLog b/kde-base/nepomuk-core/ChangeLog
index a42d2281191a..61c3dceb0398 100644
--- a/kde-base/nepomuk-core/ChangeLog
+++ b/kde-base/nepomuk-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/nepomuk-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/ChangeLog,v 1.28 2013/02/07 04:57:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/ChangeLog,v 1.29 2013/02/10 16:02:46 kensington Exp $
+
+*nepomuk-core-4.10.0-r1 (10 Feb 2013)
+
+  10 Feb 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/nepomuk-core-4.10.0-indexer.patch, +nepomuk-core-4.10.0-r1.ebuild:
+  Backport patch from upstream to fix recursive file indexing.
 
   06 Feb 2013; Naohiro Aota <naota@gentoo.org> nepomuk-core-4.9.5.ebuild:
   Add ~x86-fbsd wrt bug #430072
diff --git a/kde-base/nepomuk-core/Manifest b/kde-base/nepomuk-core/Manifest
index e2cfa90fe243..0b4bec382296 100644
--- a/kde-base/nepomuk-core/Manifest
+++ b/kde-base/nepomuk-core/Manifest
@@ -1,26 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX nepomuk-core-4.10.0-indexer.patch 3842 SHA256 848b546a1a224e43096f58167cd57147f30d1f9cefbfc3c0746afca8549c3518 SHA512 06e1cab975b54a999c142cd872accab0b0e7dbbbd4655c4eee6ddb1fcbd224dc633ce61120570d5150477436347ee756330d1ac3a60320dc87775faf6b7a4e50 WHIRLPOOL 1247d6feca1b14a6b7dd1a64dd4c2bc40930bb8db208d0df9bc497021dc76bcfcbe669f5ddf3c3a6439af5ea3e71181aa4323bb1932c90edc2f187a344313486
 DIST nepomuk-core-4.10.0.tar.xz 356992 SHA256 6a7fc21db84feeac501747faea2899a567189671c228b54aa5a1a8e62bc1ce8c SHA512 f620e3b8785addb17dbfbd9d3d19ebd7d5c967571de3a0ed35cc063aa32d9b0d5cc5fe530e518ca6d3c314c5246a48fbcba7edd9db17482a2ddf47e2cb108e8f WHIRLPOOL 0dd112b41779da8d0894ce085e1e334f564cc4381c4b6d86464cf03e06b48e9b9cf7cdcaf06c8c9b7ab36e4421993329a18f4bfd30d369b8b512b4f485d9a4ad
 DIST nepomuk-core-4.9.5.tar.xz 391260 SHA256 fcae27e7806b2654ba639636c59f9813b1ee9bb41559bd42d7d43061344bd851 SHA512 f454ca188b0cd041f8f917c1c105c229041069f4146dc5fed2c4575970d55d3113b8393307dde8a1f73f79b92ca60263f0e2d3f0147a4c80b871c880dba6aadd WHIRLPOOL 3c1aa15e3fbbc420fc75c5180d473c288c576814d25a19796e5383b7e65d4d35053d9fa6f33a4b7a2ebfe6331bd73a4b8209e4ada61ec63efb1a9683807d42fc
+EBUILD nepomuk-core-4.10.0-r1.ebuild 589 SHA256 afaeb0decf81049efe98fec5838536325d9c5d158908302f9bb7ef32ea3594b1 SHA512 f1c2b9970cbf2e96f52a6984329f268ca22a44e1dc78148a3509c95758dfc32a0f0ba54513210d89c9631691be44164a23a164ad2f1639065f1be71c0a346bb1 WHIRLPOOL 79f7903216b6bc50a7d70af851cd31f38ce25c576c51ed07d8d117598ea4955fe4ca3ab20dfe4662e197ac681473be094bb38e30a8b6f2ce6ffb5d5cacf7525f
 EBUILD nepomuk-core-4.10.0.ebuild 536 SHA256 afe934d23f225fcd666c3f023e947b103679460731b4c96c44260c132307543b SHA512 ba432910a7c59b27c31c6fb04edc051870f7af81a75c50cd1dde96927ecb6ee5b485d7eef2f9ea9f064fd5da7367759a419dacec5c4898a77ca4e7b57fef2513 WHIRLPOOL 6f74c304221c1f6e322fe23e69c1c17f55b47809fdeea8e644ed9bd1debad96d79462ce0f065fb585c6ffbebe74e4f72a59d62ee09cc2ff992aac2d4a7759cba
 EBUILD nepomuk-core-4.9.5.ebuild 566 SHA256 aefa92d34708173a2c3dca669fea1b95e740498fed40c951107b8b9da4b2bf03 SHA512 810a30765a8f0fdf0c418cd2e95e94888b6214fed2b1bebc64e3dde849a8c30260984ffa9f0b2cc8108a0025f675c04c253d6e94b13a3547d3f8ffbda39157c4 WHIRLPOOL 6d1793976f8097492f788f660fb96040865304047901a1f5cd3fb25ed2c22ea0a9a1f392dcc5a4a225cf5235d71a0d0e913abe13d510afca17604cc3ba7d69ea
-MISC ChangeLog 4744 SHA256 454e5112dc6902fa3b23c8ebb3b144328a05027e460d2dc29b2615a19b707165 SHA512 2ca48072b043b54d4b130c5ff54a19cde09ba2ebe58c1983ca8c1c5dd66c0c05753054278ca8f6a2b187560020cf5a10e4fe7fefe694ce1451f6cf025c08eb5a WHIRLPOOL 95f334e191cf57304c6b8bd1f10ef3ccd8cd85d4102dc8aa5a7ac0596878bec31e8bf67911d5cb6b503173a869d2c213d8047f0a6ed68977fea1f30136cbe682
+MISC ChangeLog 4983 SHA256 2a4a3627feb7f25991ba51a6cb338fdcfe74cc8ae95d4342c29d701d7e6bc1a4 SHA512 b9f19adbd71aa0e110bce20c1ef993a32acc461cf08966eff23a3ea7baba80216bd359bce57c1fdbcd6f256dc9af6bbe447e4139fc0a8e599dfcb5287129cbd9 WHIRLPOOL 95379387120fe08d88fad3016191a3f4ffa4d27e9a35fe727d41193a7be0dbf3ad237bac45083a575d553598baffa2c15ca24d38418cbc0966ae9350e2f62eac
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJREzVAAAoJEOf+E+/4L5LmbKMP/3MSIg1Z+bHDHmz0SKN16nYk
-fWRZn+tgJJUD+vncdLgm5zil3vF2PtVErHRSlGUn/0MlVJbkrtfhLJ2QP+JWBijS
-Lpr5++7PuDlphcmQJxW0IzviQxjqOuKcmKNDj5zDxjrKj+NRj+icJNOHLgGBzUN5
-jsDoO0pXeH0WaS58wMxDsq9mfrCCPb5dPgDNaQZS6hD4rpgxdbPhh4dpfBMJfyKM
-RhnOdrbta0mSVvSP2V5jUlm7I8gxAcjQbxu8N66Kk6yQ7mJ/GQaGOA4YOjzgbGC5
-epeBqRIUVYEJ33Z3L5TWwE7A9vF+G+JSd14Bs3f2t7FQL668JNCtluqs6HycWJNV
-jFruETLXcF7Nd/H4YD4NTNaZv6Ehi4/lkK40JPP8UZU4lsf9DSQeISHcs1zDQV/S
-DENxfC31SEIw/3JvQrsQ1hwumJTnxTAz5xQjDrt96zbbc4poSO0A76SEHubU3pHg
-8Ssp9RVk4IAFF9gyFnZRPp0MGHjbU1lLmWd5XXjpLGuJL5+4rOWKbpOtbu0pgBox
-FsHoPeSZxkfj7WeB/X3c/WoHxKesQ+DJ47SB+mW/PmGf6WpOaUHSaQ2xtIEzsxIk
-uc+IHxFpnWZSFPPEZcnxmphJ9/Fqq040o1hGmFCUomQF8b+1XhKY9LQ3N/zb3sfL
-6RCQ9kqQJbGTSxSExhGk
-=w4h4
+iQEcBAEBCAAGBQJRF8SmAAoJEMbwO6tnXQ0s85kIALDM7BmEq+V7wpMZSK88qbLy
+Z0EnxQUL+yFsXUJm/ISq2XgcGQRbikpLakqwCmL7jnf4pZZxEwOUZbzp+SkXpV+G
+/QFYqhBs0ZttUZPksFpdSWcYjzHzPGt1QtkufGjGdeZVWBdjvxOch73t+eR/NG01
+EuGknwmZnBnEdx/LYYVx4vUoZexTgjc+MJhEzL820WVigwW2BRFR/XoNIDwJjGGA
+56xMOuBBl62jKRkfPO7JQXZSJmEqpviqeNLdM5cqdPXmv8oLA2EoSwhm7B+qLBje
+cAPKlf5oyduQvJr7WKaonZNxjGKVyvgjxS4GB6wwbe+huYJcBXsZxJ/nVa1KMZg=
+=A1qi
 -----END PGP SIGNATURE-----
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.10.0-indexer.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.10.0-indexer.patch
new file mode 100644
index 000000000000..9f2231ade4e2
--- /dev/null
+++ b/kde-base/nepomuk-core/files/nepomuk-core-4.10.0-indexer.patch
@@ -0,0 +1,108 @@
+From b651f9231ac30072418bb06d602951f0f05da22c Mon Sep 17 00:00:00 2001
+From: Vishesh Handa <me@vhanda.in>
+Date: Sat, 9 Feb 2013 02:28:33 +0530
+Subject: [PATCH] Revert "BasicIndexingQueue: Use stacks instead of queues"
+
+This reverts commit 2f33141aa6716550e38b11ec9a0b000dd74eea79.
+
+The commit breaks recursive indexing. Doh!
+
+BUG: 314559
+---
+ services/fileindexer/basicindexingqueue.cpp | 18 ++++++------------
+ services/fileindexer/basicindexingqueue.h   |  5 ++---
+ 2 files changed, 8 insertions(+), 15 deletions(-)
+
+diff --git a/services/fileindexer/basicindexingqueue.cpp b/services/fileindexer/basicindexingqueue.cpp
+index a295330..b581786 100644
+--- a/services/fileindexer/basicindexingqueue.cpp
++++ b/services/fileindexer/basicindexingqueue.cpp
+@@ -54,14 +54,14 @@ void BasicIndexingQueue::clear()
+ 
+ void BasicIndexingQueue::clear(const QString& path)
+ {
+-    QMutableVectorIterator< QPair<QString, UpdateDirFlags> > it( m_paths );
++    QMutableListIterator< QPair<QString, UpdateDirFlags> > it( m_paths );
+     while( it.hasNext() ) {
+         it.next();
+         if( it.value().first.startsWith( path ) )
+             it.remove();
+     }
+ 
+-    QMutableVectorIterator< QPair<QDirIterator*, UpdateDirFlags> > iter( m_iterators );
++    QMutableListIterator< QPair<QDirIterator*, UpdateDirFlags> > iter( m_iterators );
+     while( iter.hasNext() ) {
+         QDirIterator* dirIter =  iter.next().first;
+ 
+@@ -100,7 +100,7 @@ void BasicIndexingQueue::enqueue(const QString& path, UpdateDirFlags flags)
+ {
+     kDebug() << path;
+     bool wasEmpty = m_paths.empty();
+-    m_paths.push( qMakePair( path, flags ) );
++    m_paths.enqueue( qMakePair( path, flags ) );
+     callForNextIteration();
+ 
+     if( wasEmpty )
+@@ -120,12 +120,12 @@ void BasicIndexingQueue::processNextIteration()
+             processingFile = process( dirIt->next(), pair.second );
+         }
+         else {
+-            delete m_iterators.pop().first;
++            delete m_iterators.dequeue().first;
+         }
+     }
+ 
+     else if( !m_paths.isEmpty() ) {
+-        QPair< QString, UpdateDirFlags > pair = m_paths.pop();
++        QPair< QString, UpdateDirFlags > pair = m_paths.dequeue();
+         processingFile = process( pair.first, pair.second );
+     }
+ 
+@@ -161,7 +161,7 @@ bool BasicIndexingQueue::process(const QString& path, UpdateDirFlags flags)
+             QDir::Filters dirFilter = QDir::NoDotAndDotDot|QDir::Readable|QDir::Files|QDir::Dirs;
+ 
+             QPair<QDirIterator*, UpdateDirFlags> pair = qMakePair( new QDirIterator( path, dirFilter ), flags );
+-            m_iterators.push( pair );
++            m_iterators.enqueue( pair );
+         }
+     }
+     else if( info.isFile() && (forced || indexingRequired) ) {
+@@ -259,12 +259,6 @@ void BasicIndexingQueue::slotIndexingFinished(KJob* job)
+ 
+     emit endIndexingFile( url );
+ 
+-    // Give back the memory
+-    if( m_paths.isEmpty() )
+-        m_paths.clear();
+-    if( m_iterators.isEmpty() )
+-        m_iterators.clear();
+-
+     // Continue the queue
+     finishIteration();
+ }
+diff --git a/services/fileindexer/basicindexingqueue.h b/services/fileindexer/basicindexingqueue.h
+index 29dd9fd..5d1c190 100644
+--- a/services/fileindexer/basicindexingqueue.h
++++ b/services/fileindexer/basicindexingqueue.h
+@@ -23,7 +23,6 @@
+ 
+ #include "indexingqueue.h"
+ #include <KJob>
+-#include <QtCore/QStack>
+ 
+ namespace Nepomuk2 {
+ 
+@@ -106,8 +105,8 @@ namespace Nepomuk2 {
+          */
+         bool process(const QString& path, Nepomuk2::UpdateDirFlags flags);
+ 
+-        QStack< QPair<QString, UpdateDirFlags> > m_paths;
+-        QStack< QPair<QDirIterator*, UpdateDirFlags> > m_iterators;
++        QQueue< QPair<QString, UpdateDirFlags> > m_paths;
++        QQueue< QPair<QDirIterator*, UpdateDirFlags> > m_iterators;
+ 
+         QUrl m_currentUrl;
+         QString m_currentMimeType;
+-- 
+1.8.1.2
+
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.10.0-r1.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.10.0-r1.ebuild
new file mode 100644
index 000000000000..6976f58d3a94
--- /dev/null
+++ b/kde-base/nepomuk-core/nepomuk-core-4.10.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/nepomuk-core-4.10.0-r1.ebuild,v 1.1 2013/02/10 16:02:46 kensington Exp $
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Nepomuk core libraries"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/soprano-2.9.0[dbus,raptor,redland,virtuoso]
+"
+RDEPEND="${DEPEND}"
+
+add_blocker nepomuk '<4.8.80'
+
+RESTRICT="test"
+# bug 392989
+
+PATCHES=( "${FILESDIR}/${P}-indexer.patch" )