rdieter pushed to qt5-qttools (el6). "Merge branch 'master' into f20"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 11 04:06:06 UTC 2015
>From 377894093ae834d358bab144ada0eb3b0fa32268 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 18 Oct 2014 20:22:20 -0500
Subject: 5.4.0-beta
diff --git a/.gitignore b/.gitignore
index 76e8c5e..9c62b88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qttools-opensource-src-5.3.2.tar.xz
+/qttools-opensource-src-5.4.0-beta.tar.xz
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 2b3a3b4..88e18a3 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -9,18 +9,20 @@
%define docs 1
%endif
+%define pre beta
+
Summary: Qt5 - QtTool components
Name: qt5-qttools
-Version: 5.3.2
-Release: 2%{?dist}
+Version: 5.4.0
+Release: 0.1.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/
%if 0%{?pre:1}
-Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
+Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
%else
-Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
+Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
%endif
Patch1: qttools-opensource-src-5.3.0-system-clucene.patch
@@ -64,9 +66,6 @@ BuildRequires: clucene-core-devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa}
-# Qt5DesignerConfig.cmake references libqwebview.so
-# at least until we omit/split-out *Plugin.cmake files from packaging
-Requires: qt5-designer-plugin-webkit%{?_isa}
Provides: qt5-designer = %{version}-%{release}
Provides: qt5-linguist = %{version}-%{release}
%description devel
@@ -227,6 +226,7 @@ fi
%{_qt5_libdir}/libQt5DesignerComponents.so.5*
%{_qt5_libdir}/libQt5Help.so.5*
%{_qt5_datadir}/phrasebooks/
+%dir %{_qt5_libdir}/cmake/Qt5Designer/
%post -n qt5-assistant
touch --no-create %{_datadir}/icons/hicolor ||:
@@ -248,6 +248,7 @@ fi
%files -n qt5-designer-plugin-webkit
%{_qt5_plugindir}/designer/libqwebview.so
+%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
%post -n qt5-qdbusviewer
touch --no-create %{_datadir}/icons/hicolor ||:
@@ -311,9 +312,12 @@ fi
%{_qt5_libdir}/libQt5Designer*.so
%{_qt5_libdir}/libQt5Help.prl
%{_qt5_libdir}/libQt5Help.so
-%{_qt5_libdir}/cmake/Qt5Designer/
-%{_qt5_libdir}/cmake/Qt5Help/
-%{_qt5_libdir}/cmake/Qt5LinguistTools/
+%{_qt5_libdir}/cmake/Qt5Designer/Qt5DesignerConfig*.cmake
+%dir %{_qt5_libdir}/cmake/Qt5Help/
+%{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake
+%dir %{_qt5_libdir}/cmake/Qt5LinguistTools/
+%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake
+%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
%{_qt5_libdir}/pkgconfig/Qt5CLucene.pc
%{_qt5_libdir}/pkgconfig/Qt5Designer.pc
%{_qt5_libdir}/pkgconfig/Qt5DesignerComponents.pc
@@ -329,6 +333,11 @@ fi
%{_qt5_plugindir}/designer/libtaskmenuextension.so
%{_qt5_plugindir}/designer/libworldtimeclockplugin.so
%{_qt5_plugindir}/designer/libqquickwidget.so
+%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake
+%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake
+%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
+%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake
+%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake
%files static
%{_qt5_headerdir}/QtUiTools/
@@ -358,6 +367,9 @@ fi
%changelog
+* Sat Oct 18 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.1.beta
+- 5.4.0-beta
+
* Fri Oct 17 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-2
- -devel: Requires: qt5-designer-plugin-webkit
diff --git a/sources b/sources
index d84c81c..d57abee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9074cc89bc52aea7f76a4d231d2f0ef6 qttools-opensource-src-5.3.2.tar.xz
+1e1e24d14ccf9eb06dfb539e7c0f8a3d qttools-opensource-src-5.4.0-beta.tar.xz
--
cgit v0.10.2
>From 035d70862b6dd074ba9604b93d5ec73dcc54a322 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun, 26 Oct 2014 00:34:04 +0200
Subject: BR and rebuild against reference-counting-enabled clucene09
(#1128293)
* Sat Oct 25 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.4.0-0.2.beta
- BR and rebuild against reference-counting-enabled clucene09 (#1128293)
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 88e18a3..a987491 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,6 +1,8 @@
%global qt_module qttools
+%if 0%{?fedora} || 0%{?rhel} > 6
%global system_clucene 1
+%endif
# define to build docs, need to undef this for bootstrapping
# where qt5-qttools builds are not yet available
@@ -14,7 +16,7 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.4.0
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -49,12 +51,7 @@ BuildRequires: qt5-qtdeclarative-static
BuildRequires: qt5-qtwebkit-devel
%if 0%{?system_clucene}
-%if 0%{?fedora} || 0%{?rhel} > 6
-BuildRequires: clucene09-core-devel
-%else
-BuildConflicts: clucene-core-devel > 2
-BuildRequires: clucene-core-devel
-%endif
+BuildRequires: clucene09-core-devel >= 0.9.21b-11
%endif
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@@ -367,6 +364,9 @@ fi
%changelog
+* Sat Oct 25 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.4.0-0.2.beta
+- BR and rebuild against reference-counting-enabled clucene09 (#1128293)
+
* Sat Oct 18 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.1.beta
- 5.4.0-beta
diff --git a/qttools-opensource-src-5.3.0-system-clucene.patch b/qttools-opensource-src-5.3.0-system-clucene.patch
index 21fd880..343d2a9 100644
--- a/qttools-opensource-src-5.3.0-system-clucene.patch
+++ b/qttools-opensource-src-5.3.0-system-clucene.patch
@@ -126,7 +126,7 @@ 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
++#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!)
+QMAKE_CXXFLAGS += -fpermissive
#Header files
--
cgit v0.10.2
>From 0f05c69c8d07599fb330edd968ee9a1501be0453 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 25 Oct 2014 18:17:21 -0500
Subject: 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/qt5-qttools.spec b/qt5-qttools.spec
index a987491..8048817 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,4 +1,5 @@
+%global bootstrap 1
%global qt_module qttools
%if 0%{?fedora} || 0%{?rhel} > 6
%global system_clucene 1
@@ -7,16 +8,18 @@
# define to build docs, need to undef this for bootstrapping
# where qt5-qttools builds are not yet available
# only primary archs (for now), allow secondary to bootstrap
+%if ! 0%{?bootstrap}
%ifarch %{arm} %{ix86} x86_64
%define docs 1
%endif
+%endif
%define pre beta
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.4.0
-Release: 0.2.%{pre}%{?dist}
+Release: 0.3.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -54,14 +57,28 @@ BuildRequires: qt5-qtwebkit-devel
BuildRequires: clucene09-core-devel >= 0.9.21b-11
%endif
+Requires: %{name}-common = %{version}-%{release}
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
+# when -libs were split out, for multilib upgrade path
+Obsoletes: qt5-tools < 5.4.0-0.2
+
%description
%{summary}.
+%package common
+Summary: Common files for %{name}
+BuildArch: noarch
+%description common
+%{summary}.
+
%package devel
Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: libqt5clucene%{?_isa} = %{version}-%{release}
+Requires: libqt5designer%{?_isa} = %{version}-%{release}
+Requires: libqt5designercomponents%{?_isa} = %{version}-%{release}
+Requires: libqt5help%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa}
Provides: qt5-designer = %{version}-%{release}
Provides: qt5-linguist = %{version}-%{release}
@@ -74,20 +91,53 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description static
%{summary}.
+%package -n libqt5clucene
+Summary: Qt5 CLucene runtime library
+Requires: %{name}-common = %{version}-%{release}
+# when split happened
+Conflicts: qt5-tools < 5.4.0-0.2
+%description -n libqt5clucene
+%{summary}.
+
+%package -n libqt5designer
+Summary: Qt5 Designer runtime library
+Requires: %{name}-common = %{version}-%{release}
+# when split happened
+Conflicts: qt5-tools < 5.4.0-0.2
+%description -n libqt5designer
+%{summary}.
+
+%package -n libqt5designercomponents
+Summary: Qt5 Designer Components runtime library
+Requires: %{name}-common = %{version}-%{release}
+# when split happened
+Conflicts: qt5-tools < 5.4.0-0.2
+%description -n libqt5designercomponents
+%{summary}.
+
+%package -n libqt5help
+Summary: Qt5 Help runtime library
+Requires: %{name}-common = %{version}-%{release}
+# when split happened
+Conflicts: qt5-tools < 5.4.0-0.2
+%description -n libqt5help
+%{summary}.
+
%package -n qt5-assistant
Summary: Documentation browser for Qt5
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
%description -n qt5-assistant
%{summary}.
%package -n qt5-designer-plugin-webkit
Summary: Qt5 designer plugin for WebKit
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: libqt5designer%{?_isa} = %{version}-%{release}
%description -n qt5-designer-plugin-webkit
%{summary}.
%package -n qt5-qdbusviewer
Summary: D-Bus debugger and viewer
+Requires: %{name}-common = %{version}-%{release}
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
%description -n qt5-qdbusviewer
QDbusviewer can be used to inspect D-Bus objects of running programs
@@ -96,7 +146,6 @@ and invoke methods on those objects.
%if 0%{?docs}
%package doc
Summary: API documentation for %{name}
-Requires: %{name} = %{version}-%{release}
# for qhelpgenerator
BuildRequires: qt5-qttools-devel
BuildArch: noarch
@@ -106,7 +155,7 @@ BuildArch: noarch
%package examples
Summary: Programming examples for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
%description examples
%{summary}.
@@ -199,31 +248,36 @@ popd
%endif
-%post
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%posttrans
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-fi
-
%files
%{_bindir}/qdbus-qt5
%{_bindir}/qtpaths
-%{_qt5_bindir}/qdbus*
+%{_qt5_bindir}/qdbus
+%{_qt5_bindir}/qdbus-qt5
%{_qt5_bindir}/qtpaths
+
+%files common
+%doc LGPL_EXCEPTION.txt LICENSE.LGPL*
+
+%post -n libqt5clucene -p /sbin/ldconfig
+%postun -n libqt5clucene -p /sbin/ldconfig
+%files -n libqt5clucene
%{_qt5_libdir}/libQt5CLucene.so.5*
+
+%post -n libqt5designer -p /sbin/ldconfig
+%postun -n libqt5designer -p /sbin/ldconfig
+%files -n libqt5designer
%{_qt5_libdir}/libQt5Designer.so.5*
+%dir %{_qt5_libdir}/cmake/Qt5Designer/
+
+%post -n libqt5designercomponents -p /sbin/ldconfig
+%postun -n libqt5designercomponents -p /sbin/ldconfig
+%files -n libqt5designercomponents
%{_qt5_libdir}/libQt5DesignerComponents.so.5*
+
+%post -n libqt5help -p /sbin/ldconfig
+%postun -n libqt5help -p /sbin/ldconfig
+%files -n libqt5help
%{_qt5_libdir}/libQt5Help.so.5*
-%{_qt5_datadir}/phrasebooks/
-%dir %{_qt5_libdir}/cmake/Qt5Designer/
%post -n qt5-assistant
touch --no-create %{_datadir}/icons/hicolor ||:
@@ -303,6 +357,8 @@ fi
%{_qt5_headerdir}/QtDesigner/
%{_qt5_headerdir}/QtDesignerComponents/
%{_qt5_headerdir}/QtHelp/
+# phrasebooks used by linguist
+%{_qt5_datadir}/phrasebooks/
%{_qt5_libdir}/libQt5CLucene.prl
%{_qt5_libdir}/libQt5CLucene.so
%{_qt5_libdir}/libQt5Designer*.prl
@@ -324,12 +380,14 @@ fi
%{_datadir}/applications/*linguist.desktop
%{_datadir}/icons/hicolor/*/apps/designer*.*
%{_datadir}/icons/hicolor/*/apps/linguist*.*
+
# example designer plugins
%{_qt5_plugindir}/designer/libcontainerextension.so
%{_qt5_plugindir}/designer/libcustomwidgetplugin.so
%{_qt5_plugindir}/designer/libtaskmenuextension.so
%{_qt5_plugindir}/designer/libworldtimeclockplugin.so
%{_qt5_plugindir}/designer/libqquickwidget.so
+%dir %{_qt5_libdir}/cmake/Qt5Designer/
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
@@ -345,6 +403,7 @@ fi
%if 0%{?docs}
%files doc
+%doc LICENSE.FDL
%{_qt5_docdir}/qtassistant.qch
%{_qt5_docdir}/qtassistant/
%{_qt5_docdir}/qtdesigner.qch
@@ -364,6 +423,10 @@ fi
%changelog
+* 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
+
* Sat Oct 25 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.4.0-0.2.beta
- BR and rebuild against reference-counting-enabled clucene09 (#1128293)
--
cgit v0.10.2
>From 39d044988dc246857bbaeecfba676fcefecfb8c5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 25 Oct 2014 18:33:58 -0500
Subject: rename libqt5* -> %%name-libs-*
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 8048817..3592106 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -75,10 +75,10 @@ BuildArch: noarch
%package devel
Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release}
-Requires: libqt5clucene%{?_isa} = %{version}-%{release}
-Requires: libqt5designer%{?_isa} = %{version}-%{release}
-Requires: libqt5designercomponents%{?_isa} = %{version}-%{release}
-Requires: libqt5help%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs-clucene%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa}
Provides: qt5-designer = %{version}-%{release}
Provides: qt5-linguist = %{version}-%{release}
@@ -91,36 +91,36 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description static
%{summary}.
-%package -n libqt5clucene
+%package libs-clucene
Summary: Qt5 CLucene runtime library
Requires: %{name}-common = %{version}-%{release}
# when split happened
Conflicts: qt5-tools < 5.4.0-0.2
-%description -n libqt5clucene
+%description libs-clucene
%{summary}.
-%package -n libqt5designer
+%package libs-designer
Summary: Qt5 Designer runtime library
Requires: %{name}-common = %{version}-%{release}
# when split happened
Conflicts: qt5-tools < 5.4.0-0.2
-%description -n libqt5designer
+%description libs-designer
%{summary}.
-%package -n libqt5designercomponents
+%package libs-designercomponents
Summary: Qt5 Designer Components runtime library
Requires: %{name}-common = %{version}-%{release}
# when split happened
Conflicts: qt5-tools < 5.4.0-0.2
-%description -n libqt5designercomponents
+%description -n libs-designercomponents
%{summary}.
-%package -n libqt5help
+%package libs-help
Summary: Qt5 Help runtime library
Requires: %{name}-common = %{version}-%{release}
# when split happened
Conflicts: qt5-tools < 5.4.0-0.2
-%description -n libqt5help
+%description libs-help
%{summary}.
%package -n qt5-assistant
@@ -131,7 +131,7 @@ Requires: %{name}-common = %{version}-%{release}
%package -n qt5-designer-plugin-webkit
Summary: Qt5 designer plugin for WebKit
-Requires: libqt5designer%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
%description -n qt5-designer-plugin-webkit
%{summary}.
@@ -258,25 +258,25 @@ popd
%files common
%doc LGPL_EXCEPTION.txt LICENSE.LGPL*
-%post -n libqt5clucene -p /sbin/ldconfig
-%postun -n libqt5clucene -p /sbin/ldconfig
-%files -n libqt5clucene
+%post libs-clucene -p /sbin/ldconfig
+%postun libs-clucene -p /sbin/ldconfig
+%files libs-clucene
%{_qt5_libdir}/libQt5CLucene.so.5*
-%post -n libqt5designer -p /sbin/ldconfig
-%postun -n libqt5designer -p /sbin/ldconfig
-%files -n libqt5designer
+%post libs-designer -p /sbin/ldconfig
+%postun libs-designer -p /sbin/ldconfig
+%files libs-designer
%{_qt5_libdir}/libQt5Designer.so.5*
%dir %{_qt5_libdir}/cmake/Qt5Designer/
-%post -n libqt5designercomponents -p /sbin/ldconfig
-%postun -n libqt5designercomponents -p /sbin/ldconfig
-%files -n libqt5designercomponents
+%post libs-designercomponents -p /sbin/ldconfig
+%postun libs-designercomponents -p /sbin/ldconfig
+%files libs-designercomponents
%{_qt5_libdir}/libQt5DesignerComponents.so.5*
-%post -n libqt5help -p /sbin/ldconfig
-%postun -n libqt5help -p /sbin/ldconfig
-%files -n libqt5help
+%post libs-help -p /sbin/ldconfig
+%postun libs-help -p /sbin/ldconfig
+%files libs-help
%{_qt5_libdir}/libQt5Help.so.5*
%post -n qt5-assistant
--
cgit v0.10.2
>From c531fc127a8227a0a8a9ef4a6fcc7e4f54c17ed4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 25 Oct 2014 18:34:59 -0500
Subject: one last -n for subpkg
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 3592106..d219a55 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -112,7 +112,7 @@ Summary: Qt5 Designer Components runtime library
Requires: %{name}-common = %{version}-%{release}
# when split happened
Conflicts: qt5-tools < 5.4.0-0.2
-%description -n libs-designercomponents
+%description libs-designercomponents
%{summary}.
%package libs-help
--
cgit v0.10.2
>From 76aa8d92b6abdbc3b93d623c56573741093373d2 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun, 26 Oct 2014 03:25:43 +0100
Subject: 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)
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.0-system-clucene.patch
deleted file mode 100644
index 343d2a9..0000000
--- a/qttools-opensource-src-5.3.0-system-clucene.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-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 @@
--DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
--win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
--
--CLUCENEDIR = ../3rdparty/clucene/src/CLucene
--
--INCLUDEPATH += . .. \
-- $$CLUCENEDIR \
-- $$CLUCENEDIR/../ \
-- $$CLUCENEDIR/analysis \
-- $$CLUCENEDIR/analysis/standard \
-- $$CLUCENEDIR/config \
-- $$CLUCENEDIR/debug \
-- $$CLUCENEDIR/document \
-- $$CLUCENEDIR/index \
-- $$CLUCENEDIR/queryParser \
-- $$CLUCENEDIR/search \
-- $$CLUCENEDIR/store \
-- $$CLUCENEDIR/util
--
--
--SOURCES += $$CLUCENEDIR/StdHeader.cpp \
-- $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
-- $$CLUCENEDIR/analysis/Analyzers.cpp \
-- $$CLUCENEDIR/config/gunichartables.cpp \
-- $$CLUCENEDIR/config/repl_lltot.cpp \
-- $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
-- $$CLUCENEDIR/config/repl_tcslwr.cpp \
-- $$CLUCENEDIR/config/repl_tcstod.cpp \
-- $$CLUCENEDIR/config/repl_tcstoll.cpp \
-- $$CLUCENEDIR/config/repl_tprintf.cpp \
-- $$CLUCENEDIR/config/threads.cpp \
-- $$CLUCENEDIR/config/utf8.cpp \
-- $$CLUCENEDIR/debug/condition.cpp \
-- $$CLUCENEDIR/debug/error.cpp \
-- $$CLUCENEDIR/debug/memtracking.cpp \
-- $$CLUCENEDIR/document/DateField.cpp \
-- $$CLUCENEDIR/document/Document.cpp \
-- $$CLUCENEDIR/document/Field.cpp \
-- $$CLUCENEDIR/index/CompoundFile.cpp \
-- $$CLUCENEDIR/index/DocumentWriter.cpp \
-- $$CLUCENEDIR/index/FieldInfos.cpp \
-- $$CLUCENEDIR/index/FieldsReader.cpp \
-- $$CLUCENEDIR/index/FieldsWriter.cpp \
-- $$CLUCENEDIR/index/IndexModifier.cpp \
-- $$CLUCENEDIR/index/IndexReader.cpp \
-- $$CLUCENEDIR/index/IndexWriter.cpp \
-- $$CLUCENEDIR/index/MultiReader.cpp \
-- $$CLUCENEDIR/index/SegmentInfos.cpp \
-- $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
-- $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
-- $$CLUCENEDIR/index/SegmentMerger.cpp \
-- $$CLUCENEDIR/index/SegmentReader.cpp \
-- $$CLUCENEDIR/index/SegmentTermDocs.cpp \
-- $$CLUCENEDIR/index/SegmentTermEnum.cpp \
-- $$CLUCENEDIR/index/SegmentTermPositions.cpp \
-- $$CLUCENEDIR/index/SegmentTermVector.cpp \
-- $$CLUCENEDIR/index/Term.cpp \
-- $$CLUCENEDIR/index/TermInfo.cpp \
-- $$CLUCENEDIR/index/TermInfosReader.cpp \
-- $$CLUCENEDIR/index/TermInfosWriter.cpp \
-- $$CLUCENEDIR/index/TermVectorReader.cpp \
-- $$CLUCENEDIR/index/TermVectorWriter.cpp \
-- $$CLUCENEDIR/queryParser/Lexer.cpp \
-- $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
-- $$CLUCENEDIR/queryParser/QueryParser.cpp \
-- $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
-- $$CLUCENEDIR/queryParser/QueryToken.cpp \
-- $$CLUCENEDIR/queryParser/TokenList.cpp \
-- $$CLUCENEDIR/search/BooleanQuery.cpp \
-- $$CLUCENEDIR/search/BooleanScorer.cpp \
-- $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
-- $$CLUCENEDIR/search/ChainedFilter.cpp \
-- $$CLUCENEDIR/search/ConjunctionScorer.cpp \
-- $$CLUCENEDIR/search/DateFilter.cpp \
-- $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
-- $$CLUCENEDIR/search/Explanation.cpp \
-- $$CLUCENEDIR/search/FieldCache.cpp \
-- $$CLUCENEDIR/search/FieldCacheImpl.cpp \
-- $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
-- $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
-- $$CLUCENEDIR/search/FilteredTermEnum.cpp \
-- $$CLUCENEDIR/search/FuzzyQuery.cpp \
-- $$CLUCENEDIR/search/HitQueue.cpp \
-- $$CLUCENEDIR/search/Hits.cpp \
-- $$CLUCENEDIR/search/IndexSearcher.cpp \
-- $$CLUCENEDIR/search/MultiSearcher.cpp \
-- $$CLUCENEDIR/search/MultiTermQuery.cpp \
-- $$CLUCENEDIR/search/PhrasePositions.cpp \
-- $$CLUCENEDIR/search/PhraseQuery.cpp \
-- $$CLUCENEDIR/search/PhraseScorer.cpp \
-- $$CLUCENEDIR/search/PrefixQuery.cpp \
-- $$CLUCENEDIR/search/QueryFilter.cpp \
-- $$CLUCENEDIR/search/RangeFilter.cpp \
-- $$CLUCENEDIR/search/RangeQuery.cpp \
-- $$CLUCENEDIR/search/SearchHeader.cpp \
-- $$CLUCENEDIR/search/Similarity.cpp \
-- $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
-- $$CLUCENEDIR/search/Sort.cpp \
-- $$CLUCENEDIR/search/TermQuery.cpp \
-- $$CLUCENEDIR/search/TermScorer.cpp \
-- $$CLUCENEDIR/search/WildcardQuery.cpp \
-- $$CLUCENEDIR/search/WildcardTermEnum.cpp \
-- $$CLUCENEDIR/store/FSDirectory.cpp \
-- $$CLUCENEDIR/store/IndexInput.cpp \
-- $$CLUCENEDIR/store/IndexOutput.cpp \
-- $$CLUCENEDIR/store/Lock.cpp \
-- $$CLUCENEDIR/store/MMapInput.cpp \
-- $$CLUCENEDIR/store/RAMDirectory.cpp \
-- $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
-- $$CLUCENEDIR/util/BitSet.cpp \
-- $$CLUCENEDIR/util/Equators.cpp \
-- $$CLUCENEDIR/util/FastCharStream.cpp \
-- $$CLUCENEDIR/util/fileinputstream.cpp \
-- $$CLUCENEDIR/util/Misc.cpp \
-- $$CLUCENEDIR/util/Reader.cpp \
-- $$CLUCENEDIR/util/StringBuffer.cpp \
-- $$CLUCENEDIR/util/StringIntern.cpp \
-- $$CLUCENEDIR/util/ThreadLocal.cpp \
-- $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
-- $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
-- $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
-
-+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
-@@ -15,6 +15,8 @@
- **
- ****************************************************************************/
-
-+#error This header must not be included when building against system CLucene.
-+
- #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
-@@ -29,20 +29,10 @@
- // We mean it.
- //
-
--#if !defined(_MSC_VER)
--# include "qclucene-config_p.h"
--#endif
--
- #include <QtCore/QChar>
- #include <QtCore/QString>
-
--#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
--# if !defined(TCHAR)
--# define TCHAR wchar_t
--# endif
--#else
--# include <qt_windows.h>
--#endif
-+#include <CLucene/StdHeader.h>
-
- QT_BEGIN_NAMESPACE
-
-@@ -54,52 +44,6 @@ QT_BEGIN_NAMESPACE
- # define Q_CLUCENE_EXPORT Q_DECL_IMPORT
- #endif
-
--//
--// W A R N I N G
--// -------------
--//
--// adjustments here, need to be done in
--// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
--//
--#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
--
--#elif !defined(DISABLE_NAMESPACE)
--# ifdef QT_NAMESPACE
--# define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
--# define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
--
--# define CL_NS_END }}}
--# define CL_NS_END2 }}}}
--
--# define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
--# define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
--
--# define CL_NS(sub) QT_NAMESPACE::lucene::sub
--# define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
--# else
--# define CL_NS_DEF(sub) namespace lucene{ namespace sub{
--# define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
--
--# define CL_NS_END }}
--# define CL_NS_END2 }}}
--
--# define CL_NS_USE(sub) using namespace lucene::sub;
--# define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
--
--# define CL_NS(sub) lucene::sub
--# define CL_NS2(sub,sub2) lucene::sub::sub2
--# endif
--#else
--# define CL_NS_DEF(sub)
--# define CL_NS_DEF2(sub, sub2)
--# define CL_NS_END
--# define CL_NS_END2
--# define CL_NS_USE(sub)
--# define CL_NS_USE2(sub,sub2)
--# define CL_NS(sub)
--# define CL_NS2(sub,sub2)
--#endif
--
- 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
- {
- using namespace lucene::index;
-
-- return IndexReader::isLuceneFile(filename);
-+ return IndexReader::isLuceneFile(filename.toStdString().c_str());
- }
-
- bool QCLuceneIndexReader::indexExists(const QString &directory)
- {
- using namespace lucene::index;
-- return IndexReader::indexExists(directory);
-+ return IndexReader::indexExists(directory.toStdString().c_str());
- }
-
- QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
-@@ -73,7 +73,7 @@ QCLuceneIndexReader QCLuceneIndexReader:
- using namespace lucene::index;
-
- QCLuceneIndexReader indexReader;
-- indexReader.d->reader = IndexReader::open(path);
-+ indexReader.d->reader = IndexReader::open(path.toStdString().c_str());
-
- return indexReader;
- }
-@@ -81,25 +81,25 @@ QCLuceneIndexReader QCLuceneIndexReader:
- void QCLuceneIndexReader::unlock(const QString &path)
- {
- using namespace lucene::index;
-- IndexReader::unlock(path);
-+ IndexReader::unlock(path.toStdString().c_str());
- }
-
- bool QCLuceneIndexReader::isLocked(const QString &directory)
- {
- using namespace lucene::index;
-- return IndexReader::isLocked(directory);
-+ return IndexReader::isLocked(directory.toStdString().c_str());
- }
-
- quint64 QCLuceneIndexReader::lastModified(const QString &directory)
- {
- using namespace lucene::index;
-- return quint64(IndexReader::lastModified(directory));
-+ return quint64(IndexReader::lastModified(directory.toStdString().c_str()));
- }
-
- qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
- {
- using namespace lucene::index;
-- return qint64(IndexReader::getCurrentVersion(directory));
-+ return qint64(IndexReader::getCurrentVersion(directory.toStdString().c_str()));
- }
-
- void QCLuceneIndexReader::close()
-@@ -155,7 +155,7 @@ bool QCLuceneIndexReader::document(qint3
- void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
- {
- TCHAR *fieldName = QStringToTChar(field);
-- d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
-+ d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
- 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
- : d(new QCLuceneIndexWriterPrivate())
- , analyzer(analyzer)
- {
-- d->writer = new lucene::index::IndexWriter(path,
-+ d->writer = new lucene::index::IndexWriter(path.toStdString().c_str(),
- 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
- : QCLuceneSearcher()
- {
- lucene::search::IndexSearcher *searcher =
-- new lucene::search::IndexSearcher(path);
-+ new lucene::search::IndexSearcher(path.toStdString().c_str());
-
- 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 \
- qhelp_global.cpp
-
- # access to clucene
-+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
- SOURCES += qhelpsearchindexwriter_clucene.cpp \
- qhelpsearchindexreader_clucene.cpp
- HEADERS += qhelpenginecore.h \
diff --git a/qttools-opensource-src-5.3.2-system-clucene.patch b/qttools-opensource-src-5.3.2-system-clucene.patch
new file mode 100644
index 0000000..087d52a
--- /dev/null
+++ b/qttools-opensource-src-5.3.2-system-clucene.patch
@@ -0,0 +1,324 @@
+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
+-
+-CLUCENEDIR = ../3rdparty/clucene/src/CLucene
+-
+-INCLUDEPATH += . .. \
+- $$CLUCENEDIR \
+- $$CLUCENEDIR/../ \
+- $$CLUCENEDIR/analysis \
+- $$CLUCENEDIR/analysis/standard \
+- $$CLUCENEDIR/config \
+- $$CLUCENEDIR/debug \
+- $$CLUCENEDIR/document \
+- $$CLUCENEDIR/index \
+- $$CLUCENEDIR/queryParser \
+- $$CLUCENEDIR/search \
+- $$CLUCENEDIR/store \
+- $$CLUCENEDIR/util
+-
+-
+-SOURCES += $$CLUCENEDIR/StdHeader.cpp \
+- $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
+- $$CLUCENEDIR/analysis/Analyzers.cpp \
+- $$CLUCENEDIR/config/gunichartables.cpp \
+- $$CLUCENEDIR/config/repl_lltot.cpp \
+- $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
+- $$CLUCENEDIR/config/repl_tcslwr.cpp \
+- $$CLUCENEDIR/config/repl_tcstod.cpp \
+- $$CLUCENEDIR/config/repl_tcstoll.cpp \
+- $$CLUCENEDIR/config/repl_tprintf.cpp \
+- $$CLUCENEDIR/config/threads.cpp \
+- $$CLUCENEDIR/config/utf8.cpp \
+- $$CLUCENEDIR/debug/condition.cpp \
+- $$CLUCENEDIR/debug/error.cpp \
+- $$CLUCENEDIR/debug/memtracking.cpp \
+- $$CLUCENEDIR/document/DateField.cpp \
+- $$CLUCENEDIR/document/Document.cpp \
+- $$CLUCENEDIR/document/Field.cpp \
+- $$CLUCENEDIR/index/CompoundFile.cpp \
+- $$CLUCENEDIR/index/DocumentWriter.cpp \
+- $$CLUCENEDIR/index/FieldInfos.cpp \
+- $$CLUCENEDIR/index/FieldsReader.cpp \
+- $$CLUCENEDIR/index/FieldsWriter.cpp \
+- $$CLUCENEDIR/index/IndexModifier.cpp \
+- $$CLUCENEDIR/index/IndexReader.cpp \
+- $$CLUCENEDIR/index/IndexWriter.cpp \
+- $$CLUCENEDIR/index/MultiReader.cpp \
+- $$CLUCENEDIR/index/SegmentInfos.cpp \
+- $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
+- $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
+- $$CLUCENEDIR/index/SegmentMerger.cpp \
+- $$CLUCENEDIR/index/SegmentReader.cpp \
+- $$CLUCENEDIR/index/SegmentTermDocs.cpp \
+- $$CLUCENEDIR/index/SegmentTermEnum.cpp \
+- $$CLUCENEDIR/index/SegmentTermPositions.cpp \
+- $$CLUCENEDIR/index/SegmentTermVector.cpp \
+- $$CLUCENEDIR/index/Term.cpp \
+- $$CLUCENEDIR/index/TermInfo.cpp \
+- $$CLUCENEDIR/index/TermInfosReader.cpp \
+- $$CLUCENEDIR/index/TermInfosWriter.cpp \
+- $$CLUCENEDIR/index/TermVectorReader.cpp \
+- $$CLUCENEDIR/index/TermVectorWriter.cpp \
+- $$CLUCENEDIR/queryParser/Lexer.cpp \
+- $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
+- $$CLUCENEDIR/queryParser/QueryParser.cpp \
+- $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
+- $$CLUCENEDIR/queryParser/QueryToken.cpp \
+- $$CLUCENEDIR/queryParser/TokenList.cpp \
+- $$CLUCENEDIR/search/BooleanQuery.cpp \
+- $$CLUCENEDIR/search/BooleanScorer.cpp \
+- $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
+- $$CLUCENEDIR/search/ChainedFilter.cpp \
+- $$CLUCENEDIR/search/ConjunctionScorer.cpp \
+- $$CLUCENEDIR/search/DateFilter.cpp \
+- $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
+- $$CLUCENEDIR/search/Explanation.cpp \
+- $$CLUCENEDIR/search/FieldCache.cpp \
+- $$CLUCENEDIR/search/FieldCacheImpl.cpp \
+- $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
+- $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
+- $$CLUCENEDIR/search/FilteredTermEnum.cpp \
+- $$CLUCENEDIR/search/FuzzyQuery.cpp \
+- $$CLUCENEDIR/search/HitQueue.cpp \
+- $$CLUCENEDIR/search/Hits.cpp \
+- $$CLUCENEDIR/search/IndexSearcher.cpp \
+- $$CLUCENEDIR/search/MultiSearcher.cpp \
+- $$CLUCENEDIR/search/MultiTermQuery.cpp \
+- $$CLUCENEDIR/search/PhrasePositions.cpp \
+- $$CLUCENEDIR/search/PhraseQuery.cpp \
+- $$CLUCENEDIR/search/PhraseScorer.cpp \
+- $$CLUCENEDIR/search/PrefixQuery.cpp \
+- $$CLUCENEDIR/search/QueryFilter.cpp \
+- $$CLUCENEDIR/search/RangeFilter.cpp \
+- $$CLUCENEDIR/search/RangeQuery.cpp \
+- $$CLUCENEDIR/search/SearchHeader.cpp \
+- $$CLUCENEDIR/search/Similarity.cpp \
+- $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
+- $$CLUCENEDIR/search/Sort.cpp \
+- $$CLUCENEDIR/search/TermQuery.cpp \
+- $$CLUCENEDIR/search/TermScorer.cpp \
+- $$CLUCENEDIR/search/WildcardQuery.cpp \
+- $$CLUCENEDIR/search/WildcardTermEnum.cpp \
+- $$CLUCENEDIR/store/FSDirectory.cpp \
+- $$CLUCENEDIR/store/IndexInput.cpp \
+- $$CLUCENEDIR/store/IndexOutput.cpp \
+- $$CLUCENEDIR/store/Lock.cpp \
+- $$CLUCENEDIR/store/MMapInput.cpp \
+- $$CLUCENEDIR/store/RAMDirectory.cpp \
+- $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
+- $$CLUCENEDIR/util/BitSet.cpp \
+- $$CLUCENEDIR/util/Equators.cpp \
+- $$CLUCENEDIR/util/FastCharStream.cpp \
+- $$CLUCENEDIR/util/fileinputstream.cpp \
+- $$CLUCENEDIR/util/Misc.cpp \
+- $$CLUCENEDIR/util/Reader.cpp \
+- $$CLUCENEDIR/util/StringBuffer.cpp \
+- $$CLUCENEDIR/util/StringIntern.cpp \
+- $$CLUCENEDIR/util/ThreadLocal.cpp \
+- $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
+- $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
+- $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
+
++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!)
+
+ #Header files
+ 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
+--- 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 @@
+ **
+ ****************************************************************************/
+
++#error This header must not be included when building against system CLucene.
++
+ #ifndef QCLUCENE_CONFIG_P_H
+ #define 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
+--- 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.
+ //
+
+-#if !defined(_MSC_VER)
+-# include "qclucene-config_p.h"
+-#endif
+-
+ #include <QtCore/QChar>
+ #include <QtCore/QString>
+
+-#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+-# if !defined(TCHAR)
+-# define TCHAR wchar_t
+-# endif
+-#else
+-# include <qt_windows.h>
+-#endif
++#include <CLucene/StdHeader.h>
+
+ QT_BEGIN_NAMESPACE
+
+@@ -54,52 +44,6 @@
+ # define Q_CLUCENE_EXPORT Q_DECL_IMPORT
+ #endif
+
+-//
+-// W A R N I N G
+-// -------------
+-//
+-// adjustments here, need to be done in
+-// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
+-//
+-#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
+-
+-#elif !defined(DISABLE_NAMESPACE)
+-# ifdef QT_NAMESPACE
+-# define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
+-# define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
+-
+-# define CL_NS_END }}}
+-# define CL_NS_END2 }}}}
+-
+-# define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
+-# define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
+-
+-# define CL_NS(sub) QT_NAMESPACE::lucene::sub
+-# define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
+-# else
+-# define CL_NS_DEF(sub) namespace lucene{ namespace sub{
+-# define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
+-
+-# define CL_NS_END }}
+-# define CL_NS_END2 }}}
+-
+-# define CL_NS_USE(sub) using namespace lucene::sub;
+-# define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
+-
+-# define CL_NS(sub) lucene::sub
+-# define CL_NS2(sub,sub2) lucene::sub::sub2
+-# endif
+-#else
+-# define CL_NS_DEF(sub)
+-# define CL_NS_DEF2(sub, sub2)
+-# define CL_NS_END
+-# define CL_NS_END2
+-# define CL_NS_USE(sub)
+-# define CL_NS_USE2(sub,sub2)
+-# define CL_NS(sub)
+-# define CL_NS2(sub,sub2)
+-#endif
+-
+ namespace QtCLuceneHelpers {
+ inline TCHAR* QStringToTChar(const QString &str)
+ {
+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.toLocal8Bit().constData());
+ }
+
+ bool QCLuceneIndexReader::indexExists(const QString &directory)
+ {
+ using namespace lucene::index;
+- return IndexReader::indexExists(directory);
++ return IndexReader::indexExists(directory.toLocal8Bit().constData());
+ }
+
+ QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
+@@ -73,7 +73,7 @@
+ using namespace lucene::index;
+
+ QCLuceneIndexReader indexReader;
+- indexReader.d->reader = IndexReader::open(path);
++ indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData());
+
+ return indexReader;
+ }
+@@ -81,25 +81,25 @@
+ void QCLuceneIndexReader::unlock(const QString &path)
+ {
+ using namespace lucene::index;
+- IndexReader::unlock(path);
++ IndexReader::unlock(path.toLocal8Bit().constData());
+ }
+
+ bool QCLuceneIndexReader::isLocked(const QString &directory)
+ {
+ using namespace lucene::index;
+- return IndexReader::isLocked(directory);
++ 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.toLocal8Bit().constData()));
+ }
+
+ qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
+ {
+ using namespace lucene::index;
+- return qint64(IndexReader::getCurrentVersion(directory));
++ return qint64(IndexReader::getCurrentVersion(directory.toLocal8Bit().constData()));
+ }
+
+ void QCLuceneIndexReader::close()
+@@ -155,7 +155,7 @@
+ void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
+ {
+ TCHAR *fieldName = QStringToTChar(field);
+- d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
++ d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
+ delete [] fieldName;
+ }
+
+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.toLocal8Bit().constData(),
+ analyzer.d->analyzer, create, closeDir);
+ }
+
+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.toLocal8Bit().constData());
+
+ reader.d->reader = searcher->getReader();
+ 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
+--- 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
++INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
+ SOURCES += qhelpsearchindexwriter_clucene.cpp \
+ qhelpsearchindexreader_clucene.cpp
+ HEADERS += qhelpenginecore.h \
--
cgit v0.10.2
>From 4560f58f0441fee12b39b7924467c530a8312276 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun, 26 Oct 2014 03:31:20 +0100
Subject: update Patch1 file name
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 98af8b9..9d853d9 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -30,7 +30,7 @@ Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%
Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
%endif
-Patch1: qttools-opensource-src-5.3.0-system-clucene.patch
+Patch1: qttools-opensource-src-5.3.2-system-clucene.patch
# help lrelease/lupdate use/prefer qmake-qt5
# https://bugzilla.redhat.com/show_bug.cgi?id=1009893
--
cgit v0.10.2
>From 97edc45b8c12d8a68fb26f9d4f4a62bd632de70f Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Mon, 27 Oct 2014 00:13:10 +0100
Subject: system-clucene patch: create path recursively in QtCLucene, CLucene
can't
* Sun Oct 26 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.4.0-0.5.beta
- system-clucene patch: create path recursively in QtCLucene, CLucene can't
This should fix the failure to write an index.
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 9d853d9..291315d 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -19,7 +19,7 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.4.0
-Release: 0.4.%{pre}%{?dist}
+Release: 0.5.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -423,6 +423,9 @@ fi
%changelog
+* Sun Oct 26 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.4.0-0.5.beta
+- system-clucene patch: create path recursively in QtCLucene, CLucene can't
+
* 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
diff --git a/qttools-opensource-src-5.3.2-system-clucene.patch b/qttools-opensource-src-5.3.2-system-clucene.patch
index 087d52a..958d973 100644
--- a/qttools-opensource-src-5.3.2-system-clucene.patch
+++ b/qttools-opensource-src-5.3.2-system-clucene.patch
@@ -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
--- 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
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri 2014-10-27 00:09:28.000000000 +0100
@@ -1,125 +1,7 @@
-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
-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 \
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
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h 2014-10-27 00:09:28.000000000 +0100
@@ -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
--- 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
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h 2014-10-27 00:09:28.000000000 +0100
@@ -29,20 +29,10 @@
// We mean it.
//
@@ -222,7 +222,7 @@ 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
--- 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
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp 2014-10-27 00:09:28.000000000 +0100
@@ -59,13 +59,13 @@
{
using namespace lucene::index;
@@ -289,19 +289,33 @@ 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
--- 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 @@
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp 2014-10-27 00:10:06.000000000 +0100
+@@ -18,6 +18,8 @@
+ #include "qindexwriter_p.h"
+ #include "qindexreader_p.h"
+
++#include <QtCore/QDir>
++
+ #include <CLucene.h>
+ #include <CLucene/index/IndexWriter.h>
+
+@@ -50,7 +52,12 @@
: d(new QCLuceneIndexWriterPrivate())
, analyzer(analyzer)
{
- d->writer = new lucene::index::IndexWriter(path,
++ // The system CLucene cannot create directories recursively, so do it here.
++ // Ignore failure: If it failed, we will get an error from CLucene anyway.
++ if (create)
++ QDir::current().mkpath(path);
++
+ d->writer = new lucene::index::IndexWriter(path.toLocal8Bit().constData(),
analyzer.d->analyzer, create, closeDir);
}
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
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp 2014-10-27 00:09:28.000000000 +0100
@@ -95,7 +95,7 @@
: QCLuceneSearcher()
{
@@ -313,7 +327,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp qtto
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
--- 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
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro 2014-10-27 00:09:28.000000000 +0100
@@ -34,6 +34,7 @@
qhelp_global.cpp
--
cgit v0.10.2
>From c63ded3c4c4ae7ae9409f65722c3737768d786f9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 31 Oct 2014 19:25:12 -0500
Subject: respin system-clucene.patch
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 291315d..939b455 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -19,7 +19,7 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.4.0
-Release: 0.5.%{pre}%{?dist}
+Release: 0.6.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -423,6 +423,9 @@ fi
%changelog
+* Fri Oct 31 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.6.beta
+- respin system-clucene.patch
+
* Sun Oct 26 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.4.0-0.5.beta
- system-clucene patch: create path recursively in QtCLucene, CLucene can't
diff --git a/qttools-opensource-src-5.3.2-system-clucene.patch b/qttools-opensource-src-5.3.2-system-clucene.patch
index 958d973..5a358f5 100644
--- a/qttools-opensource-src-5.3.2-system-clucene.patch
+++ b/qttools-opensource-src-5.3.2-system-clucene.patch
@@ -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
--- 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 @@
-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
-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 \
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-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 @@
**
****************************************************************************/
@@ -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
--- 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 @@
// 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
--- 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
-@@ -59,13 +59,13 @@
++++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp 2014-10-31 23:47:52.184907583 +0100
+@@ -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;
@@ -239,7 +248,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qtt
}
QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
-@@ -73,7 +73,7 @@
+@@ -73,7 +75,7 @@
using namespace lucene::index;
QCLuceneIndexReader indexReader;
@@ -248,7 +257,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qtt
return indexReader;
}
-@@ -81,25 +81,25 @@
+@@ -81,25 +83,29 @@
void QCLuceneIndexReader::unlock(const QString &path)
{
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)
{
++ // 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;
- return IndexReader::isLocked(directory);
+ 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()
-@@ -155,7 +155,7 @@
+@@ -155,7 +161,7 @@
void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
{
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
--- 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 @@
#include "qindexwriter_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
--- 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 @@
: QCLuceneSearcher()
{
@@ -327,7 +340,7 @@ diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp qtto
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
--- 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 @@
qhelp_global.cpp
--
cgit v0.10.2
>From e7d0eeaddaa35235b328912b61b69266fcfc31e3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 3 Nov 2014 18:55:15 -0600
Subject: out-of-tree build, use %qmake_qt5
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 939b455..5bf433a 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -19,7 +19,7 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.4.0
-Release: 0.6.%{pre}%{?dist}
+Release: 0.7.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -172,20 +172,23 @@ rm -rf src/assistant/3rdparty/clucene
%build
-%{_qt5_qmake}
+mkdir %{_target_platform}
+pushd %{_target_platform}
+%{qmake_qt5} ..
make %{?_smp_mflags}
%if 0%{?docs}
make %{?_smp_mflags} docs
%endif
+popd
%install
-make install INSTALL_ROOT=%{buildroot}
+make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot}
+make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
%endif
# Add desktop files, --vendor=qt4 helps avoid possible conflicts with qt3/qt4
@@ -423,6 +426,9 @@ fi
%changelog
+* Mon Nov 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.7.beta
+- out-of-tree build, use %%qmake_qt5
+
* Fri Oct 31 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.6.beta
- respin system-clucene.patch
--
cgit v0.10.2
>From 5f28e718523a6f7a617fb32df95526d5694ac5de Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 28 Nov 2014 09:59:08 -0600
Subject: 5.4.0-rc
diff --git a/.gitignore b/.gitignore
index 9c62b88..96b58d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/qttools-opensource-src-5.3.2.tar.xz
/qttools-opensource-src-5.4.0-beta.tar.xz
+/qttools-opensource-src-5.4.0-rc.tar.xz
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 5bf433a..ef4999b 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -14,12 +14,12 @@
%endif
%endif
-%define pre beta
+%define pre rc
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.4.0
-Release: 0.7.%{pre}%{?dist}
+Release: 0.8.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -426,6 +426,9 @@ fi
%changelog
+* Fri Nov 28 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.8.rc
+- 5.4.0-rc
+
* Mon Nov 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.7.beta
- out-of-tree build, use %%qmake_qt5
diff --git a/sources b/sources
index d57abee..5443983 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e1e24d14ccf9eb06dfb539e7c0f8a3d qttools-opensource-src-5.4.0-beta.tar.xz
+bd03f61819fa88ae2fac49971124bf6d qttools-opensource-src-5.4.0-rc.tar.xz
--
cgit v0.10.2
>From 3d4f48192fed32328cd76e2d3a33a76dff705b4e Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun, 30 Nov 2014 18:20:42 +0100
Subject: install Linguist icon as linguist-qt5.png, fixes file conflict
(#1169127)
* Sun Nov 30 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.4.0-0.9.rc
- install Linguist icon as linguist-qt5.png, fixes file conflict (#1169127)
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index ef4999b..f62c880 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -19,7 +19,7 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.4.0
-Release: 0.8.%{pre}%{?dist}
+Release: 0.9.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -206,7 +206,7 @@ install -m644 -p -D src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot
# linguist icons
for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
size=$(echo $(basename ${icon}) | cut -d- -f2)
- install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist.png
+ install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist-qt5.png
done
# hardlink files to %{_bindir}, add -qt5 postfix to not conflict
@@ -426,6 +426,9 @@ fi
%changelog
+* Sun Nov 30 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.4.0-0.9.rc
+- install Linguist icon as linguist-qt5.png, fixes file conflict (#1169127)
+
* Fri Nov 28 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.8.rc
- 5.4.0-rc
--
cgit v0.10.2
>From 8a5acf5845d4282c58e1f9138289abc721cb364d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 2 Dec 2014 13:27:33 -0600
Subject: system_clucene f20+ only
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index f62c880..141864d 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,7 +1,7 @@
#global bootstrap 1
%global qt_module qttools
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora} > 19 || 0%{?rhel} > 6
%global system_clucene 1
%endif
--
cgit v0.10.2
>From 6ac21cfc3d82dc2c213eb0c10886ef225b17cfcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Tue, 9 Dec 2014 15:48:01 +0100
Subject: Fix qdbusviewer-qt5 icon
diff --git a/qdbusviewer.desktop b/qdbusviewer.desktop
index d6e0f0a..188da47 100644
--- a/qdbusviewer.desktop
+++ b/qdbusviewer.desktop
@@ -3,7 +3,7 @@ Name=Qt5 QDbusViewer
GenericName=D-Bus Debugger
Comment=Debug D-Bus applications
Exec=qdbusviewer-qt5
-Icon=qt5-qdbusviewer
+Icon=qdbusviewer-qt5
Terminal=false
Type=Application
Categories=Qt;Development;Debugger;
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 141864d..3c4db0b 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -19,7 +19,7 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.4.0
-Release: 0.9.%{pre}%{?dist}
+Release: 0.10.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -426,6 +426,9 @@ fi
%changelog
+* Tue Dec 09 2014 Daniel Vrátil <dvratil at redhat.com> 5.4.0-0.10.rc
+- fix icon name in qdbusviewer-qt5.desktop
+
* Sun Nov 30 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 5.4.0-0.9.rc
- install Linguist icon as linguist-qt5.png, fixes file conflict (#1169127)
--
cgit v0.10.2
>From bfce3100d9d7e4e5389ef3f907cdfd193fbe8d3b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 10 Dec 2014 07:16:25 -0600
Subject: 5.4.0 (final)
diff --git a/.gitignore b/.gitignore
index 96b58d0..1334a2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/qttools-opensource-src-5.3.2.tar.xz
-/qttools-opensource-src-5.4.0-beta.tar.xz
-/qttools-opensource-src-5.4.0-rc.tar.xz
+/qttools-opensource-src-5.4.0.tar.xz
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 3c4db0b..6876d18 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -14,12 +14,10 @@
%endif
%endif
-%define pre rc
-
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.4.0
-Release: 0.10.%{pre}%{?dist}
+Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -426,6 +424,9 @@ fi
%changelog
+* Wed Dec 10 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-1
+- 5.4.0 (final)
+
* Tue Dec 09 2014 Daniel Vrátil <dvratil at redhat.com> 5.4.0-0.10.rc
- fix icon name in qdbusviewer-qt5.desktop
diff --git a/sources b/sources
index 5443983..f05db4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd03f61819fa88ae2fac49971124bf6d qttools-opensource-src-5.4.0-rc.tar.xz
+3de5923257b365526856094d7da0ad85 qttools-opensource-src-5.4.0.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qt5-qttools.git/commit/?h=el6&id=a141f9f697205a0bff2e805a0cf7ee1eed4f2502
More information about the scm-commits
mailing list