Date: Sat, 17 Sep 2016 09:46:54 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422306 - in head: Mk comms comms/qt5-connectivity comms/qt5-serialbus devel devel/qbs devel/qmake5 devel/qmake5/files devel/qt5 devel/qt5-assistant/files devel/qt5-buildtools devel/qt5... Message-ID: <201609170946.u8H9ksdI001560@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Sep 17 09:46:54 2016 New Revision: 422306 URL: https://svnweb.freebsd.org/changeset/ports/422306 Log: Update the Qt5 ports to 5.6.1. This took longer than expected, but there are quite a few changes to the existing ports and a few new ones. General upstream changes: - Starting with Qt 5.6.2, Qt will fail at configuration time if LibreSSL is being used. According to the discussion here: https://codereview.qt-project.org/#/c/154800/ The Qt project is not opposed to LibreSSL, but does not want to mix support for it into the OpenSSL backend code, especially as they move towards supporting OpenSSL 1.1. People interested in LibreSSL support are welcome to submit a separate backend upstream, but are expected to maintain it. We (kde@) are not opposed to carrying some patches authored by others in the future, as long as they are not huge and destabilizing. - When Qt detects the compiler supports C++11, it will pass -std=gnu++11 by default (this is an upstream change). You can add "CONFIG -= c++11" to your .pro. Qt 5.7 will require C++11. - www/webkit-qt5: The QtWebKit module is deprecated upstream, and is shipped separately as a community release tarball. kde@ does not have an ETA for a qt5-webengine port, as it requires a huge effort (and number of patches) similar to maintaining www/chromium itself. - x11-toolkits/qt5-declarative has been deprecated upstream. The last release is 5.5.1. Relevant changes: - devel/qmake5: The freebsd-clang mkspec has become the default mkspec on FreeBSD, replacing the outdated freebsd-g++ one that was moved to unsupported/ (it still works though). - devel/qt5-qdoc: qdoc was moved to qttools upstream, but its data files are still in qtbase. The data files are now in the qt5-qdoc-data port. - misc/qt5-doc: Clean up and stop requiring a compiler and fumbling with mkspecs. Instead of running the `configure' script, which requires a compiler and adjustments to the mkspecs files and also ends up building a new qmake binary, we now leverage USES=qmake to generate all the Makefiles from the top-level qt.pro. Getting this to work requires some tricks, though, and qt.conf.in has a longer explanation of what's being done. Switch to USES=gmake to be able to drop MAKE_JOBS_UNSAFE=yes. New ports: - comms/qt5-serialbus - devel/qt5-qdoc-data - x11-toolkits/qt5-quickcontrols2 Big thanks to Adriaan de Groot (groot@kde.org), tcberner@ and Loise Nolden (nolden@kde.org) for the huge amount of work they put into this patch. Loise in particular also sent quite a few changes upstream that were essential for this update to work. PR: 211916 Added: head/comms/qt5-serialbus/ head/comms/qt5-serialbus/Makefile (contents, props changed) head/comms/qt5-serialbus/pkg-plist (contents, props changed) head/devel/qmake5/files/patch-mkspecs_freebsd-clang_qmake.conf - copied, changed from r422305, head/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf head/devel/qmake5/files/patch-mkspecs_unsupported_freebsd-g++_qmake.conf - copied, changed from r422305, head/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf head/devel/qt5-core/files/patch-git_680ec54a (contents, props changed) head/devel/qt5-core/files/patch-git_bfa53e1c6 (contents, props changed) head/devel/qt5-core/files/patch-git_c9998b8a (contents, props changed) head/devel/qt5-qdbus/files/ head/devel/qt5-qdbus/files/patch-src_src.pro (contents, props changed) head/devel/qt5-qdoc-data/ head/devel/qt5-qdoc-data/Makefile (contents, props changed) head/devel/qt5-qdoc-data/pkg-plist - copied, changed from r422305, head/devel/qt5-qdoc/pkg-plist head/devel/qt5-qdoc/files/ head/devel/qt5-qdoc/files/patch-src_src.pro (contents, props changed) head/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro (contents, props changed) head/lang/qt5-qml/files/patch-git_9b1231ca (contents, props changed) head/misc/qt5-doc/files/ head/misc/qt5-doc/files/patch-qtserialbus_qtserialbus.pro (contents, props changed) head/misc/qt5-doc/files/qt.conf.in (contents, props changed) head/multimedia/qt5-multimedia/files/patch-git_1df147d5 (contents, props changed) head/net/qt5-network/files/patch-src_network_socket_qnativesocketengine__unix.cpp (contents, props changed) head/www/webkit-qt5/distinfo (contents, props changed) head/x11-toolkits/qt5-declarative/distinfo (contents, props changed) head/x11-toolkits/qt5-quickcontrols2/ head/x11-toolkits/qt5-quickcontrols2/Makefile (contents, props changed) head/x11-toolkits/qt5-quickcontrols2/pkg-descr (contents, props changed) head/x11-toolkits/qt5-quickcontrols2/pkg-plist (contents, props changed) Deleted: head/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf head/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf head/devel/qt5-core/files/patch-git_08be8691 head/devel/qt5-core/files/patch-git_090bf50 head/devel/qt5-core/files/patch-git_6552469 head/devel/qt5-core/files/patch-git_c8c4ad0 head/devel/qt5-location/files/ head/devel/qt5-qdoc/pkg-plist head/graphics/qt5-3d/files/ head/graphics/qt5-pixeltool/files/patch-git_a685d8a head/misc/qt5-examples/distinfo head/multimedia/qt5-multimedia/files/patch-git_3b322323 head/multimedia/qt5-multimedia/files/patch-git_9047d9b head/x11-toolkits/qt5-widgets/files/ Modified: head/Mk/bsd.qt.mk head/comms/Makefile head/comms/qt5-connectivity/pkg-plist head/devel/Makefile head/devel/qbs/Makefile head/devel/qbs/pkg-plist head/devel/qmake5/Makefile head/devel/qmake5/files/patch-configure head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf head/devel/qmake5/pkg-plist head/devel/qt5-assistant/files/patch-src__src.pro head/devel/qt5-buildtools/pkg-plist head/devel/qt5-core/Makefile head/devel/qt5-core/pkg-plist head/devel/qt5-designer/files/patch-src__src.pro head/devel/qt5-designer/pkg-plist head/devel/qt5-help/Makefile head/devel/qt5-help/files/patch-src__src.pro head/devel/qt5-linguist/files/patch-src__src.pro head/devel/qt5-linguisttools/files/patch-src__src.pro head/devel/qt5-location/pkg-plist head/devel/qt5-qdbusviewer/files/patch-src__src.pro head/devel/qt5-qdoc/Makefile head/devel/qt5-testlib/pkg-plist head/devel/qt5-uitools/files/patch-src__src.pro head/devel/qt5/Makefile head/devel/qt5/distinfo head/devel/qt5/files/extrapatch-config.tests-unix-compile.test head/devel/qt5/files/extrapatch-libtool head/graphics/qt5-3d/Makefile head/graphics/qt5-3d/pkg-plist head/graphics/qt5-graphicaleffects/Makefile head/graphics/qt5-graphicaleffects/pkg-plist head/graphics/qt5-imageformats/Makefile head/graphics/qt5-pixeltool/files/patch-src__src.pro head/lang/qt5-qml/Makefile head/lang/qt5-qml/pkg-plist head/misc/qt5-doc/Makefile head/misc/qt5-doc/distinfo head/misc/qt5-doc/pkg-plist head/misc/qt5-examples/Makefile head/misc/qt5-examples/pkg-plist head/misc/qt5-l10n/pkg-plist head/multimedia/qt5-multimedia/Makefile head/multimedia/qt5-multimedia/pkg-plist head/net/qt5-network/pkg-plist head/print/qt5-printsupport/Makefile head/textproc/clucene-qt5/files/patch-src__src.pro head/textproc/clucene-qt5/pkg-plist head/www/webkit-qt5/Makefile head/x11-toolkits/Makefile head/x11-toolkits/qt5-canvas3d/Makefile head/x11-toolkits/qt5-canvas3d/pkg-plist head/x11-toolkits/qt5-declarative/Makefile head/x11-toolkits/qt5-gui/Makefile head/x11-toolkits/qt5-gui/pkg-plist head/x11-toolkits/qt5-quick/Makefile head/x11-toolkits/qt5-quick/pkg-plist head/x11-toolkits/qt5-quickcontrols/pkg-plist head/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro head/x11-toolkits/qt5-uiplugin/pkg-plist head/x11-toolkits/qt5-widgets/Makefile head/x11-toolkits/qt5-widgets/pkg-plist Modified: head/Mk/bsd.qt.mk ============================================================================== --- head/Mk/bsd.qt.mk Sat Sep 17 09:40:40 2016 (r422305) +++ head/Mk/bsd.qt.mk Sat Sep 17 09:46:54 2016 (r422306) @@ -27,7 +27,7 @@ Qt_Pre_Include= bsd.qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 4 5 QT4_VERSION?= 4.8.7 -QT5_VERSION?= 5.5.1 +QT5_VERSION?= 5.6.1 QT_PREFIX?= ${LOCALBASE} @@ -60,7 +60,7 @@ MASTER_SITES= ${MASTER_SITE_QT} # Useless, as it must be defined before including bsd.port.pre.mk (at least # because of bsd.options.mk). #PKGNAMEPREFIX?= ${_QT_RELNAME}- -DISTINFO_FILE= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo +DISTINFO_FILE?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo # Can go after a while. CONFLICTS_BUILD=qt-3.* qt-copy-3.* @@ -75,19 +75,15 @@ DESCR?= ${.CURDIR:H:H}/devel/${_QT_REL DESTDIRNAME= INSTALL_ROOT . if ${_QT_VERSION:M4*} -MASTER_SITE_SUBDIR= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/ +MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/ DISTNAME= qt-everywhere-opensource-src-${_QT_VERSION} DIST_SUBDIR= KDE . else -. if ${_QT_VERSION:M*-*} -# Pre-releases. -MASTER_SITE_SUBDIR= development_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/ -. else -MASTER_SITE_SUBDIR= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/ -. endif -DISTNAME= ${QT_DIST:S,^,qt,:S,$,-opensource-src-${_QT_VERSION},} +MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/ +DISTNAME= ${QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},} DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},} DIST_SUBDIR= KDE/Qt/${_QT_VERSION} + USES+= tar:xz # Qt (at least when used with qmake) has a tendency to overlink: some libraries @@ -103,9 +99,11 @@ LDFLAGS+= -Wl,--as-needed defined(DISABLE_SIZE) && defined(NO_CHECKSUM) # Ensure that the "makesum" target (with its inner "fetch" one) uses # devel/qt*/distinfo for every port. -QT_DIST= 3d base canvas3d connectivity declarative doc graphicaleffects imageformats \ - location multimedia quick1 quickcontrols script sensors serialport svg tools \ - translations webchannel webkit webkit-examples websockets x11extras xmlpatterns +. if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME} +QT_DIST= 3d base canvas3d connectivity declarative graphicaleffects imageformats \ + location multimedia quickcontrols quickcontrols2 script sensors serialbus serialport svg tools \ + translations webchannel websockets x11extras xmlpatterns +. endif . endif . if ${QT_DIST} == "base" && ${PORTNAME} != "qmake" @@ -183,7 +181,8 @@ CONFIGURE_ARGS+=-verbose . if ${_QT_VERSION:M4*} _EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h . else -_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h +_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests_unix_libdl_libdl.pro . endif EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ @@ -215,8 +214,8 @@ QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-* QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}" . endif -PLIST_SUB+= SHORTVER=${_QT_VERSION:R} \ - FULLVER=${_QT_VERSION:C/-.*//} +PLIST_SUB+= SHORTVER=${DISTVERSION:R} \ + FULLVER=${DISTVERSION:C/-.*//} .endif # defined(QT_DIST) .if ${_QT_VERSION:M4*} @@ -313,9 +312,9 @@ _USE_QT4_ONLY= accessible assistant-adp _USE_QT5_ONLY= 3d buildtools canvas3d concurrent connectivity core \ examples graphicaleffects location paths phonon4 \ - printsupport qdbus qdoc qev qml quick quickcontrols \ - sensors serialport sql-tds uiplugin uitools webchannel \ - websockets widgets x11extras + printsupport qdbus qdoc qdoc-data qev qml quick quickcontrols \ + quickcontrols2 sensors serialbus serialport sql-tds \ + uiplugin uitools webchannel websockets widgets x11extras 3d_PORT= graphics/${_QT_RELNAME}-3d 3d_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}3DCore.so @@ -464,6 +463,9 @@ qdbusviewer_PATH= ${QT_BINDIR}/qdbusview qdoc_PORT= devel/${_QT_RELNAME}-qdoc qdoc_PATH= ${QT_BINDIR}/qdoc +qdoc-data_PORT= devel/${_QT_RELNAME}-qdoc-data +qdoc-data_PATH= ${QT_DOCDIR}/global/config.qdocconf + qdoc3_PORT= devel/${_QT_RELNAME}-qdoc3 qdoc3_PATH= ${QT_BINDIR}/qdoc3 @@ -494,6 +496,9 @@ quick_PATH= ${QT_LIBDIR}/libQt${_QT_LI quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols quickcontrols_PATH= ${QT_QMLDIR}/QtQuick/Controls/qmldir +quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2 +quickcontrols2_PATH= ${QT_QMLDIR}/Qt/labs/controls/qmldir + qvfb_PORT= devel/${_QT_RELNAME}-qvfb qvfb_PATH= ${QT_BINDIR}/qvfb${_QT_BINSUFX} @@ -509,6 +514,9 @@ script_PATH= ${QT_LIBDIR}/libQt${_QT_LI scripttools_PORT= devel/${_QT_RELNAME}-scripttools scripttools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}ScriptTools.so +serialbus_PORT= comms/${_QT_RELNAME}-serialbus +serialbus_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}SerialBus.so + serialport_PORT= comms/${_QT_RELNAME}-serialport serialport_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}SerialPort.so Modified: head/comms/Makefile ============================================================================== --- head/comms/Makefile Sat Sep 17 09:40:40 2016 (r422305) +++ head/comms/Makefile Sat Sep 17 09:46:54 2016 (r422306) @@ -145,6 +145,7 @@ SUBDIR += qsstv SUBDIR += qt5-connectivity SUBDIR += qt5-sensors + SUBDIR += qt5-serialbus SUBDIR += qt5-serialport SUBDIR += qtel SUBDIR += quisk Modified: head/comms/qt5-connectivity/pkg-plist ============================================================================== --- head/comms/qt5-connectivity/pkg-plist Sat Sep 17 09:40:40 2016 (r422305) +++ head/comms/qt5-connectivity/pkg-plist Sat Sep 17 09:46:54 2016 (r422306) @@ -8,6 +8,7 @@ %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device1_bluez5_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/dummy_helper_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/hcimanager_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/inputstreamthread_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/jni_android_p.h @@ -29,13 +30,13 @@ %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtdevicepair_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtl2capchannel_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtledeviceinquiry_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtnotifier_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtobexsession_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtrfcommchannel_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtsdpinquiry_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtservicerecord_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtsocketlistener_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtutility_p.h -%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/ppshelpers_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/profile1_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/properties_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothaddress_p.h @@ -53,7 +54,6 @@ %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_osx_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_p.h -%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_qnx_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferrequest_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_osx_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h @@ -107,44 +107,41 @@ %%QT_INCDIR%%/QtBluetooth/qtbluetoothversion.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/adapter_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/agent_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/androidjninfc_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/androidmainnewintentlistener_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/dbusobjectmanager_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/dbusproperties_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/manager_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/neard_helper_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_android_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_p_p.h -%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_qnx_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_simulator_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_android_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_p_p.h -%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_qnx_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_simulator_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qndefnfcsmartposterrecord_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qndefrecord_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_android_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_emulator_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_neard_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_p.h -%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_qnx_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_simulator_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanagerimpl_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanagervirtualbase_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharemanager_p.h -%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharemanager_qnx_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharemanagerimpl_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharetarget_p.h -%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharetarget_qnx_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharetargetimpl_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtagtype1_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtagtype2_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtagtype3_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtagtype4_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtarget_android_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtarget_emulator_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtarget_neard_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtarget_p.h -%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtarget_qnx_p.h -%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnxnfceventfilter_p.h -%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnxnfcmanager_p.h -%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnxnfcsharemanager_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qtlv_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/tag_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/targetemulator_p.h Added: head/comms/qt5-serialbus/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/qt5-serialbus/Makefile Sat Sep 17 09:46:54 2016 (r422306) @@ -0,0 +1,19 @@ +# $FreeBSD$ + +PORTNAME= serialbus +DISTVERSION= ${QT5_VERSION} +CATEGORIES= comms +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt functions to access industrial bus systems + +USE_QT5= core network serialport buildtools_build +QT_DIST= serialbus +USES= compiler:c++11-lib qmake +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +BUILD_WRKSRC= ${WRKSRC}/src/serialbus +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +.include <bsd.port.mk> Added: head/comms/qt5-serialbus/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/qt5-serialbus/pkg-plist Sat Sep 17 09:46:54 2016 (r422306) @@ -0,0 +1,59 @@ +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdevice_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbus_symbols_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusadu_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusclient_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbuscommevent_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusdevice_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusrtuserialmaster_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusrtuserialslave_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusserver_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbustcpclient_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbustcpserver_p.h +%%QT_INCDIR%%/QtSerialBus/QCanBus +%%QT_INCDIR%%/QtSerialBus/QCanBusDevice +%%QT_INCDIR%%/QtSerialBus/QCanBusFactory +%%QT_INCDIR%%/QtSerialBus/QCanBusFrame +%%QT_INCDIR%%/QtSerialBus/QModbusClient +%%QT_INCDIR%%/QtSerialBus/QModbusDataUnit +%%QT_INCDIR%%/QtSerialBus/QModbusDataUnitMap +%%QT_INCDIR%%/QtSerialBus/QModbusDevice +%%QT_INCDIR%%/QtSerialBus/QModbusExceptionResponse +%%QT_INCDIR%%/QtSerialBus/QModbusPdu +%%QT_INCDIR%%/QtSerialBus/QModbusReply +%%QT_INCDIR%%/QtSerialBus/QModbusRequest +%%QT_INCDIR%%/QtSerialBus/QModbusResponse +%%QT_INCDIR%%/QtSerialBus/QModbusRtuSerialMaster +%%QT_INCDIR%%/QtSerialBus/QModbusRtuSerialSlave +%%QT_INCDIR%%/QtSerialBus/QModbusServer +%%QT_INCDIR%%/QtSerialBus/QModbusTcpClient +%%QT_INCDIR%%/QtSerialBus/QModbusTcpServer +%%QT_INCDIR%%/QtSerialBus/QtSerialBus +%%QT_INCDIR%%/QtSerialBus/QtSerialBusDepends +%%QT_INCDIR%%/QtSerialBus/QtSerialBusVersion +%%QT_INCDIR%%/QtSerialBus/qcanbus.h +%%QT_INCDIR%%/QtSerialBus/qcanbusdevice.h +%%QT_INCDIR%%/QtSerialBus/qcanbusfactory.h +%%QT_INCDIR%%/QtSerialBus/qcanbusframe.h +%%QT_INCDIR%%/QtSerialBus/qmodbusclient.h +%%QT_INCDIR%%/QtSerialBus/qmodbusdataunit.h +%%QT_INCDIR%%/QtSerialBus/qmodbusdevice.h +%%QT_INCDIR%%/QtSerialBus/qmodbuspdu.h +%%QT_INCDIR%%/QtSerialBus/qmodbusreply.h +%%QT_INCDIR%%/QtSerialBus/qmodbusrtuserialmaster.h +%%QT_INCDIR%%/QtSerialBus/qmodbusrtuserialslave.h +%%QT_INCDIR%%/QtSerialBus/qmodbusserver.h +%%QT_INCDIR%%/QtSerialBus/qmodbustcpclient.h +%%QT_INCDIR%%/QtSerialBus/qmodbustcpserver.h +%%QT_INCDIR%%/QtSerialBus/qserialbusglobal.h +%%QT_INCDIR%%/QtSerialBus/qtserialbusversion.h +%%QT_LIBDIR%%/cmake/Qt5SerialBus/Qt5SerialBusConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5SerialBus/Qt5SerialBusConfigVersion.cmake +%%QT_LIBDIR%%/libQt5SerialBus.prl +%%QT_LIBDIR%%/libQt5SerialBus.so +%%QT_LIBDIR%%/libQt5SerialBus.so.5 +%%QT_LIBDIR%%/libQt5SerialBus.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5SerialBus.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5SerialBus.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/modules/qt_lib_serialbus.pri +%%QT_MKSPECDIR%%/modules/qt_lib_serialbus_private.pri +libdata/pkgconfig/Qt5SerialBus.pc Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sat Sep 17 09:40:40 2016 (r422305) +++ head/devel/Makefile Sat Sep 17 09:46:54 2016 (r422306) @@ -4756,6 +4756,7 @@ SUBDIR += qt5-qdbus SUBDIR += qt5-qdbusviewer SUBDIR += qt5-qdoc + SUBDIR += qt5-qdoc-data SUBDIR += qt5-script SUBDIR += qt5-scripttools SUBDIR += qt5-testlib Modified: head/devel/qbs/Makefile ============================================================================== --- head/devel/qbs/Makefile Sat Sep 17 09:40:40 2016 (r422305) +++ head/devel/qbs/Makefile Sat Sep 17 09:46:54 2016 (r422306) @@ -3,6 +3,7 @@ PORTNAME= qbs PORTVERSION= 1.6.0 DISTVERSIONPREFIX= src- +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= QT/official_releases/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/Qt/qbs Modified: head/devel/qbs/pkg-plist ============================================================================== --- head/devel/qbs/pkg-plist Sat Sep 17 09:40:40 2016 (r422305) +++ head/devel/qbs/pkg-plist Sat Sep 17 09:46:54 2016 (r422306) @@ -126,6 +126,7 @@ lib/qbs/plugins/libqbs_qt_scanner.so %%PORTDOCS%%%%DOCSDIR%%/html/shell.html %%PORTDOCS%%%%DOCSDIR%%/html/staticlibrary-item.html %%PORTDOCS%%%%DOCSDIR%%/html/style/offline.css +%%PORTDOCS%%%%DOCSDIR%%/html/style/offline-simple.css %%PORTDOCS%%%%DOCSDIR%%/html/subproject-item.html %%PORTDOCS%%%%DOCSDIR%%/html/system-requirements.html %%PORTDOCS%%%%DOCSDIR%%/html/typescript-module.html @@ -290,5 +291,3 @@ lib/qbs/plugins/libqbs_qt_scanner.so %%DATADIR%%/modules/wix/WiXModule.qbs %%DATADIR%%/modules/xcode/xcode.js %%DATADIR%%/modules/xcode/xcode.qbs -%%PORTDOCS%%@dir %%DOCSDIR%%/html/images/used-in-examples -%%PORTDOCS%%@dir %%DOCSDIR%%/html/scripts Modified: head/devel/qmake5/Makefile ============================================================================== --- head/devel/qmake5/Makefile Sat Sep 17 09:40:40 2016 (r422305) +++ head/devel/qmake5/Makefile Sat Sep 17 09:46:54 2016 (r422306) @@ -2,7 +2,6 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -11,7 +10,9 @@ COMMENT= Qt Makefile generator USE_QT5= # empty USES= pkgconfig shebangfix -SHEBANG_FILES= mkspecs/macx-ios-clang/rename_main.sh +SHEBANG_FILES= util/harfbuzz/update-harfbuzz \ + util/unicode/x11/makeencodings \ + src/3rdparty/freetype/src/tools/afblue.pl QT_DIST= base REINPLACE_ARGS= -i "" HAS_CONFIGURE= yes @@ -34,23 +35,22 @@ post-patch: # Prevent qconfig.pri from being module dependent. @${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \ ${WRKSRC}/configure - - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ +# Write the file location paths into mkspecs/common/freebsd.conf + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mkspecs/common/freebsd.conf @${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \ ${WRKSRC}/mkspecs/freebsd-icc/qmake.conf - -# Add mkspec for Clang. For now, this means adjusting the existing -# unsupported/freebsd-clang mkspec while we get it into shape upstream. - @${MV} ${WRKSRC}/mkspecs/unsupported/freebsd-clang \ - ${WRKSRC}/mkspecs/freebsd-clang +# Add mkspec for g++. The clang is now the officially supported compiler for +# Qt>=5.6.0 on FreeBSD. + @${MV} ${WRKSRC}/mkspecs/unsupported/freebsd-g++ \ + ${WRKSRC}/mkspecs/freebsd-g++ @${REINPLACE_CMD} -e 's|(../|(|g' \ - ${WRKSRC}/mkspecs/freebsd-clang/qmake.conf + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf @${REINPLACE_CMD} -e 's|"../|"|g' \ - ${WRKSRC}/mkspecs/freebsd-clang/qplatformdefs.h - + ${WRKSRC}/mkspecs/freebsd-g++/qplatformdefs.h +# Clean up files created by patching @${RM} ${WRKSRC}/mkspecs/*/*.orig - @${RM} -Rf ${WRKSRC}/mkspecs/freebsd-g++46 + @${RM} -Rf ${WRKSRC}/mkspecs/unsupported/freebsd-g++46 post-build: # Complete configure stage to generate *.pri files. Modified: head/devel/qmake5/files/patch-configure ============================================================================== --- head/devel/qmake5/files/patch-configure Sat Sep 17 09:40:40 2016 (r422305) +++ head/devel/qmake5/files/patch-configure Sat Sep 17 09:46:54 2016 (r422306) @@ -19,12 +19,12 @@ Date: Tue Aug 23 20:25:14 2016 +0200 Change-Id: I5f38f8480f4b1156ca7147e32c1157a009557035 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- configure.orig 2015-10-13 04:35:07 UTC +--- configure.orig 2016-08-24 08:18:37 UTC +++ configure -@@ -4038,11 +4038,11 @@ if true; then ###[ '!' -f "$outpath/bin/ - fi - echo "QMAKESPEC = $adjqmakespec" >> "$mkfile" - echo "QT_VERSION = $QT_VERSION" >> "$mkfile" +@@ -4115,11 +4115,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then + echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile" + echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile" + echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile" - echo "EXTRA_CFLAGS = $EXTRA_CFLAGS" >> "$mkfile" - echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile" + echo "EXTRA_CFLAGS = $EXTRA_CFLAGS $CFLAGS" >> "$mkfile" @@ -36,7 +36,7 @@ Date: Tue Aug 23 20:25:14 2016 +0200 echo "EXEEXT = $EXEEXT" >> "$mkfile" echo "RM_F = rm -f" >> "$mkfile" echo "RM_RF = rm -rf" >> "$mkfile" -@@ -4061,6 +4061,7 @@ if true; then ###[ '!' -f "$outpath/bin/ +@@ -4138,6 +4138,7 @@ if [ '!' -e "$outpath/bin/qmake" ]; then fi fi done @@ -44,7 +44,7 @@ Date: Tue Aug 23 20:25:14 2016 +0200 if [ "$OPT_VERBOSE" = yes ]; then # Show the output of make -@@ -6474,7 +6472,7 @@ case "$QMAKE_CONF_COMPILER" in +@@ -6691,7 +6689,7 @@ case "$QMAKE_CONF_COMPILER" in # Clang COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -v 2>&1 | sed -n -E ' /^Apple (clang|LLVM) version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_APPLE_CLANG_MAJOR_VERSION=\1; QT_APPLE_CLANG_MINOR_VERSION=\2/;p;q;} Modified: head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf ============================================================================== --- head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf Sat Sep 17 09:40:40 2016 (r422305) +++ head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf Sat Sep 17 09:46:54 2016 (r422306) @@ -13,12 +13,12 @@ +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + +# Addon software goes into /usr/local on the BSDs, by default we will look there -+QMAKE_INCDIR = /usr/local/include -+QMAKE_LIBDIR = /usr/local/lib ++QMAKE_INCDIR = %%LOCALBASE%%/include ++QMAKE_LIBDIR = %%LOCALBASE%%/lib + +# Required at least by Qt5ConfigExtras.cmake so ports can include GL/gl.h. -+QMAKE_INCDIR_OPENGL = /usr/local/include -+QMAKE_LIBDIR_OPENGL = /usr/local/lib ++QMAKE_INCDIR_OPENGL = %%LOCALBASE%%/include ++QMAKE_LIBDIR_OPENGL = %%LOCALBASE%%/lib + +QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined +QMAKE_LFLAGS_THREAD = -pthread Copied and modified: head/devel/qmake5/files/patch-mkspecs_freebsd-clang_qmake.conf (from r422305, head/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf) ============================================================================== --- head/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf Sat Sep 17 09:40:40 2016 (r422305, copy source) +++ head/devel/qmake5/files/patch-mkspecs_freebsd-clang_qmake.conf Sat Sep 17 09:46:54 2016 (r422306) @@ -1,12 +1,14 @@ ---- mkspecs/freebsd-g++/qmake.conf.orig -+++ mkspecs/freebsd-g++/qmake.conf -@@ -2,32 +2,7 @@ - # qmake configuration for freebsd-g++ +--- mkspecs/freebsd-clang/qmake.conf.orig 2016-04-13 18:43:04 UTC ++++ mkspecs/freebsd-clang/qmake.conf +@@ -2,34 +2,7 @@ + # qmake configuration for freebsd-clang # -MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = freebsd bsd - +-include(../common/unix.conf) +- -QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD @@ -15,6 +17,7 @@ -QMAKE_INCDIR = /usr/local/include -QMAKE_LIBDIR = /usr/local/lib - +-QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined -QMAKE_LFLAGS_THREAD = -pthread - -QMAKE_LIBS = @@ -29,8 +32,7 @@ -QMAKE_NM = nm -P -QMAKE_RANLIB = - --include(../common/unix.conf) +include(../common/freebsd.conf) include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) - load(qt_config) + include(../common/clang.conf) + Copied and modified: head/devel/qmake5/files/patch-mkspecs_unsupported_freebsd-g++_qmake.conf (from r422305, head/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf) ============================================================================== --- head/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf Sat Sep 17 09:40:40 2016 (r422305, copy source) +++ head/devel/qmake5/files/patch-mkspecs_unsupported_freebsd-g++_qmake.conf Sat Sep 17 09:46:54 2016 (r422306) @@ -1,12 +1,14 @@ ---- mkspecs/unsupported/freebsd-clang/qmake.conf -+++ mkspecs/unsupported/freebsd-clang/qmake.conf -@@ -2,32 +2,6 @@ - # qmake configuration for freebsd-clang +--- mkspecs/unsupported/freebsd-g++/qmake.conf.orig 2016-04-13 18:41:57 UTC ++++ mkspecs/unsupported/freebsd-g++/qmake.conf +@@ -2,33 +2,7 @@ + # qmake configuration for freebsd-g++ # -MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = freebsd bsd - +-include(../../common/unix.conf) +- -QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD @@ -15,7 +17,6 @@ -QMAKE_INCDIR = /usr/local/include -QMAKE_LIBDIR = /usr/local/lib - --QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined -QMAKE_LFLAGS_THREAD = -pthread - -QMAKE_LIBS = @@ -30,9 +31,7 @@ -QMAKE_NM = nm -P -QMAKE_RANLIB = - --include(../../common/unix.conf) --include(../../common/gcc-base-unix.conf) --include(../../common/clang.conf) +include(../../common/freebsd.conf) -+include(../../common/gcc-base-unix.conf) -+include(../../common/clang.conf) + include(../../common/gcc-base-unix.conf) + include(../../common/g++-unix.conf) + load(qt_config) Modified: head/devel/qmake5/pkg-plist ============================================================================== --- head/devel/qmake5/pkg-plist Sat Sep 17 09:40:40 2016 (r422305) +++ head/devel/qmake5/pkg-plist Sat Sep 17 09:46:54 2016 (r422306) @@ -15,7 +15,7 @@ %%QT_MKSPECDIR%%/blackberry-x86-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/common/aix/qplatformdefs.h %%QT_MKSPECDIR%%/common/android/qplatformdefs.h -%%QT_MKSPECDIR%%/common/armcc.conf +%%QT_MKSPECDIR%%/common/angle.conf %%QT_MKSPECDIR%%/common/c89/qplatformdefs.h %%QT_MKSPECDIR%%/common/clang-mac.conf %%QT_MKSPECDIR%%/common/clang.conf @@ -37,6 +37,7 @@ %%QT_MKSPECDIR%%/common/mac.conf %%QT_MKSPECDIR%%/common/mac/qplatformdefs.h %%QT_MKSPECDIR%%/common/macx.conf +%%QT_MKSPECDIR%%/common/msvc-base.conf %%QT_MKSPECDIR%%/common/msvc-desktop.conf %%QT_MKSPECDIR%%/common/nacl/g++-nacl32.conf %%QT_MKSPECDIR%%/common/nacl/g++-nacl64.conf @@ -81,6 +82,8 @@ %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-arm-generic-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-arm-generic-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qmake.conf @@ -91,15 +94,21 @@ %%QT_MKSPECDIR%%/devices/linux-imx53qsb-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-nuc-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-nuc-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-odroid-xu3-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-odroid-xu3-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-rasp-pi2-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-rasp-pi2-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-rpi3-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-rpi3-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf @@ -110,9 +119,8 @@ %%QT_MKSPECDIR%%/devices/linux-tegra2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/features/android/android.prf %%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf +%%QT_MKSPECDIR%%/features/benchmark.prf %%QT_MKSPECDIR%%/features/build_pass.prf -%%QT_MKSPECDIR%%/features/c++11.prf -%%QT_MKSPECDIR%%/features/c++14.prf %%QT_MKSPECDIR%%/features/cmake_functions.prf %%QT_MKSPECDIR%%/features/configure.prf %%QT_MKSPECDIR%%/features/create_cmake.prf @@ -125,6 +133,8 @@ %%QT_MKSPECDIR%%/features/data/cmake/Qt5ConfigVersion.cmake.in %%QT_MKSPECDIR%%/features/data/cmake/Qt5PluginTarget.cmake.in %%QT_MKSPECDIR%%/features/data/dummy.cpp +%%QT_MKSPECDIR%%/features/data/mac/objc_namespace.sh +%%QT_MKSPECDIR%%/features/data/unix/findclasslist.pl %%QT_MKSPECDIR%%/features/dbusadaptors.prf %%QT_MKSPECDIR%%/features/dbuscommon.pri %%QT_MKSPECDIR%%/features/dbusinterfaces.prf @@ -138,6 +148,7 @@ %%QT_MKSPECDIR%%/features/exceptions_off.prf %%QT_MKSPECDIR%%/features/exclusive_builds.prf %%QT_MKSPECDIR%%/features/exclusive_builds_post.prf +%%QT_MKSPECDIR%%/features/file_copies.prf %%QT_MKSPECDIR%%/features/gcov.prf %%QT_MKSPECDIR%%/features/include_source_dir.prf %%QT_MKSPECDIR%%/features/incredibuild_xge.prf @@ -151,10 +162,13 @@ %%QT_MKSPECDIR%%/features/mac/objective_c.prf %%QT_MKSPECDIR%%/features/mac/rez.prf %%QT_MKSPECDIR%%/features/mac/sdk.prf +%%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf %%QT_MKSPECDIR%%/features/moc.prf %%QT_MKSPECDIR%%/features/no_debug_info.prf +%%QT_MKSPECDIR%%/features/plugin_bundle.prf %%QT_MKSPECDIR%%/features/precompile_header.prf %%QT_MKSPECDIR%%/features/qfeatures.prf +%%QT_MKSPECDIR%%/features/qgltf.prf %%QT_MKSPECDIR%%/features/qlalr.prf %%QT_MKSPECDIR%%/features/qml1_module.prf %%QT_MKSPECDIR%%/features/qml1_plugin.prf @@ -168,7 +182,9 @@ %%QT_MKSPECDIR%%/features/qt_android_deps.prf %%QT_MKSPECDIR%%/features/qt_app.prf %%QT_MKSPECDIR%%/features/qt_build_config.prf +%%QT_MKSPECDIR%%/features/qt_build_extra.prf %%QT_MKSPECDIR%%/features/qt_build_paths.prf +%%QT_MKSPECDIR%%/features/qt_clear_installs.prf %%QT_MKSPECDIR%%/features/qt_common.prf %%QT_MKSPECDIR%%/features/qt_config.prf %%QT_MKSPECDIR%%/features/qt_docs.prf @@ -199,7 +215,6 @@ %%QT_MKSPECDIR%%/features/testlib_defines.prf %%QT_MKSPECDIR%%/features/uic.prf %%QT_MKSPECDIR%%/features/unix/bsymbolic_functions.prf -%%QT_MKSPECDIR%%/features/unix/dylib.prf %%QT_MKSPECDIR%%/features/unix/hide_symbols.prf %%QT_MKSPECDIR%%/features/unix/largefile.prf %%QT_MKSPECDIR%%/features/unix/opengl.prf @@ -232,7 +247,6 @@ %%QT_MKSPECDIR%%/features/win32/windows.prf %%QT_MKSPECDIR%%/features/winrt/console.prf %%QT_MKSPECDIR%%/features/winrt/default_pre.prf -%%QT_MKSPECDIR%%/features/winrt/font_deployment.prf %%QT_MKSPECDIR%%/features/winrt/package_manifest.prf %%QT_MKSPECDIR%%/features/xctest.prf %%QT_MKSPECDIR%%/features/yacc.prf @@ -301,47 +315,62 @@ %%QT_MKSPECDIR%%/lynxos-g++/qmake.conf %%QT_MKSPECDIR%%/lynxos-g++/qplatformdefs.h %%QT_MKSPECDIR%%/macx-clang-32/Info.plist.app +%%QT_MKSPECDIR%%/macx-clang-32/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-clang-32/Info.plist.lib %%QT_MKSPECDIR%%/macx-clang-32/qmake.conf %%QT_MKSPECDIR%%/macx-clang-32/qplatformdefs.h %%QT_MKSPECDIR%%/macx-clang/Info.plist.app +%%QT_MKSPECDIR%%/macx-clang/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-clang/Info.plist.lib %%QT_MKSPECDIR%%/macx-clang/qmake.conf %%QT_MKSPECDIR%%/macx-clang/qplatformdefs.h %%QT_MKSPECDIR%%/macx-g++-32/Info.plist.app +%%QT_MKSPECDIR%%/macx-g++-32/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-g++-32/Info.plist.lib %%QT_MKSPECDIR%%/macx-g++-32/qmake.conf %%QT_MKSPECDIR%%/macx-g++-32/qplatformdefs.h %%QT_MKSPECDIR%%/macx-g++/Info.plist.app +%%QT_MKSPECDIR%%/macx-g++/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-g++/Info.plist.lib %%QT_MKSPECDIR%%/macx-g++/qmake.conf %%QT_MKSPECDIR%%/macx-g++/qplatformdefs.h %%QT_MKSPECDIR%%/macx-g++40/Info.plist.app +%%QT_MKSPECDIR%%/macx-g++40/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-g++40/Info.plist.lib %%QT_MKSPECDIR%%/macx-g++40/qmake.conf %%QT_MKSPECDIR%%/macx-g++40/qplatformdefs.h %%QT_MKSPECDIR%%/macx-g++42/Info.plist.app +%%QT_MKSPECDIR%%/macx-g++42/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-g++42/Info.plist.lib %%QT_MKSPECDIR%%/macx-g++42/qmake.conf %%QT_MKSPECDIR%%/macx-g++42/qplatformdefs.h %%QT_MKSPECDIR%%/macx-icc/Info.plist.app +%%QT_MKSPECDIR%%/macx-icc/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-icc/Info.plist.lib %%QT_MKSPECDIR%%/macx-icc/qmake.conf %%QT_MKSPECDIR%%/macx-icc/qplatformdefs.h %%QT_MKSPECDIR%%/macx-ios-clang/Default-568h@2x.png %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.app +%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib %%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.xib %%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/default_pre.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/exclusive_builds_post.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt_config.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt_parts.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/resolve_config.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/sdk.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/testcase.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/testcase_targets.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/xcodebuild.prf +%%QT_MKSPECDIR%%/macx-ios-clang/ios_destinations.sh %%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf %%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h -%%QT_MKSPECDIR%%/macx-ios-clang/rename_main.sh +%%QT_MKSPECDIR%%/macx-ios-clang/xcodebuild.mk %%QT_MKSPECDIR%%/macx-llvm/Info.plist.app +%%QT_MKSPECDIR%%/macx-llvm/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-llvm/Info.plist.lib %%QT_MKSPECDIR%%/macx-llvm/qmake.conf %%QT_MKSPECDIR%%/macx-llvm/qplatformdefs.h @@ -389,8 +418,6 @@ %%QT_MKSPECDIR%%/unsupported/android-g++/qeglfshooks_surfaceflinger.cpp %%QT_MKSPECDIR%%/unsupported/android-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/android-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/unsupported/linux-armcc/qmake.conf -%%QT_MKSPECDIR%%/unsupported/linux-armcc/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-scratchbox2-g++/qmake.conf Modified: head/devel/qt5-assistant/files/patch-src__src.pro ============================================================================== --- head/devel/qt5-assistant/files/patch-src__src.pro Sat Sep 17 09:40:40 2016 (r422305) +++ head/devel/qt5-assistant/files/patch-src__src.pro Sat Sep 17 09:46:54 2016 (r422306) @@ -1,11 +1,11 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro +--- src/src.pro.orig 2016-02-25 20:14:01 UTC +++ src/src.pro -@@ -1,37 +1,2 @@ +@@ -1,38 +1,3 @@ TEMPLATE = subdirs -- + -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") @@ -20,6 +20,7 @@ missing dependencies. -} - -SUBDIRS += linguist \ +- qdoc \ - qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - Modified: head/devel/qt5-buildtools/pkg-plist ============================================================================== --- head/devel/qt5-buildtools/pkg-plist Sat Sep 17 09:40:40 2016 (r422305) +++ head/devel/qt5-buildtools/pkg-plist Sat Sep 17 09:46:54 2016 (r422306) @@ -4,4 +4,3 @@ %%QT_BINDIR%%/rcc %%QT_BINDIR%%/syncqt.pl %%QT_MKSPECDIR%%/modules/qt_lib_bootstrap_private.pri -libdata/pkgconfig/Qt5Bootstrap.pc Modified: head/devel/qt5-core/Makefile ============================================================================== --- head/devel/qt5-core/Makefile Sat Sep 17 09:40:40 2016 (r422305) +++ head/devel/qt5-core/Makefile Sat Sep 17 09:46:54 2016 (r422306) @@ -2,7 +2,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -39,7 +38,8 @@ QT_CONFIG= glib icu post-install: # Allow qconfig.h to be customized by single ports. - ${REINPLACE_CMD} -i "" '1 s|.*|#include <QtCore/qconfig-modules.h>|' \ - ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h + ${AWK} 'BEGIN{print "#include <QtCore/qconfig-modules.h>"}{print}' \ + ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h > ${WRKDIR}/qconfig.h + ${MV} ${WRKDIR}/qconfig.h ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h .include <bsd.port.post.mk> Added: head/devel/qt5-core/files/patch-git_680ec54a ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5-core/files/patch-git_680ec54a Sat Sep 17 09:46:54 2016 (r422306) @@ -0,0 +1,68 @@ +commit 680ec54a76eaf63375f648819ac9f98c915e5c43 +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Mon Aug 22 19:55:10 2016 +0200 + + QMutex: Make freelist() return a real global static + + Since Qt 5.6.0, some applications such as Kate (built with clang, libc++ + and libcxxrt) on FreeBSD occasionally crash with the following error + message on exit: + + QMutex::lock(): sem_wait failure: Invalid argument + [or pthread_cond_wait in the 5.6 branch] + + Investigation by Gleb Popov, Thiago Macieira and Olivier Goffart has + shown that this is caused by the fact that QDBusConnectionManager is a + Q_GLOBAL_STATIC (so it will be destroyed with all the other + Q_GLOBAL_STATICs in the reverse order of construction). In the + Q_COMPILER_THREADSAFE_STATICS case, freelist() also returns a + function-level static that is constructed on first use, so it may be + destroyed earlier than the QDBusConnectionManager object, making it + impossible to lock a contended mutex. + + We now make freelist() return a global static, so that it is always + destroyed after QDBusConnectionManager and other function-static + variables. + + Change-Id: I210fa7c18dbdf2345863da49141b9a85cffdef52 + Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> + +--- src/corelib/thread/qmutex.cpp ++++ src/corelib/thread/qmutex.cpp +@@ -571,34 +571,11 @@ const int FreeListConstants::Sizes[FreeListConstants::BlockCount] = { + + typedef QFreeList<QMutexPrivate, FreeListConstants> FreeList; + // We cannot use Q_GLOBAL_STATIC because it uses QMutex +-#if defined(Q_COMPILER_THREADSAFE_STATICS) ++static FreeList freeList_; + FreeList *freelist() + { +- static FreeList list; +- return &list; ++ return &freeList_; + } +-#else +-static QBasicAtomicPointer<FreeList> freeListPtr; +- +-FreeList *freelist() +-{ +- FreeList *local = freeListPtr.loadAcquire(); +- if (!local) { +- local = new FreeList; +- if (!freeListPtr.testAndSetRelease(0, local)) { +- delete local; +- local = freeListPtr.loadAcquire(); +- } +- } +- return local; +-} +- +-static void qFreeListDeleter() +-{ +- delete freeListPtr.load(); +-} +-Q_DESTRUCTOR_FUNCTION(qFreeListDeleter) +-#endif + } + + QMutexPrivate *QMutexPrivate::allocate() Added: head/devel/qt5-core/files/patch-git_bfa53e1c6 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5-core/files/patch-git_bfa53e1c6 Sat Sep 17 09:46:54 2016 (r422306) @@ -0,0 +1,25 @@ +From bfa53e1c67eddb14887cda37d7c89c76f4cce378 Mon Sep 17 00:00:00 2001 +From: Ralf Nolden <nolden@kde.org> +Date: Tue, 10 May 2016 16:34:37 +0200 +Subject: [PATCH] Compile fix: remove _POSIX_C_SOURCE usage + +Remove _POSIX_C_SOURCE usage as the reason why it was added is not +clear anymore and it causes compile errors on BSD systems if not +circumvented by adding further defines to re-enable function calls +hidden by the _POSIX_C_SOURCE define. (__BSD_VISIBLE on FreeBSD/OpenBSD +and _NETBSD_SOURCE on NetBSD) + +Change-Id: Ic6b49ddcd6c481b0f2acd598cea5470604e00507 +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +--- src/corelib/tools/qelapsedtimer_unix.cpp.orig 2016-02-24 20:16:34 UTC ++++ src/corelib/tools/qelapsedtimer_unix.cpp +@@ -31,9 +31,6 @@ + ** + ****************************************************************************/ + +-// ask for the latest POSIX, just in case +-#define _POSIX_C_SOURCE 200809L +- + #include "qelapsedtimer.h" + #if defined(Q_OS_VXWORKS) + #include "qfunctions_vxworks.h" Added: head/devel/qt5-core/files/patch-git_c9998b8a ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5-core/files/patch-git_c9998b8a Sat Sep 17 09:46:54 2016 (r422306) @@ -0,0 +1,26 @@ +From c9998b8af39bcf990f4ef9a0ff87b65574a86bfd Mon Sep 17 00:00:00 2001 +From: Thiago Macieira <thiago.macieira@intel.com> +Date: Mon, 9 May 2016 11:19:27 -0700 +Subject: [PATCH] Fix build with GCC <= 4.2 (FreeBSD 9.x) + +15b42af11123f9d1eb4bbd79870185585103ea8d changed the qt_cpu_features +variable to be an array and never fixed this #if branch of the code. + +Change-Id: Id69569111e7d4e619e22ffff144cf930f86f478e +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> +Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> +--- src/corelib/tools/qsimd.cpp.orig 2016-04-13 20:53:43 UTC ++++ src/corelib/tools/qsimd.cpp +@@ -666,7 +666,11 @@ void qDetectCpuFeatures() + // contains all the features that the code required. Qt 4 ran for years + // like that, so it shouldn't be a problem. + +- qt_cpu_features.store(minFeature | quint32(QSimdInitialized)); ++ qt_cpu_features[0].store(minFeature | quint32(QSimdInitialized)); ++#ifndef Q_ATOMIC_INT64_IS_SUPPORTED ++ qt_cpu_features[1].store(minFeature >> 32); ++#endif ++ + return; + # endif + #endif Modified: head/devel/qt5-core/pkg-plist ============================================================================== --- head/devel/qt5-core/pkg-plist Sat Sep 17 09:40:40 2016 (r422305) +++ head/devel/qt5-core/pkg-plist Sat Sep 17 09:46:54 2016 (r422306) @@ -8,7 +8,9 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstracttransition_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbig5codec_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_mac_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_unix_p.h @@ -26,6 +28,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeuckrcodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_blackberry_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_cf_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_glib_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_unix_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_win_p.h @@ -47,9 +50,11 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_polling_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_win_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfinalstate_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfreelist_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_iterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfunctions_fake_env_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfunctions_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutureinterface_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h @@ -146,7 +151,6 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qutfcodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qversionnumber_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowscodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h @@ -241,6 +245,7 @@ %%QT_INCDIR%%/QtCore/QHash %%QT_INCDIR%%/QtCore/QHashData %%QT_INCDIR%%/QtCore/QHashDummyValue +%%QT_INCDIR%%/QtCore/QHashFunctions %%QT_INCDIR%%/QtCore/QHashIterator %%QT_INCDIR%%/QtCore/QHashNode %%QT_INCDIR%%/QtCore/QHistoryState @@ -295,9 +300,6 @@ %%QT_INCDIR%%/QtCore/QMetaObject %%QT_INCDIR%%/QtCore/QMetaProperty %%QT_INCDIR%%/QtCore/QMetaType -%%QT_INCDIR%%/QtCore/QMetaTypeId -%%QT_INCDIR%%/QtCore/QMetaTypeId2 -%%QT_INCDIR%%/QtCore/QMetaTypeIdQObject %%QT_INCDIR%%/QtCore/QMimeData %%QT_INCDIR%%/QtCore/QMimeDatabase %%QT_INCDIR%%/QtCore/QMimeType @@ -413,6 +415,7 @@ %%QT_INCDIR%%/QtCore/QTranslator %%QT_INCDIR%%/QtCore/QTypeInfo %%QT_INCDIR%%/QtCore/QTypeInfoMerger +%%QT_INCDIR%%/QtCore/QTypeInfoQuery %%QT_INCDIR%%/QtCore/QUnhandledException %%QT_INCDIR%%/QtCore/QUrl %%QT_INCDIR%%/QtCore/QUrlQuery @@ -427,6 +430,7 @@ %%QT_INCDIR%%/QtCore/QVariantMap %%QT_INCDIR%%/QtCore/QVector %%QT_INCDIR%%/QtCore/QVectorIterator +%%QT_INCDIR%%/QtCore/QVersionNumber %%QT_INCDIR%%/QtCore/QWaitCondition %%QT_INCDIR%%/QtCore/QWeakPointer %%QT_INCDIR%%/QtCore/QWinEventNotifier @@ -482,7 +486,6 @@ %%QT_INCDIR%%/QtCore/qatomic_cxx11.h %%QT_INCDIR%%/QtCore/qatomic_gcc.h %%QT_INCDIR%%/QtCore/qatomic_ia64.h -%%QT_INCDIR%%/QtCore/qatomic_mips.h %%QT_INCDIR%%/QtCore/qatomic_msvc.h %%QT_INCDIR%%/QtCore/qatomic_unix.h %%QT_INCDIR%%/QtCore/qatomic_x86.h @@ -543,6 +546,7 @@ %%QT_INCDIR%%/QtCore/qglobal.h %%QT_INCDIR%%/QtCore/qglobalstatic.h %%QT_INCDIR%%/QtCore/qhash.h +%%QT_INCDIR%%/QtCore/qhashfunctions.h %%QT_INCDIR%%/QtCore/qhistorystate.h %%QT_INCDIR%%/QtCore/qidentityproxymodel.h %%QT_INCDIR%%/QtCore/qiodevice.h @@ -651,6 +655,8 @@ %%QT_INCDIR%%/QtCore/qvariantanimation.h %%QT_INCDIR%%/QtCore/qvarlengtharray.h %%QT_INCDIR%%/QtCore/qvector.h +%%QT_INCDIR%%/QtCore/qversionnumber.h +%%QT_INCDIR%%/QtCore/qversiontagging.h %%QT_INCDIR%%/QtCore/qwaitcondition.h *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609170946.u8H9ksdI001560>