diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-01-09 13:16:49 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-01-09 13:16:49 +0000 |
| commit | 9d79e7b1469f6887d302e13ce7c67c54408a2453 (patch) | |
| tree | 263754af5ddd95f1ad55b06c101378a0cf71009b /devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp | |
| parent | Add distinfo for the Staging patchset again, now also available for 2.0 RC4. (diff) | |
- Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL
Approved by: portmgr blanket
Diffstat (limited to 'devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp')
| -rw-r--r-- | devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp b/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp deleted file mode 100644 index a6625cb2c0b2..000000000000 --- a/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp +++ /dev/null @@ -1,21 +0,0 @@ -There is a bug [1] in the old gcc used on FreeBSD 9.3, which makes -qdoc segfault on sorting while generating its index sections. - -As mentioned in [2] by Michael Hansen, we can circument this by using -qSort instead of std::sort on FreeBSD 9.x. - - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59391 -[2] https://bugreports.qt.io/browse/QTBUG-43057 - ---- src/qdoc/qdocindexfiles.cpp.orig 2016-10-09 21:13:42.831072000 +0200 -+++ src/qdoc/qdocindexfiles.cpp 2016-10-09 21:13:56.153968000 +0200 -@@ -1412,7 +1412,7 @@ - const Aggregate* inner = static_cast<const Aggregate*>(node); - - NodeList cnodes = inner->childNodes(); -- std::sort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan); -+ qSort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan); - - foreach (Node* child, cnodes) { - generateIndexSections(writer, child, generateInternalNodes); |