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

disable bootstrap (reenable -doc), system-clucene cleanups

Browse Source 
* Sun Oct 26 2014 Kevin Kofler <Kevin@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)
This commit is contained in:
Kevin Kofler 2014-10-26 03:25:43 +01:00
parent c531fc127a
commit 76aa8d92b6
2 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qt5-qttools.spec
View File

@ -1,5 +1,5 @@
%global bootstrap 1 #global bootstrap 1
%global qt_module qttools %global qt_module qttools
%if 0%{?fedora} || 0%{?rhel} > 6 %if 0%{?fedora} || 0%{?rhel} > 6
%global system_clucene 1 %global system_clucene 1
@ -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.3.%{pre}%{?dist} Release: 0.4.%{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
@ -54,7 +54,7 @@ BuildRequires: qt5-qtdeclarative-static
BuildRequires: qt5-qtwebkit-devel BuildRequires: qt5-qtwebkit-devel
%if 0%{?system_clucene} %if 0%{?system_clucene}
BuildRequires: clucene09-core-devel >= 0.9.21b-11 BuildRequires: clucene09-core-devel >= 0.9.21b-12
%endif %endif
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
@ -423,6 +423,12 @@ fi
%changelog %changelog
* Sun Oct 26 2014 Kevin Kofler <Kevin@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@fedoraproject.org> - 5.4.0-0.3.beta * Sat Oct 25 2014 Rex Dieter <rdieter@fedoraproject.org> - 5.4.0-0.3.beta
- libQt5Designer should be in a subpackage (#1156685) - libQt5Designer should be in a subpackage (#1156685)
- -doc: disable(boostrap for new clucene), drop dep on main pkg - -doc: disable(boostrap for new clucene), drop dep on main pkg

79
qttools-opensource-src-5.3.0-system-clucene.patch → qttools-opensource-src-5.3.2-system-clucene.patch
View File

@ -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 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.0/src/assistant/clucene/fulltextsearch.pri.system_clucene 2014-05-15 12:12:39.000000000 -0500 --- qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/fulltextsearch.pri 2014-05-30 12:31:10.921201196 -0500 +++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri 2014-10-26 03:14:22.000000000 +0100
@@ -1,125 +1,8 @@ @@ -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
- -
@ -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] +INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
+LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene +LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
+#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!) +#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!)
+QMAKE_CXXFLAGS += -fpermissive
#Header files #Header files
HEADERS += qclucene_global_p.h \ 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 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.0/src/assistant/clucene/qclucene-config_p.h.system_clucene 2014-05-15 12:12:39.000000000 -0500 --- 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.0/src/assistant/clucene/qclucene-config_p.h 2014-05-30 12:31:10.922201214 -0500 +++ 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 @@ @@ -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 #ifndef QCLUCENE_CONFIG_P_H
#define 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 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.0/src/assistant/clucene/qclucene_global_p.h.system_clucene 2014-05-15 12:12:39.000000000 -0500 --- 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.0/src/assistant/clucene/qclucene_global_p.h 2014-05-30 12:31:10.923201233 -0500 +++ 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 @@ @@ -29,20 +29,10 @@
// We mean it. // 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 QT_BEGIN_NAMESPACE
@@ -54,52 +44,6 @@ QT_BEGIN_NAMESPACE @@ -54,52 +44,6 @@
# define Q_CLUCENE_EXPORT Q_DECL_IMPORT # define Q_CLUCENE_EXPORT Q_DECL_IMPORT
#endif #endif
@ -221,65 +220,65 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h.
namespace QtCLuceneHelpers { namespace QtCLuceneHelpers {
inline TCHAR* QStringToTChar(const QString &str) 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 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.0/src/assistant/clucene/qindexreader.cpp.system_clucene 2014-05-15 12:12:39.000000000 -0500 --- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp 2014-05-30 12:31:10.924201251 -0500 +++ 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 @@ bool QCLuceneIndexReader::isLuceneFile(c @@ -59,13 +59,13 @@
{ {
using namespace lucene::index; using namespace lucene::index;
- return IndexReader::isLuceneFile(filename); - return IndexReader::isLuceneFile(filename);
+ return IndexReader::isLuceneFile(filename.toStdString().c_str()); + return IndexReader::isLuceneFile(filename.toLocal8Bit().constData());
} }
bool QCLuceneIndexReader::indexExists(const QString &directory) bool QCLuceneIndexReader::indexExists(const QString &directory)
{ {
using namespace lucene::index; using namespace lucene::index;
- return IndexReader::indexExists(directory); - return IndexReader::indexExists(directory);
+ return IndexReader::indexExists(directory.toStdString().c_str()); + return IndexReader::indexExists(directory.toLocal8Bit().constData());
} }
QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path) QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
@@ -73,7 +73,7 @@ QCLuceneIndexReader QCLuceneIndexReader: @@ -73,7 +73,7 @@
using namespace lucene::index; using namespace lucene::index;
QCLuceneIndexReader indexReader; QCLuceneIndexReader indexReader;
- indexReader.d->reader = IndexReader::open(path); - 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; return indexReader;
} }
@@ -81,25 +81,25 @@ QCLuceneIndexReader QCLuceneIndexReader: @@ -81,25 +81,25 @@
void QCLuceneIndexReader::unlock(const QString &path) void QCLuceneIndexReader::unlock(const QString &path)
{ {
using namespace lucene::index; using namespace lucene::index;
- IndexReader::unlock(path); - IndexReader::unlock(path);
+ IndexReader::unlock(path.toStdString().c_str()); + IndexReader::unlock(path.toLocal8Bit().constData());
} }
bool QCLuceneIndexReader::isLocked(const QString &directory) bool QCLuceneIndexReader::isLocked(const QString &directory)
{ {
using namespace lucene::index; using namespace lucene::index;
- return IndexReader::isLocked(directory); - return IndexReader::isLocked(directory);
+ return IndexReader::isLocked(directory.toStdString().c_str()); + return IndexReader::isLocked(directory.toLocal8Bit().constData());
} }
quint64 QCLuceneIndexReader::lastModified(const QString &directory) quint64 QCLuceneIndexReader::lastModified(const QString &directory)
{ {
using namespace lucene::index; using namespace lucene::index;
- return quint64(IndexReader::lastModified(directory)); - 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) qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
{ {
using namespace lucene::index; using namespace lucene::index;
- return qint64(IndexReader::getCurrentVersion(directory)); - return qint64(IndexReader::getCurrentVersion(directory));
+ return qint64(IndexReader::getCurrentVersion(directory.toStdString().c_str())); + return qint64(IndexReader::getCurrentVersion(directory.toLocal8Bit().constData()));
} }
void QCLuceneIndexReader::close() 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) void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
{ {
TCHAR *fieldName = QStringToTChar(field); TCHAR *fieldName = QStringToTChar(field);
@ -288,34 +287,34 @@ diff -up qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp.sys
delete [] fieldName; 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 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.0/src/assistant/clucene/qindexwriter.cpp.system_clucene 2014-05-15 12:12:39.000000000 -0500 --- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp 2014-05-30 12:31:10.925201269 -0500 +++ 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 @@ QCLuceneIndexWriter::QCLuceneIndexWriter @@ -50,7 +50,7 @@
: d(new QCLuceneIndexWriterPrivate()) : d(new QCLuceneIndexWriterPrivate())
, analyzer(analyzer) , analyzer(analyzer)
{ {
- d->writer = new lucene::index::IndexWriter(path, - 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); 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 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.0/src/assistant/clucene/qsearchable.cpp.system_clucene 2014-05-15 12:12:39.000000000 -0500 --- qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable.cpp 2014-05-30 12:31:10.926201287 -0500 +++ 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 @@ QCLuceneIndexSearcher::QCLuceneIndexSear @@ -95,7 +95,7 @@
: QCLuceneSearcher() : QCLuceneSearcher()
{ {
lucene::search::IndexSearcher *searcher = lucene::search::IndexSearcher *searcher =
- new lucene::search::IndexSearcher(path); - 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->reader = searcher->getReader();
reader.d->deleteCLuceneIndexReader = false; 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 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.0/src/assistant/help/help.pro.system_clucene 2014-05-15 12:12:40.000000000 -0500 --- qttools-opensource-src-5.3.2/src/assistant/help/help.pro 2014-09-11 12:48:25.000000000 +0200
+++ qttools-opensource-src-5.3.0/src/assistant/help/help.pro 2014-05-30 12:50:57.233287205 -0500 +++ 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 @@ SOURCES += qhelpenginecore.cpp \ @@ -34,6 +34,7 @@
qhelp_global.cpp qhelp_global.cpp
# access to clucene # access to clucene