diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 5838c0d..2af3a63 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -20,7 +20,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.0 -Release: 0.7.%{prerelease}%{?dist} +Release: 0.8.%{prerelease}%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -36,6 +36,10 @@ Patch1: qttools-opensource-src-5.3.2-system-clucene.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1009893 Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch +# workaround https://bugreports.qt-project.org/browse/QTBUG-43057 +# 'make docs' crash on el6, use qSort instead of std::sort +Patch3: qttools-opensource-src-5.6-QTBUG-43057.patch + ## upstream patches Source20: assistant.desktop @@ -203,6 +207,7 @@ Requires: %{name}-common = %{version}-%{release} rm -rf src/assistant/3rdparty/clucene %endif %patch2 -p1 -b .qmake-qt5 +%patch3 -p1 -b .QTBUG-43057 %build @@ -491,6 +496,9 @@ fi %changelog +* Sun Jan 17 2016 Rex Dieter 5.6.0-0.8.beta +- port QTBUG-43057 workaround + * Mon Dec 28 2015 Rex Dieter 5.6.0-0.7.beta - update source URL, use %%license diff --git a/qttools-opensource-src-5.6-QTBUG-43057.patch b/qttools-opensource-src-5.6-QTBUG-43057.patch new file mode 100644 index 0000000..71ed24c --- /dev/null +++ b/qttools-opensource-src-5.6-QTBUG-43057.patch @@ -0,0 +1,12 @@ +diff -up qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp.orig qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp +--- qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp.orig 2015-12-14 10:58:18.000000000 -0600 ++++ qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp 2016-01-17 20:42:45.946004310 -0600 +@@ -1531,7 +1531,7 @@ void QDocIndexFiles::generateIndexSectio + const Aggregate* inner = static_cast(node); + + NodeList cnodes = inner->childNodes(); +- std::sort(cnodes.begin(), cnodes.end(), compareNodes); ++ qSort(cnodes.begin(), cnodes.end(), compareNodes); + + foreach (Node* child, cnodes) { + generateIndexSections(writer, child, generateInternalNodes);