Index: head/devel/qt5-qdoc/Makefile =================================================================== --- head/devel/qt5-qdoc/Makefile (revision 423125) +++ head/devel/qt5-qdoc/Makefile (revision 423126) @@ -1,20 +1,27 @@ # $FreeBSD$ PORTNAME= qdoc DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel textproc PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation generator USE_QT5= core qml buildtools_build qdoc-data_run QT_DIST= tools USES= qmake BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} PLIST_FILES= ${QT_BINDIR}/qdoc -.include +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 +EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_qdoc_qdocindexfiles.cpp +.endif + +.include Index: head/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp =================================================================== --- head/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp (nonexistent) +++ head/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp (revision 423126) @@ -0,0 +1,21 @@ +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-02 07:52:39 UTC ++++ src/qdoc/qdocindexfiles.cpp +@@ -1476,7 +1476,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); Property changes on: head/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property