rpms/qt5-qttools
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

respin system-clucene.patch

Browse Source
This commit is contained in:
Rex Dieter 2014-10-31 19:25:12 -05:00
parent 97edc45b8c
commit c63ded3c4c
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qt5-qttools.spec
View File

@ -19,7 +19,7 @@
Summary: Qt5 - QtTool components Summary: Qt5 - QtTool components
Name: qt5-qttools Name: qt5-qttools
Version: 5.4.0 Version: 5.4.0
Release: 0.5.%{pre}%{?dist} Release: 0.6.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -423,6 +423,9 @@ fi
%changelog %changelog
* Fri Oct 31 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.6.beta
- respin system-clucene.patch
* Sun Oct 26 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.4.0-0.5.beta * Sun Oct 26 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.4.0-0.5.beta
- system-clucene patch: create path recursively in QtCLucene, CLucene can't - system-clucene patch: create path recursively in QtCLucene, CLucene can't

35
qttools-opensource-src-5.3.2-system-clucene.patch
View File

@ -1,6 +1,6 @@
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri
--- qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri 2014-09-11 12:48:25.000000000 +0200 --- qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri 2014-10-27 00:09:28.000000000 +0100 +++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri 2014-10-31 23:44:32.368856494 +0100
@@ -1,125 +1,7 @@ @@ -1,125 +1,7 @@
-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING -DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
-win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT -win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
@ -132,7 +132,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri q
HEADERS += qclucene_global_p.h \ HEADERS += qclucene_global_p.h \
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h
--- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h 2014-09-11 12:48:25.000000000 +0200 --- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h 2014-10-27 00:09:28.000000000 +0100 +++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h 2014-10-31 23:44:32.368856494 +0100
@@ -15,6 +15,8 @@ @@ -15,6 +15,8 @@
** **
****************************************************************************/ ****************************************************************************/
@ -144,7 +144,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h
--- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h 2014-09-11 12:48:25.000000000 +0200 --- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h 2014-10-27 00:09:28.000000000 +0100 +++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h 2014-10-31 23:44:32.368856494 +0100
@@ -29,20 +29,10 @@ @@ -29,20 +29,10 @@
// We mean it. // We mean it.
// //
@ -222,8 +222,17 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h
{ {
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp
--- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp 2014-09-11 12:48:25.000000000 +0200 --- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp 2014-10-27 00:09:28.000000000 +0100 +++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp 2014-10-31 23:47:52.184907583 +0100
@@ -59,13 +59,13 @@ @@ -18,6 +18,8 @@
#include "qindexreader_p.h"
#include "qclucene_global_p.h"
+#include <QtCore/QDir>
+
#include <CLucene.h>
#include <CLucene/index/IndexReader.h>
@@ -59,13 +61,13 @@
{ {
using namespace lucene::index; using namespace lucene::index;
@ -239,7 +248,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qtt
} }
QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path) QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
@@ -73,7 +73,7 @@ @@ -73,7 +75,7 @@
using namespace lucene::index; using namespace lucene::index;
QCLuceneIndexReader indexReader; QCLuceneIndexReader indexReader;
@ -248,7 +257,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qtt
return indexReader; return indexReader;
} }
@@ -81,25 +81,25 @@ @@ -81,25 +83,29 @@
void QCLuceneIndexReader::unlock(const QString &path) void QCLuceneIndexReader::unlock(const QString &path)
{ {
using namespace lucene::index; using namespace lucene::index;
@ -258,6 +267,10 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qtt
bool QCLuceneIndexReader::isLocked(const QString &directory) bool QCLuceneIndexReader::isLocked(const QString &directory)
{ {
+ // The system CLucene fails here if the directory does not exist yet, unlike
+ // the bundled one. Work around that.
+ QDir::current().mkpath(directory);
+
using namespace lucene::index; using namespace lucene::index;
- return IndexReader::isLocked(directory); - return IndexReader::isLocked(directory);
+ return IndexReader::isLocked(directory.toLocal8Bit().constData()); + return IndexReader::isLocked(directory.toLocal8Bit().constData());
@ -278,7 +291,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qtt
} }
void QCLuceneIndexReader::close() void QCLuceneIndexReader::close()
@@ -155,7 +155,7 @@ @@ -155,7 +161,7 @@
void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value) void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
{ {
TCHAR *fieldName = QStringToTChar(field); TCHAR *fieldName = QStringToTChar(field);
@ -289,7 +302,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qtt
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp
--- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp 2014-09-11 12:48:25.000000000 +0200 --- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp 2014-10-27 00:10:06.000000000 +0100 +++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp 2014-10-31 23:44:32.369856502 +0100
@@ -18,6 +18,8 @@ @@ -18,6 +18,8 @@
#include "qindexwriter_p.h" #include "qindexwriter_p.h"
#include "qindexreader_p.h" #include "qindexreader_p.h"
@ -315,7 +328,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp qtt
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp
--- qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp 2014-09-11 12:48:25.000000000 +0200 --- qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp 2014-10-27 00:09:28.000000000 +0100 +++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp 2014-10-31 23:44:32.369856502 +0100
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
: QCLuceneSearcher() : QCLuceneSearcher()
{ {
@ -327,7 +340,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp qtto
reader.d->deleteCLuceneIndexReader = false; reader.d->deleteCLuceneIndexReader = false;
diff -ur qttools-opensource-src-5.3.2/src/assistant/help/help.pro qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro diff -ur qttools-opensource-src-5.3.2/src/assistant/help/help.pro qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro
--- qttools-opensource-src-5.3.2/src/assistant/help/help.pro 2014-09-11 12:48:25.000000000 +0200 --- qttools-opensource-src-5.3.2/src/assistant/help/help.pro 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro 2014-10-27 00:09:28.000000000 +0100 +++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro 2014-10-31 23:44:32.369856502 +0100
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
qhelp_global.cpp qhelp_global.cpp