Commits

Anonymous committed d725a0a

Rebuild nepomuk-core

Signed-off-by: Lee Pak Hong <benreilly@vector.Linux.net>

  • Participants
  • Parent commits 372c9fb
  • Branches veclinux-7.0

Comments (0)

Files changed (2)

var/vabs/nepomuk-core/src/nepomuk-core.SlackBuild

 #-----------------------------------------------------
 
 # Fix nepomuk recursive indexing; will be fixed in 4.10.1:
-cat $CWD/patches/nepomuk-core-4.10.0_recursivesearch.diff.gz | patch -p1 --verbose
+#cat $CWD/patches/nepomuk-core-4.10.0_recursivesearch.diff.gz | patch -p1 --verbose
+patch -p1 <$CWD/patches/nepomuk-core-4.10.0_recursivesearch.patch --verbose
 
 #SET PERMISSIONS
 #-----------------------------------------
 
 cd ..
 
+
 #######################################################################
 #Miscellenious tweaks and things outside a normal ./configure go here #
 #######################################################################

var/vabs/nepomuk-core/src/patches/nepomuk-core-4.10.0_recursivesearch.patch

+--- a/services/fileindexer/basicindexingqueue.cpp	2013-01-27 23:40:20.000000000 +0800
++++ b/services/fileindexer/basicindexingqueue.cpp	2013-02-15 08:17:00.278673694 +0800
+@@ -54,14 +54,14 @@
+ 
+ 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 @@
+ {
+     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 @@
+             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 @@
+             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 @@
+ 
+     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();
+ }
+--- a/services/fileindexer/basicindexingqueue.h	2013-01-27 23:40:20.000000000 +0800
++++ b/services/fileindexer/basicindexingqueue.h	2013-02-15 08:18:18.967680964 +0800
+@@ -23,7 +23,6 @@
+ 
+ #include "indexingqueue.h"
+ #include <KJob>
+-#include <QtCore/QStack>
+ 
+ namespace Nepomuk2 {
+ 
+@@ -106,8 +105,8 @@
+          */
+         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;