[qt5-qttools] disable bootstrap (reenable -doc), system-clucene cleanups
Kevin Kofler
kkofler at fedoraproject.org
Sun Oct 26 02:25:58 UTC 2014
commit 76aa8d92b6abdbc3b93d623c56573741093373d2
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun Oct 26 03:25:43 2014 +0100
disable bootstrap (reenable -doc), system-clucene cleanups
* Sun Oct 26 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.4.0-0.4.beta
- disable bootstrap (reenable -doc)
- system-clucene patch: drop -fpermissive flag
- system-clucene patch: use toLocal8Bit instead of toStdString
- system_clucene: BR clucene09-core-devel >= 0.9.21b-12 (-11 was broken)
qt5-qttools.spec | 12 ++-
...tools-opensource-src-5.3.2-system-clucene.patch | 79 ++++++++++----------
2 files changed, 48 insertions(+), 43 deletions(-)
---
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index d219a55..98af8b9 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,5 +1,5 @@
-%global bootstrap 1
+#global bootstrap 1
%global qt_module qttools
%if 0%{?fedora} || 0%{?rhel} > 6
%global system_clucene 1
@@ -19,7 +19,7 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.4.0
-Release: 0.3.%{pre}%{?dist}
+Release: 0.4.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -54,7 +54,7 @@ BuildRequires: qt5-qtdeclarative-static
BuildRequires: qt5-qtwebkit-devel
%if 0%{?system_clucene}
-BuildRequires: clucene09-core-devel >= 0.9.21b-11
+BuildRequires: clucene09-core-devel >= 0.9.21b-12
%endif
Requires: %{name}-common = %{version}-%{release}
@@ -423,6 +423,12 @@ fi
%changelog
+* Sun Oct 26 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.4.0-0.4.beta
+- disable bootstrap (reenable -doc)
+- system-clucene patch: drop -fpermissive flag
+- system-clucene patch: use toLocal8Bit instead of toStdString
+- system_clucene: BR clucene09-core-devel >= 0.9.21b-12 (-11 was broken)
+
* Sat Oct 25 2014 Rex Dieter <rdieter at fedoraproject.org> - 5.4.0-0.3.beta
- libQt5Designer should be in a subpackage (#1156685)
- -doc: disable(boostrap for new clucene), drop dep on main pkg
diff --git a/qttools-opensource-src-5.3.0-system-clucene.patch b/qttools-opensource-src-5.3.2-system-clucene.patch
similarity index 74%
rename from qttools-opensource-src-5.3.0-system-clucene.patch
rename to qttools-opensource-src-5.3.2-system-clucene.patch
index 343d2a9..087d52a 100644
--- a/qttools-opensource-src-5.3.0-system-clucene.patch
+++ b/qttools-opensource-src-5.3.2-system-clucene.patch
@@ -1,7 +1,7 @@
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri
---- qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri.system_clucene 2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri 2014-05-30 12:31:10.921201196 -0500
-@@ -1,125 +1,8 @@
+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-system-clucene/src/assistant/clucene/fulltextsearch.pri 2014-10-26 03:14:22.000000000 +0100
+@@ -1,125 +1,7 @@
-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
-win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
-
@@ -127,13 +127,12 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri.s
+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
+LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
+#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!)
-+QMAKE_CXXFLAGS += -fpermissive
#Header files
HEADERS += qclucene_global_p.h \
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h
---- qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h.system_clucene 2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h 2014-05-30 12:31:10.922201214 -0500
+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-system-clucene/src/assistant/clucene/qclucene-config_p.h 2014-10-26 03:13:07.000000000 +0100
@@ -15,6 +15,8 @@
**
****************************************************************************/
@@ -143,9 +142,9 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene-config_p.h.
#ifndef QCLUCENE_CONFIG_P_H
#define QCLUCENE_CONFIG_P_H
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h
---- qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h.system_clucene 2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h 2014-05-30 12:31:10.923201233 -0500
+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-system-clucene/src/assistant/clucene/qclucene_global_p.h 2014-10-26 03:13:07.000000000 +0100
@@ -29,20 +29,10 @@
// We mean it.
//
@@ -168,7 +167,7 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h.
QT_BEGIN_NAMESPACE
-@@ -54,52 +44,6 @@ QT_BEGIN_NAMESPACE
+@@ -54,52 +44,6 @@
# define Q_CLUCENE_EXPORT Q_DECL_IMPORT
#endif
@@ -221,65 +220,65 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h.
namespace QtCLuceneHelpers {
inline TCHAR* QStringToTChar(const QString &str)
{
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp
---- qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp.system_clucene 2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp 2014-05-30 12:31:10.924201251 -0500
-@@ -59,13 +59,13 @@ bool QCLuceneIndexReader::isLuceneFile(c
+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-system-clucene/src/assistant/clucene/qindexreader.cpp 2014-10-26 03:15:25.000000000 +0100
+@@ -59,13 +59,13 @@
{
using namespace lucene::index;
- return IndexReader::isLuceneFile(filename);
-+ return IndexReader::isLuceneFile(filename.toStdString().c_str());
++ return IndexReader::isLuceneFile(filename.toLocal8Bit().constData());
}
bool QCLuceneIndexReader::indexExists(const QString &directory)
{
using namespace lucene::index;
- return IndexReader::indexExists(directory);
-+ return IndexReader::indexExists(directory.toStdString().c_str());
++ return IndexReader::indexExists(directory.toLocal8Bit().constData());
}
QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
-@@ -73,7 +73,7 @@ QCLuceneIndexReader QCLuceneIndexReader:
+@@ -73,7 +73,7 @@
using namespace lucene::index;
QCLuceneIndexReader indexReader;
- indexReader.d->reader = IndexReader::open(path);
-+ indexReader.d->reader = IndexReader::open(path.toStdString().c_str());
++ indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData());
return indexReader;
}
-@@ -81,25 +81,25 @@ QCLuceneIndexReader QCLuceneIndexReader:
+@@ -81,25 +81,25 @@
void QCLuceneIndexReader::unlock(const QString &path)
{
using namespace lucene::index;
- IndexReader::unlock(path);
-+ IndexReader::unlock(path.toStdString().c_str());
++ IndexReader::unlock(path.toLocal8Bit().constData());
}
bool QCLuceneIndexReader::isLocked(const QString &directory)
{
using namespace lucene::index;
- return IndexReader::isLocked(directory);
-+ return IndexReader::isLocked(directory.toStdString().c_str());
++ return IndexReader::isLocked(directory.toLocal8Bit().constData());
}
quint64 QCLuceneIndexReader::lastModified(const QString &directory)
{
using namespace lucene::index;
- return quint64(IndexReader::lastModified(directory));
-+ return quint64(IndexReader::lastModified(directory.toStdString().c_str()));
++ return quint64(IndexReader::lastModified(directory.toLocal8Bit().constData()));
}
qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
{
using namespace lucene::index;
- return qint64(IndexReader::getCurrentVersion(directory));
-+ return qint64(IndexReader::getCurrentVersion(directory.toStdString().c_str()));
++ return qint64(IndexReader::getCurrentVersion(directory.toLocal8Bit().constData()));
}
void QCLuceneIndexReader::close()
-@@ -155,7 +155,7 @@ bool QCLuceneIndexReader::document(qint3
+@@ -155,7 +155,7 @@
void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
{
TCHAR *fieldName = QStringToTChar(field);
@@ -288,34 +287,34 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp.sys
delete [] fieldName;
}
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp
---- qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp.system_clucene 2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp 2014-05-30 12:31:10.925201269 -0500
-@@ -50,7 +50,7 @@ QCLuceneIndexWriter::QCLuceneIndexWriter
+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-system-clucene/src/assistant/clucene/qindexwriter.cpp 2014-10-26 03:15:43.000000000 +0100
+@@ -50,7 +50,7 @@
: d(new QCLuceneIndexWriterPrivate())
, analyzer(analyzer)
{
- d->writer = new lucene::index::IndexWriter(path,
-+ d->writer = new lucene::index::IndexWriter(path.toStdString().c_str(),
++ d->writer = new lucene::index::IndexWriter(path.toLocal8Bit().constData(),
analyzer.d->analyzer, create, closeDir);
}
-diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp.system_clucene qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp
---- qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp.system_clucene 2014-05-15 12:12:39.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp 2014-05-30 12:31:10.926201287 -0500
-@@ -95,7 +95,7 @@ QCLuceneIndexSearcher::QCLuceneIndexSear
+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-system-clucene/src/assistant/clucene/qsearchable.cpp 2014-10-26 03:16:03.000000000 +0100
+@@ -95,7 +95,7 @@
: QCLuceneSearcher()
{
lucene::search::IndexSearcher *searcher =
- new lucene::search::IndexSearcher(path);
-+ new lucene::search::IndexSearcher(path.toStdString().c_str());
++ new lucene::search::IndexSearcher(path.toLocal8Bit().constData());
reader.d->reader = searcher->getReader();
reader.d->deleteCLuceneIndexReader = false;
-diff -up qttools-opensource-src-5.3.0/src/assistant/help/help.pro.system_clucene qttools-opensource-src-5.3.0/src/assistant/help/help.pro
---- qttools-opensource-src-5.3.0/src/assistant/help/help.pro.system_clucene 2014-05-15 12:12:40.000000000 -0500
-+++ qttools-opensource-src-5.3.0/src/assistant/help/help.pro 2014-05-30 12:50:57.233287205 -0500
-@@ -34,6 +34,7 @@ SOURCES += qhelpenginecore.cpp \
+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-system-clucene/src/assistant/help/help.pro 2014-10-26 03:13:07.000000000 +0100
+@@ -34,6 +34,7 @@
qhelp_global.cpp
# access to clucene
More information about the scm-commits
mailing list