diff options
Diffstat (limited to 'devel/qt5-qdoc')
| -rw-r--r-- | devel/qt5-qdoc/Makefile | 8 | ||||
| -rw-r--r-- | devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp | 21 |
2 files changed, 1 insertions, 28 deletions
diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile index 36f616822c69..eee3e4e3c0fe 100644 --- a/devel/qt5-qdoc/Makefile +++ b/devel/qt5-qdoc/Makefile @@ -17,10 +17,4 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} PLIST_FILES= ${QT_BINDIR}/qdoc -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_qdoc_qdocindexfiles.cpp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> 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); |