Hello community,
here is the log from the commit of package nepomuk-core for openSUSE:Factory
checked in at 2013-02-10 14:37:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nepomuk-core (Old)
and /work/SRC/openSUSE:Factory/.nepomuk-core.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nepomuk-core", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/nepomuk-core/nepomuk-core.changes
2013-02-04 20:55:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.nepomuk-core.new/nepomuk-core.changes
2013-02-10 14:37:34.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 8 21:12:31 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Added Revert-BasicIndexingQueue-Use-stacks-instead-of-queu.patch
+ from upstream, fixes kde#314559
+
+-------------------------------------------------------------------
New:
----
Revert-BasicIndexingQueue-Use-stacks-instead-of-queu.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nepomuk-core.spec ++++++
--- /var/tmp/diff_new_pack.yVn2qC/_old 2013-02-10 14:37:38.000000000 +0100
+++ /var/tmp/diff_new_pack.yVn2qC/_new 2013-02-10 14:37:38.000000000 +0100
@@ -38,6 +38,8 @@
Release: 0
Source0: %{name}-%{version}.tar.xz
Source99: nepomuk.png
+# PATCH-FIX-UPSTREAM
Revert-BasicIndexingQueue-Use-stacks-instead-of-queu.patch fixes indexer not
working recursively (kde#314559)
+Patch0: Revert-BasicIndexingQueue-Use-stacks-instead-of-queu.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdelibs4 >= %version
Requires: soprano-backend-redland
@@ -58,6 +60,7 @@
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1
%build
%cmake_kde4 -d build -- -DKDE4_ENABLE_FPIE=1
++++++ Revert-BasicIndexingQueue-Use-stacks-instead-of-queu.patch ++++++
>From b651f9231ac30072418bb06d602951f0f05da22c Mon Sep 17 00:00:00 2001
From: Vishesh Handa <m...@vhanda.in>
Date: Sat, 9 Feb 2013 02:28:33 +0530
Subject: [PATCH 1/1] 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.1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
