Blame SOURCES/qt-everywhere-opensource-src-4.8.6-system-clucene.patch

e09033
diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/fulltextsearch.pri qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/fulltextsearch.pri
e09033
--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/fulltextsearch.pri	2014-04-10 20:37:12.000000000 +0200
e09033
+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/fulltextsearch.pri	2014-10-26 03:33:45.000000000 +0100
e09033
@@ -1,125 +1,7 @@
e09033
-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
e09033
-win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
e09033
-
e09033
-CLUCENEDIR = ../../../../src/3rdparty/clucene/src/CLucene
e09033
-
e09033
-INCLUDEPATH += . .. \
e09033
-               $$CLUCENEDIR \
e09033
-               $$CLUCENEDIR/../ \
e09033
-               $$CLUCENEDIR/analysis \
e09033
-               $$CLUCENEDIR/analysis/standard \
e09033
-               $$CLUCENEDIR/config \
e09033
-               $$CLUCENEDIR/debug \
e09033
-               $$CLUCENEDIR/document \
e09033
-               $$CLUCENEDIR/index \
e09033
-               $$CLUCENEDIR/queryParser \
e09033
-               $$CLUCENEDIR/search \
e09033
-               $$CLUCENEDIR/store \
e09033
-               $$CLUCENEDIR/util
e09033
-
e09033
-
e09033
-SOURCES += $$CLUCENEDIR/StdHeader.cpp \
e09033
-           $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
e09033
-           $$CLUCENEDIR/analysis/Analyzers.cpp \
e09033
-           $$CLUCENEDIR/config/gunichartables.cpp \
e09033
-           $$CLUCENEDIR/config/repl_lltot.cpp \
e09033
-           $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
e09033
-           $$CLUCENEDIR/config/repl_tcslwr.cpp \
e09033
-           $$CLUCENEDIR/config/repl_tcstod.cpp \
e09033
-           $$CLUCENEDIR/config/repl_tcstoll.cpp \
e09033
-           $$CLUCENEDIR/config/repl_tprintf.cpp \
e09033
-           $$CLUCENEDIR/config/threads.cpp \
e09033
-           $$CLUCENEDIR/config/utf8.cpp \
e09033
-           $$CLUCENEDIR/debug/condition.cpp \
e09033
-           $$CLUCENEDIR/debug/error.cpp \
e09033
-           $$CLUCENEDIR/debug/memtracking.cpp \
e09033
-           $$CLUCENEDIR/document/DateField.cpp \
e09033
-           $$CLUCENEDIR/document/Document.cpp \
e09033
-           $$CLUCENEDIR/document/Field.cpp \
e09033
-           $$CLUCENEDIR/index/CompoundFile.cpp \
e09033
-           $$CLUCENEDIR/index/DocumentWriter.cpp \
e09033
-           $$CLUCENEDIR/index/FieldInfos.cpp \
e09033
-           $$CLUCENEDIR/index/FieldsReader.cpp \
e09033
-           $$CLUCENEDIR/index/FieldsWriter.cpp \
e09033
-           $$CLUCENEDIR/index/IndexModifier.cpp \
e09033
-           $$CLUCENEDIR/index/IndexReader.cpp \
e09033
-           $$CLUCENEDIR/index/IndexWriter.cpp \
e09033
-           $$CLUCENEDIR/index/MultiReader.cpp \
e09033
-           $$CLUCENEDIR/index/SegmentInfos.cpp \
e09033
-           $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
e09033
-           $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
e09033
-           $$CLUCENEDIR/index/SegmentMerger.cpp \
e09033
-           $$CLUCENEDIR/index/SegmentReader.cpp \
e09033
-           $$CLUCENEDIR/index/SegmentTermDocs.cpp \
e09033
-           $$CLUCENEDIR/index/SegmentTermEnum.cpp \
e09033
-           $$CLUCENEDIR/index/SegmentTermPositions.cpp \
e09033
-           $$CLUCENEDIR/index/SegmentTermVector.cpp \
e09033
-           $$CLUCENEDIR/index/Term.cpp \
e09033
-           $$CLUCENEDIR/index/TermInfo.cpp \
e09033
-           $$CLUCENEDIR/index/TermInfosReader.cpp \
e09033
-           $$CLUCENEDIR/index/TermInfosWriter.cpp \
e09033
-           $$CLUCENEDIR/index/TermVectorReader.cpp \
e09033
-           $$CLUCENEDIR/index/TermVectorWriter.cpp \
e09033
-           $$CLUCENEDIR/queryParser/Lexer.cpp \
e09033
-           $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
e09033
-           $$CLUCENEDIR/queryParser/QueryParser.cpp \
e09033
-           $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
e09033
-           $$CLUCENEDIR/queryParser/QueryToken.cpp \
e09033
-           $$CLUCENEDIR/queryParser/TokenList.cpp \
e09033
-           $$CLUCENEDIR/search/BooleanQuery.cpp \
e09033
-           $$CLUCENEDIR/search/BooleanScorer.cpp \
e09033
-           $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
e09033
-           $$CLUCENEDIR/search/ChainedFilter.cpp \
e09033
-           $$CLUCENEDIR/search/ConjunctionScorer.cpp \
e09033
-           $$CLUCENEDIR/search/DateFilter.cpp \
e09033
-           $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
e09033
-           $$CLUCENEDIR/search/Explanation.cpp \
e09033
-           $$CLUCENEDIR/search/FieldCache.cpp \
e09033
-           $$CLUCENEDIR/search/FieldCacheImpl.cpp \
e09033
-           $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
e09033
-           $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
e09033
-           $$CLUCENEDIR/search/FilteredTermEnum.cpp \
e09033
-           $$CLUCENEDIR/search/FuzzyQuery.cpp \
e09033
-           $$CLUCENEDIR/search/HitQueue.cpp \
e09033
-           $$CLUCENEDIR/search/Hits.cpp \
e09033
-           $$CLUCENEDIR/search/IndexSearcher.cpp \
e09033
-           $$CLUCENEDIR/search/MultiSearcher.cpp \
e09033
-           $$CLUCENEDIR/search/MultiTermQuery.cpp \
e09033
-           $$CLUCENEDIR/search/PhrasePositions.cpp \
e09033
-           $$CLUCENEDIR/search/PhraseQuery.cpp \
e09033
-           $$CLUCENEDIR/search/PhraseScorer.cpp \
e09033
-           $$CLUCENEDIR/search/PrefixQuery.cpp \
e09033
-           $$CLUCENEDIR/search/QueryFilter.cpp \
e09033
-           $$CLUCENEDIR/search/RangeFilter.cpp \
e09033
-           $$CLUCENEDIR/search/RangeQuery.cpp \
e09033
-           $$CLUCENEDIR/search/SearchHeader.cpp \
e09033
-           $$CLUCENEDIR/search/Similarity.cpp \
e09033
-           $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
e09033
-           $$CLUCENEDIR/search/Sort.cpp \
e09033
-           $$CLUCENEDIR/search/TermQuery.cpp \
e09033
-           $$CLUCENEDIR/search/TermScorer.cpp \
e09033
-           $$CLUCENEDIR/search/WildcardQuery.cpp \
e09033
-           $$CLUCENEDIR/search/WildcardTermEnum.cpp \
e09033
-           $$CLUCENEDIR/store/FSDirectory.cpp \
e09033
-           $$CLUCENEDIR/store/IndexInput.cpp \
e09033
-           $$CLUCENEDIR/store/IndexOutput.cpp \
e09033
-           $$CLUCENEDIR/store/Lock.cpp \
e09033
-           $$CLUCENEDIR/store/MMapInput.cpp \
e09033
-           $$CLUCENEDIR/store/RAMDirectory.cpp \
e09033
-           $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
e09033
-           $$CLUCENEDIR/util/BitSet.cpp \
e09033
-           $$CLUCENEDIR/util/Equators.cpp \
e09033
-           $$CLUCENEDIR/util/FastCharStream.cpp \
e09033
-           $$CLUCENEDIR/util/fileinputstream.cpp \
e09033
-           $$CLUCENEDIR/util/Misc.cpp \
e09033
-           $$CLUCENEDIR/util/Reader.cpp \
e09033
-           $$CLUCENEDIR/util/StringBuffer.cpp \
e09033
-           $$CLUCENEDIR/util/StringIntern.cpp \
e09033
-           $$CLUCENEDIR/util/ThreadLocal.cpp \
e09033
-           $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
e09033
-           $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
e09033
-           $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
e09033
 
e09033
+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
e09033
+LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
e09033
+#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!)
e09033
 
e09033
 #Header files
e09033
 HEADERS += qclucene_global_p.h \
e09033
diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene-config_p.h qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
e09033
--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene-config_p.h	2014-04-10 20:37:12.000000000 +0200
e09033
+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene-config_p.h	2014-10-26 02:28:54.000000000 +0100
e09033
@@ -15,6 +15,8 @@
e09033
 **
e09033
 ****************************************************************************/
e09033
 
e09033
+#error This header must not be included when building against system CLucene.
e09033
+
e09033
 #ifndef QCLUCENE_CONFIG_P_H
e09033
 #define QCLUCENE_CONFIG_P_H
e09033
 
e09033
diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene_global_p.h qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
e09033
--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene_global_p.h	2014-04-10 20:37:12.000000000 +0200
e09033
+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene_global_p.h	2014-10-26 02:31:54.000000000 +0100
e09033
@@ -29,20 +29,10 @@
e09033
 // We mean it.
e09033
 //
e09033
 
e09033
-#if !defined(_MSC_VER)
e09033
-#   include "qclucene-config_p.h"
e09033
-#endif
e09033
-
e09033
 #include <QtCore/QChar>
e09033
 #include <QtCore/QString>
e09033
 
e09033
-#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
e09033
-#   if !defined(TCHAR)
e09033
-#       define TCHAR wchar_t
e09033
-#   endif
e09033
-#else
e09033
-#   include <windows.h>
e09033
-#endif
e09033
+#include <CLucene/StdHeader.h>
e09033
 
e09033
 QT_BEGIN_HEADER
e09033
 
e09033
@@ -56,52 +46,6 @@
e09033
 #   define QHELP_EXPORT Q_DECL_IMPORT
e09033
 #endif
e09033
 
e09033
-//
e09033
-//  W A R N I N G
e09033
-//  -------------
e09033
-//
e09033
-// adjustments here, need to be done in 
e09033
-// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
e09033
-//
e09033
-#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
e09033
-
e09033
-#elif !defined(DISABLE_NAMESPACE)
e09033
-#   ifdef QT_NAMESPACE
e09033
-#       define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
e09033
-#       define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
e09033
-
e09033
-#       define CL_NS_END }}}
e09033
-#       define CL_NS_END2 }}}}
e09033
-
e09033
-#       define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
e09033
-#       define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
e09033
-
e09033
-#       define CL_NS(sub) QT_NAMESPACE::lucene::sub
e09033
-#       define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
e09033
-#   else
e09033
-#       define CL_NS_DEF(sub) namespace lucene{ namespace sub{
e09033
-#       define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
e09033
-
e09033
-#       define CL_NS_END }}
e09033
-#       define CL_NS_END2 }}}
e09033
-
e09033
-#       define CL_NS_USE(sub) using namespace lucene::sub;
e09033
-#       define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
e09033
-
e09033
-#       define CL_NS(sub) lucene::sub
e09033
-#       define CL_NS2(sub,sub2) lucene::sub::sub2
e09033
-#   endif
e09033
-#else
e09033
-#   define CL_NS_DEF(sub)
e09033
-#   define CL_NS_DEF2(sub, sub2)
e09033
-#   define CL_NS_END
e09033
-#   define CL_NS_END2
e09033
-#   define CL_NS_USE(sub)
e09033
-#   define CL_NS_USE2(sub,sub2)
e09033
-#   define CL_NS(sub)
e09033
-#   define CL_NS2(sub,sub2)
e09033
-#endif
e09033
-
e09033
 namespace {
e09033
     TCHAR* QStringToTChar(const QString &str)
e09033
     {
e09033
diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexreader.cpp qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexreader.cpp
e09033
--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexreader.cpp	2014-04-10 20:37:12.000000000 +0200
e09033
+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexreader.cpp	2014-10-26 02:48:02.000000000 +0100
e09033
@@ -18,6 +18,8 @@
e09033
 #include "qindexreader_p.h"
e09033
 #include "qclucene_global_p.h"
e09033
 
e09033
+#include <QtCore/QDir>
e09033
+
e09033
 #include <CLucene.h>
e09033
 #include <CLucene/index/IndexReader.h>
e09033
 
e09033
@@ -59,13 +61,13 @@
e09033
 {
e09033
     using namespace lucene::index;
e09033
 
e09033
-    return IndexReader::isLuceneFile(filename);
e09033
+    return IndexReader::isLuceneFile(filename.toLocal8Bit().constData());
e09033
 }
e09033
 
e09033
 bool QCLuceneIndexReader::indexExists(const QString &directory)
e09033
 {
e09033
     using namespace lucene::index;
e09033
-    return IndexReader::indexExists(directory);
e09033
+    return IndexReader::indexExists(directory.toLocal8Bit().constData());
e09033
 }
e09033
 
e09033
 QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
e09033
@@ -73,7 +75,7 @@
e09033
     using namespace lucene::index;
e09033
 
e09033
     QCLuceneIndexReader indexReader;
e09033
-    indexReader.d->reader = IndexReader::open(path);
e09033
+    indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData());
e09033
     
e09033
     return indexReader;
e09033
 }
e09033
@@ -81,25 +83,29 @@
e09033
 void QCLuceneIndexReader::unlock(const QString &path)
e09033
 {
e09033
     using namespace lucene::index;
e09033
-    IndexReader::unlock(path);
e09033
+    IndexReader::unlock(path.toLocal8Bit().constData());
e09033
 }
e09033
 
e09033
 bool QCLuceneIndexReader::isLocked(const QString &directory)
e09033
 {
e09033
+    // The system CLucene fails here if the directory does not exist yet, unlike
e09033
+    // the bundled one. Work around that.
e09033
+    QDir::current().mkpath(directory);
e09033
+
e09033
     using namespace lucene::index;
e09033
-    return IndexReader::isLocked(directory);
e09033
+    return IndexReader::isLocked(directory.toLocal8Bit().constData());
e09033
 }
e09033
 
e09033
 quint64 QCLuceneIndexReader::lastModified(const QString &directory)
e09033
 {
e09033
     using namespace lucene::index;
e09033
-    return quint64(IndexReader::lastModified(directory));
e09033
+    return quint64(IndexReader::lastModified(directory.toLocal8Bit().constData()));
e09033
 }
e09033
 
e09033
 qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
e09033
 {
e09033
     using namespace lucene::index;
e09033
-    return qint64(IndexReader::getCurrentVersion(directory));
e09033
+    return qint64(IndexReader::getCurrentVersion(directory.toLocal8Bit().constData()));
e09033
 }
e09033
 
e09033
 void QCLuceneIndexReader::close()
e09033
@@ -155,7 +161,7 @@
e09033
 void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
e09033
 {
e09033
     TCHAR *fieldName = QStringToTChar(field);
e09033
-    d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
e09033
+    d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
e09033
     delete [] fieldName;
e09033
 }
e09033
 
e09033
diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexwriter.cpp qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexwriter.cpp
e09033
--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexwriter.cpp	2014-04-10 20:37:12.000000000 +0200
e09033
+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexwriter.cpp	2014-10-26 02:48:27.000000000 +0100
e09033
@@ -18,6 +18,8 @@
e09033
 #include "qindexwriter_p.h"
e09033
 #include "qindexreader_p.h"
e09033
 
e09033
+#include <QtCore/QDir>
e09033
+
e09033
 #include <CLucene.h>
e09033
 #include <CLucene/index/IndexWriter.h>
e09033
 
e09033
@@ -50,7 +52,12 @@
e09033
     : d(new QCLuceneIndexWriterPrivate())
e09033
     , analyzer(analyzer)
e09033
 {
e09033
-    d->writer = new lucene::index::IndexWriter(path, 
e09033
+    // The system CLucene cannot create directories recursively, so do it here.
e09033
+    // Ignore failure: If it failed, we will get an error from CLucene anyway.
e09033
+    if (create)
e09033
+        QDir::current().mkpath(path);
e09033
+
e09033
+    d->writer = new lucene::index::IndexWriter(path.toLocal8Bit().constData(), 
e09033
         analyzer.d->analyzer, create, closeDir);
e09033
 }
e09033
 
e09033
diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qsearchable.cpp qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qsearchable.cpp
e09033
--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qsearchable.cpp	2014-04-10 20:37:12.000000000 +0200
e09033
+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qsearchable.cpp	2014-10-26 02:48:44.000000000 +0100
e09033
@@ -95,7 +95,7 @@
e09033
     : QCLuceneSearcher()
e09033
 {
e09033
     lucene::search::IndexSearcher *searcher =
e09033
-        new lucene::search::IndexSearcher(path);
e09033
+        new lucene::search::IndexSearcher(path.toLocal8Bit().constData());
e09033
 
e09033
     reader.d->reader = searcher->getReader();
e09033
     reader.d->deleteCLuceneIndexReader = false;
e09033
diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/lib.pro qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/lib.pro
e09033
--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/lib.pro	2014-04-10 20:37:12.000000000 +0200
e09033
+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/lib.pro	2014-10-26 02:27:55.000000000 +0100
e09033
@@ -43,6 +43,7 @@
e09033
     qhelp_global.cpp
e09033
 
e09033
 # access to clucene
e09033
+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
e09033
 SOURCES += qhelpsearchindexwriter_clucene.cpp \
e09033
     qhelpsearchindexreader_clucene.cpp
e09033
 HEADERS += qhelpenginecore.h \