[Midnightbsd-cvs] mports [23366] trunk/devel/qt5-qdoc: update ports

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat May 5 15:06:30 EDT 2018 

Revision: 23366
          http://svnweb.midnightbsd.org/mports/?rev=23366
Author:   laffer1
Date:     2018-05-05 15:06:29 -0400 (Sat, 05 May 2018)
Log Message:
-----------
update ports

Modified Paths:
--------------
    trunk/devel/qt5-qdoc/Makefile

Added Paths:
-----------
    trunk/devel/qt5-qdoc/files/
    trunk/devel/qt5-qdoc/files/patch-src_qdoc_qdocindexfiles.cpp
    trunk/devel/qt5-qdoc/files/patch-src_src.pro

Removed Paths:
-------------
    trunk/devel/qt5-qdoc/pkg-plist

Modified: trunk/devel/qt5-qdoc/Makefile
===================================================================
--- trunk/devel/qt5-qdoc/Makefile	2018-05-05 19:04:15 UTC (rev 23365)
+++ trunk/devel/qt5-qdoc/Makefile	2018-05-05 19:06:29 UTC (rev 23366)
@@ -12,19 +12,13 @@
 
 LICENSE=	gpl3
 
-USE_QT5=	core xml buildtools_build qmake_build
-QT_DIST=	base
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-no-dbus -no-gui -no-xcb
+USE_QT5=	core qml buildtools_build qdoc-data_run
+QT_DIST=	tools
+USES=		qmake
 
-BUILD_WRKSRC=	${WRKSRC}/src/tools/${PORTNAME}
+BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-QT_DOCDIR=      ${TRUE_PREFIX}/share/doc/qt5
+PLIST_FILES=	${QT_BINDIR}/qdoc
 
-post-install:
-	${MKDIR} ${FAKE_DESTDIR}${QT_DOCDIR} && \
-	cd ${WRKSRC}/doc/global && \
-		${COPYTREE_SHARE} \* ${FAKE_DESTDIR}${QT_DOCDIR}/global
-
 .include <bsd.port.mk>

Added: trunk/devel/qt5-qdoc/files/patch-src_qdoc_qdocindexfiles.cpp
===================================================================
--- trunk/devel/qt5-qdoc/files/patch-src_qdoc_qdocindexfiles.cpp	                        (rev 0)
+++ trunk/devel/qt5-qdoc/files/patch-src_qdoc_qdocindexfiles.cpp	2018-05-05 19:06:29 UTC (rev 23366)
@@ -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-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);


Property changes on: trunk/devel/qt5-qdoc/files/patch-src_qdoc_qdocindexfiles.cpp
___________________________________________________________________
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
Added: trunk/devel/qt5-qdoc/files/patch-src_src.pro
===================================================================
--- trunk/devel/qt5-qdoc/files/patch-src_src.pro	                        (rev 0)
+++ trunk/devel/qt5-qdoc/files/patch-src_src.pro	2018-05-05 19:06:29 UTC (rev 23366)
@@ -0,0 +1,45 @@
+Only enter the directories we want to build, otherwise we might fail due to
+missing dependencies.
+
+--- src/src.pro.orig	2016-07-23 14:50:14 UTC
++++ src/src.pro
+@@ -1,38 +1,2 @@
+ TEMPLATE = subdirs
+-
+-qtHaveModule(widgets) {
+-    no-png {
+-        message("Some graphics-related tools are unavailable without PNG support")
+-    } else {
+-        SUBDIRS = assistant \
+-                  pixeltool \
+-                  qtestlib \
+-                  designer
+-
+-        linguist.depends = designer
+-    }
+-}
+-
+-SUBDIRS += linguist \
+-    qdoc \
+-    qtplugininfo
+-if(!android|android_app):!ios: SUBDIRS += qtpaths
+-
+-mac {
+-    SUBDIRS += macdeployqt
+-}
+-
+-android {
+-    SUBDIRS += androiddeployqt
+-}
+-
+-qtHaveModule(dbus): SUBDIRS += qdbus
+-
+-win32|winrt:SUBDIRS += windeployqt
+-winrt:SUBDIRS += winrtrunner
+-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
+-
+-qtNomakeTools( \
+-    pixeltool \
+-    macdeployqt \
+-)
++SUBDIRS = qdoc


Property changes on: trunk/devel/qt5-qdoc/files/patch-src_src.pro
___________________________________________________________________
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
Deleted: trunk/devel/qt5-qdoc/pkg-plist
===================================================================
--- trunk/devel/qt5-qdoc/pkg-plist	2018-05-05 19:04:15 UTC (rev 23365)
+++ trunk/devel/qt5-qdoc/pkg-plist	2018-05-05 19:06:29 UTC (rev 23366)
@@ -1,74 +0,0 @@
-%%QT_BINDIR%%/qdoc
-%%QT_DOCDIR%%/global/compat.qdocconf
-%%QT_DOCDIR%%/global/config.qdocconf
-%%QT_DOCDIR%%/global/externalsites.qdocconf
-%%QT_DOCDIR%%/global/externalsites/external-resources.qdoc
-%%QT_DOCDIR%%/global/externalsites/qt-webpages.qdoc
-%%QT_DOCDIR%%/global/externalsites/qtcreator.qdoc
-%%QT_DOCDIR%%/global/externalsites/rfc.qdoc
-%%QT_DOCDIR%%/global/fileextensions.qdocconf
-%%QT_DOCDIR%%/global/html-config.qdocconf
-%%QT_DOCDIR%%/global/html-footer-online.qdocconf
-%%QT_DOCDIR%%/global/html-footer.qdocconf
-%%QT_DOCDIR%%/global/html-header-offline.qdocconf
-%%QT_DOCDIR%%/global/html-header-online.qdocconf
-%%QT_DOCDIR%%/global/includes-online/search.qdoc
-%%QT_DOCDIR%%/global/includes/examples-run.qdocinc
-%%QT_DOCDIR%%/global/macros.qdocconf
-%%QT_DOCDIR%%/global/manifest-meta.qdocconf
-%%QT_DOCDIR%%/global/qt-cpp-defines.qdocconf
-%%QT_DOCDIR%%/global/qt-html-templates-offline.qdocconf
-%%QT_DOCDIR%%/global/qt-html-templates-online.qdocconf
-%%QT_DOCDIR%%/global/qt-module-defaults-offline.qdocconf
-%%QT_DOCDIR%%/global/qt-module-defaults-online-commercial.qdocconf
-%%QT_DOCDIR%%/global/qt-module-defaults-online.qdocconf
-%%QT_DOCDIR%%/global/qt-module-defaults.qdocconf
-%%QT_DOCDIR%%/global/template/images/Qt-dark_gradient.png
-%%QT_DOCDIR%%/global/template/images/Qt-footer-bg.jpg
-%%QT_DOCDIR%%/global/template/images/Qt-footer_shadow.png
-%%QT_DOCDIR%%/global/template/images/Qt-gradient.png
-%%QT_DOCDIR%%/global/template/images/Qt-header-bg.jpg
-%%QT_DOCDIR%%/global/template/images/Qt-logo.png
-%%QT_DOCDIR%%/global/template/images/arrow.png
-%%QT_DOCDIR%%/global/template/images/arrow_bc.png
-%%QT_DOCDIR%%/global/template/images/arrow_down.png
-%%QT_DOCDIR%%/global/template/images/bg_l.png
-%%QT_DOCDIR%%/global/template/images/bg_l_blank.png
-%%QT_DOCDIR%%/global/template/images/bg_ll_blank.png
-%%QT_DOCDIR%%/global/template/images/bg_r.png
-%%QT_DOCDIR%%/global/template/images/bg_ul_blank.png
-%%QT_DOCDIR%%/global/template/images/bgrContent.png
-%%QT_DOCDIR%%/global/template/images/blu_dot.png
-%%QT_DOCDIR%%/global/template/images/box_bg.png
-%%QT_DOCDIR%%/global/template/images/breadcrumb.png
-%%QT_DOCDIR%%/global/template/images/btn_next.png
-%%QT_DOCDIR%%/global/template/images/btn_prev.png
-%%QT_DOCDIR%%/global/template/images/bullet_dn.png
-%%QT_DOCDIR%%/global/template/images/bullet_gt.png
-%%QT_DOCDIR%%/global/template/images/bullet_sq.png
-%%QT_DOCDIR%%/global/template/images/bullet_up.png
-%%QT_DOCDIR%%/global/template/images/feedbackground.png
-%%QT_DOCDIR%%/global/template/images/header_bg.png
-%%QT_DOCDIR%%/global/template/images/home.png
-%%QT_DOCDIR%%/global/template/images/horBar.png
-%%QT_DOCDIR%%/global/template/images/ico_note.png
-%%QT_DOCDIR%%/global/template/images/ico_note_attention.png
-%%QT_DOCDIR%%/global/template/images/ico_out.png
-%%QT_DOCDIR%%/global/template/images/logo.png
-%%QT_DOCDIR%%/global/template/images/page.png
-%%QT_DOCDIR%%/global/template/images/page_bg.png
-%%QT_DOCDIR%%/global/template/images/spinner.gif
-%%QT_DOCDIR%%/global/template/images/sprites-combined.png
-%%QT_DOCDIR%%/global/template/scripts/extras.js
-%%QT_DOCDIR%%/global/template/scripts/main.js
-%%QT_DOCDIR%%/global/template/style/cookiebar-x.png
-%%QT_DOCDIR%%/global/template/style/doc_search.png
-%%QT_DOCDIR%%/global/template/style/gsc.css
-%%QT_DOCDIR%%/global/template/style/icomoon.eot
-%%QT_DOCDIR%%/global/template/style/icomoon.svg
-%%QT_DOCDIR%%/global/template/style/icomoon.ttf
-%%QT_DOCDIR%%/global/template/style/icomoon.woff
-%%QT_DOCDIR%%/global/template/style/list_arrow.png
-%%QT_DOCDIR%%/global/template/style/offline.css
-%%QT_DOCDIR%%/global/template/style/online.css
-%%QT_DOCDIR%%/global/template/style/theqtcompany.png

More information about the Midnightbsd-cvs mailing list