svn commit: r487594 - in head: Mk/Uses astro/merkaartor/files audio/musescore/files audio/sonic-visualiser biology/ugene/files comms/qt5-connectivity comms/qt5-sensors comms/qt5-serialbus comms/qt5...
Tobias C. Berner
tcberner at FreeBSD.org
Sun Dec 16 14:49:24 UTC 2018
Author: tcberner
Date: Sun Dec 16 14:49:16 2018
New Revision: 487594
URL: https://svnweb.freebsd.org/changeset/ports/487594
Log:
Update Qt5 to 5.12.0
http://blog.qt.io/blog/2018/12/06/qt-5-12-lts-released/
- This breaks support for libressl again. Patches are welcome.
PR: 233705
Exp-run by: antoine
Added:
head/astro/merkaartor/files/patch-src_Layers_LicenseDisplayDialog.ui (contents, props changed)
head/audio/musescore/files/patch-mscore_editstringdata.cpp (contents, props changed)
head/audio/musescore/files/patch-mscore_prefsdialog.ui (contents, props changed)
head/biology/ugene/files/patch-src_plugins_test__runner_src_Reporter.ui (contents, props changed)
head/devel/kf5-extra-cmake-modules/files/patch-kdephab_D17015.diff (contents, props changed)
head/emulators/qmc2/files/patch-qmc2_htmleditor_htmleditor.ui (contents, props changed)
head/multimedia/clipgrab/files/
head/multimedia/clipgrab/files/patch-mainwindow.ui (contents, props changed)
head/multimedia/webvfx-qt5/files/
head/multimedia/webvfx-qt5/files/patch-tools_browser_browser.ui (contents, props changed)
head/net-p2p/retroshare/files/patch-plugins_VOIP_gui_AudioStats.ui (contents, props changed)
head/x11-toolkits/qt5-gtkplatform/files/
head/x11-toolkits/qt5-gtkplatform/files/patch-src_qgtkwindow__render.cpp (contents, props changed)
Deleted:
head/devel/kf5-extra-cmake-modules/files/patch-modules_ECMQueryQmake.cmake
head/net/qt5-network/files/patch-src_network_ssl_qsslcontext__opensslpre11.cpp
head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h
head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h
Modified:
head/Mk/Uses/qt.mk
head/audio/sonic-visualiser/Makefile
head/comms/qt5-connectivity/Makefile
head/comms/qt5-connectivity/pkg-plist
head/comms/qt5-sensors/Makefile
head/comms/qt5-serialbus/Makefile
head/comms/qt5-serialbus/pkg-plist
head/comms/qt5-serialport/Makefile
head/databases/qt5-sql/pkg-plist
head/deskutils/qownnotes/Makefile
head/devel/cmake-doc/Makefile
head/devel/fuel/Makefile
head/devel/qbs/Makefile
head/devel/qbs/distinfo
head/devel/qbs/pkg-plist
head/devel/qt5-assistant/Makefile
head/devel/qt5-assistant/files/patch-src__src.pro
head/devel/qt5-core/Makefile
head/devel/qt5-core/pkg-plist
head/devel/qt5-designer/Makefile
head/devel/qt5-designer/files/patch-src__src.pro
head/devel/qt5-help/Makefile
head/devel/qt5-help/files/patch-src__assistant__assistant.pro
head/devel/qt5-help/files/patch-src__src.pro
head/devel/qt5-help/pkg-plist
head/devel/qt5-linguist/Makefile
head/devel/qt5-linguist/files/patch-src__src.pro
head/devel/qt5-linguisttools/Makefile
head/devel/qt5-linguisttools/files/patch-src__src.pro
head/devel/qt5-location/Makefile
head/devel/qt5-location/pkg-plist
head/devel/qt5-qdbus/files/patch-src_src.pro
head/devel/qt5-qdbusviewer/Makefile
head/devel/qt5-qdbusviewer/files/patch-src__src.pro
head/devel/qt5-qdoc-data/pkg-plist
head/devel/qt5-qdoc/files/patch-src_src.pro
head/devel/qt5-qmake/Makefile
head/devel/qt5-qmake/pkg-plist
head/devel/qt5-script/Makefile
head/devel/qt5-scripttools/Makefile
head/devel/qt5-scxml/Makefile
head/devel/qt5-scxml/pkg-plist
head/devel/qt5-testlib/pkg-plist
head/devel/qt5-uitools/Makefile
head/devel/qt5-uitools/files/patch-src__src.pro
head/devel/qt5/Makefile
head/devel/qt5/distinfo
head/devel/qtcreator/Makefile
head/devel/qtcreator/distinfo
head/devel/qtcreator/pkg-plist
head/devel/svn2git/Makefile
head/editors/tea/Makefile
head/graphics/openorienteering-mapper/Makefile
head/graphics/qt5-3d/Makefile
head/graphics/qt5-graphicaleffects/Makefile
head/graphics/qt5-imageformats/Makefile
head/graphics/qt5-pixeltool/Makefile
head/graphics/qt5-pixeltool/files/patch-src__src.pro
head/graphics/qt5-svg/Makefile
head/graphics/qt5-wayland/Makefile
head/graphics/qt5-wayland/pkg-plist
head/misc/qt5-doc/Makefile
head/misc/qt5-doc/distinfo
head/misc/qt5-doc/pkg-plist
head/misc/qt5-examples/distinfo
head/misc/qt5-examples/pkg-plist
head/multimedia/qt5-multimedia/Makefile
head/multimedia/qt5-multimedia/pkg-plist
head/net/qt5-network/Makefile
head/net/qt5-network/pkg-plist
head/sysutils/sysadm-client/Makefile
head/textproc/qt5-xmlpatterns/Makefile
head/www/qt5-webchannel/Makefile
head/www/qt5-webengine/Makefile
head/www/qt5-websockets-qml/Makefile
head/www/qt5-websockets/Makefile
head/x11-toolkits/qt5-canvas3d/Makefile
head/x11-toolkits/qt5-charts/Makefile
head/x11-toolkits/qt5-datavis3d/Makefile
head/x11-toolkits/qt5-declarative/Makefile
head/x11-toolkits/qt5-declarative/files/patch-tools_qmlcachegen_qmlcachegen.pro
head/x11-toolkits/qt5-declarative/pkg-plist
head/x11-toolkits/qt5-gamepad/Makefile
head/x11-toolkits/qt5-gui/pkg-plist
head/x11-toolkits/qt5-quickcontrols/Makefile
head/x11-toolkits/qt5-quickcontrols2/Makefile
head/x11-toolkits/qt5-quickcontrols2/pkg-plist
head/x11-toolkits/qt5-uiplugin/Makefile
head/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro
head/x11-toolkits/qt5-virtualkeyboard/Makefile
head/x11-toolkits/qt5-virtualkeyboard/pkg-plist
head/x11-toolkits/qt5-widgets/pkg-plist
head/x11-toolkits/qt5pas/Makefile
head/x11/cool-retro-term/Makefile
head/x11/qt5-qev/Makefile
head/x11/qt5-x11extras/Makefile
head/x11/radare-cutter/Makefile
Modified: head/Mk/Uses/qt.mk
==============================================================================
--- head/Mk/Uses/qt.mk Sun Dec 16 14:39:29 2018 (r487593)
+++ head/Mk/Uses/qt.mk Sun Dec 16 14:49:16 2018 (r487594)
@@ -30,7 +30,7 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 4 5
QT4_VERSION?= 4.8.7
-QT5_VERSION?= 5.11.2
+QT5_VERSION?= 5.12.0
# We accept the Qt version to be passed by either or all of the three mk files.
. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
Added: head/astro/merkaartor/files/patch-src_Layers_LicenseDisplayDialog.ui
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/astro/merkaartor/files/patch-src_Layers_LicenseDisplayDialog.ui Sun Dec 16 14:49:16 2018 (r487594)
@@ -0,0 +1,11 @@
+--- src/Layers/LicenseDisplayDialog.ui.orig 2018-12-11 15:26:59 UTC
++++ src/Layers/LicenseDisplayDialog.ui
+@@ -43,7 +43,7 @@
+ <customwidget>
+ <class>QWebView</class>
+ <extends>QWidget</extends>
+- <header>QtWebKit/QWebView</header>
++ <header>QtWebKitWidgets/QWebView</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
Added: head/audio/musescore/files/patch-mscore_editstringdata.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/musescore/files/patch-mscore_editstringdata.cpp Sun Dec 16 14:49:16 2018 (r487594)
@@ -0,0 +1,22 @@
+--- mscore/editstringdata.cpp.orig 2018-12-11 15:55:46 UTC
++++ mscore/editstringdata.cpp
+@@ -52,7 +52,8 @@ EditStringData::EditStringData(QWidget *parent, QList<
+ strg = (*_strings)[numOfStrings - i - 1];
+ _stringsLoc.append(strg);
+ QTableWidgetItem *newCheck = new QTableWidgetItem();
+- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
++ Qt::ItemFlags flags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
++ newCheck->setFlags(flags);
+ newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
+ stringList->setItem(i, 0, newCheck);
+ QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
+@@ -168,7 +169,8 @@ void EditStringData::newStringClicked()
+ _stringsLoc.insert(i, strg);
+ stringList->insertRow(i);
+ QTableWidgetItem *newCheck = new QTableWidgetItem();
+- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
++ Qt::ItemFlags flags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
++ newCheck->setFlags(flags);
+ newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
+ stringList->setItem(i, 0, newCheck);
+ QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
Added: head/audio/musescore/files/patch-mscore_prefsdialog.ui
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/musescore/files/patch-mscore_prefsdialog.ui Sun Dec 16 14:49:16 2018 (r487594)
@@ -0,0 +1,11 @@
+--- mscore/prefsdialog.ui.orig 2018-12-11 15:47:09 UTC
++++ mscore/prefsdialog.ui
+@@ -4058,7 +4058,7 @@
+ </item>
+ </layout>
+ </widget>
+- <pixmapfunction>getPixmap</pixmapfunction>
++ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>Awl::ColorLabel</class>
Modified: head/audio/sonic-visualiser/Makefile
==============================================================================
--- head/audio/sonic-visualiser/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/audio/sonic-visualiser/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -21,7 +21,7 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
libsord-0.so:devel/sord \
libvamp-hostsdk.so:audio/vamp-plugin-sdk
-USES= autoreconf desktop-file-utils pkgconfig qt:5
+USES= autoreconf desktop-file-utils gmake pkgconfig qt:5
GNU_CONFIGURE= yes
USE_QT= buildtools_build core gui network qmake_build testlib widgets xml
Added: head/biology/ugene/files/patch-src_plugins_test__runner_src_Reporter.ui
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/biology/ugene/files/patch-src_plugins_test__runner_src_Reporter.ui Sun Dec 16 14:49:16 2018 (r487594)
@@ -0,0 +1,11 @@
+--- src/plugins/test_runner/src/Reporter.ui.orig 2018-12-11 15:24:12 UTC
++++ src/plugins/test_runner/src/Reporter.ui
+@@ -36,7 +36,7 @@
+ <customwidget>
+ <class>QWebView</class>
+ <extends>QWidget</extends>
+- <header>QtWebKit/QWebView</header>
++ <header>QtWebKitWidgets/QWebView</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
Modified: head/comms/qt5-connectivity/Makefile
==============================================================================
--- head/comms/qt5-connectivity/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/comms/qt5-connectivity/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -2,15 +2,14 @@
PORTNAME= connectivity
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 2
CATEGORIES= comms
PKGNAMEPREFIX= qt5-
MAINTAINER= kde at FreeBSD.org
COMMENT= Qt connectivity (Bluetooth/NFC) module
-USE_QT= concurrent core declarative buildtools_build
USES= compiler:c++11-lang qmake qt-dist:5,connectivity
+USE_QT= concurrent core declarative buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Modified: head/comms/qt5-connectivity/pkg-plist
==============================================================================
--- head/comms/qt5-connectivity/pkg-plist Sun Dec 16 14:39:29 2018 (r487593)
+++ head/comms/qt5-connectivity/pkg-plist Sun Dec 16 14:49:16 2018 (r487594)
@@ -2,6 +2,7 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/adapter_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/agent_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/androidbroadcastreceiver_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/battery1_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluetoothmanagement_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez5_helper_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez_data_p.h
@@ -45,6 +46,8 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtsocketlistener_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtutility_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/profile1_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/profile1context_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/profilemanager1_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/properties_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothaddress_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothdevicediscoveryagent_p.h
@@ -55,8 +58,13 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserver_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserviceinfo_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_android_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_bluez_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_bluezdbus_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_dummy_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_osx_p.h
-%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_winrt_p.h
+%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocketbase_p.h
%%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
Modified: head/comms/qt5-sensors/Makefile
==============================================================================
--- head/comms/qt5-sensors/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/comms/qt5-sensors/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -2,15 +2,14 @@
PORTNAME= sensors
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 2
CATEGORIES= comms
PKGNAMEPREFIX= qt5-
MAINTAINER= kde at FreeBSD.org
COMMENT= Qt sensors module
-USE_QT= core declarative buildtools_build
USES= compiler:c++11-lang qmake:norecursive qt-dist:5,sensors
+USE_QT= core declarative buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
Modified: head/comms/qt5-serialbus/Makefile
==============================================================================
--- head/comms/qt5-serialbus/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/comms/qt5-serialbus/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -9,8 +9,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde at FreeBSD.org
COMMENT= Qt functions to access industrial bus systems
-USE_QT= core network serialport buildtools_build
USES= compiler:c++11-lib qmake qt-dist:5,serialbus
+USE_QT= core network serialport buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
Modified: head/comms/qt5-serialbus/pkg-plist
==============================================================================
--- head/comms/qt5-serialbus/pkg-plist Sun Dec 16 14:39:29 2018 (r487593)
+++ head/comms/qt5-serialbus/pkg-plist Sun Dec 16 14:49:16 2018 (r487594)
@@ -60,6 +60,7 @@
%%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBus_PassThruCanBusPlugin.cmake
%%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBus_PeakCanBusPlugin.cmake
%%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBus_TinyCanBusPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBus_VirtualCanBusPlugin.cmake
%%QT_LIBDIR%%/libQt5SerialBus.prl
%%QT_LIBDIR%%/libQt5SerialBus.so
%%QT_LIBDIR%%/libQt5SerialBus.so.5
@@ -74,4 +75,6 @@
%%DEBUG%%%%QT_PLUGINDIR%%/canbus/libqtpeakcanbus.so.debug
%%QT_PLUGINDIR%%/canbus/libqttinycanbus.so
%%DEBUG%%%%QT_PLUGINDIR%%/canbus/libqttinycanbus.so.debug
+%%QT_PLUGINDIR%%/canbus/libqtvirtualcanbus.so
+%%DEBUG%%%%QT_PLUGINDIR%%/canbus/libqtvirtualcanbus.so.debug
libdata/pkgconfig/Qt5SerialBus.pc
Modified: head/comms/qt5-serialport/Makefile
==============================================================================
--- head/comms/qt5-serialport/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/comms/qt5-serialport/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -9,8 +9,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde at FreeBSD.org
COMMENT= Qt functions to access serial ports
-USE_QT= core buildtools_build
USES= compiler:c++11-lang libtool qmake qt-dist:5,serialport
+USE_QT= core buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
Modified: head/databases/qt5-sql/pkg-plist
==============================================================================
--- head/databases/qt5-sql/pkg-plist Sun Dec 16 14:39:29 2018 (r487593)
+++ head/databases/qt5-sql/pkg-plist Sun Dec 16 14:49:16 2018 (r487594)
@@ -1,3 +1,4 @@
+%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qtsql-config_p.h
%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlcachedresult_p.h
%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqldriver_p.h
%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlnulldriver_p.h
@@ -25,6 +26,7 @@
%%QT_INCDIR%%/QtSql/QtSql
%%QT_INCDIR%%/QtSql/QtSqlDepends
%%QT_INCDIR%%/QtSql/QtSqlVersion
+%%QT_INCDIR%%/QtSql/qtsql-config.h
%%QT_INCDIR%%/QtSql/qsql.h
%%QT_INCDIR%%/QtSql/qsqldatabase.h
%%QT_INCDIR%%/QtSql/qsqldriver.h
Modified: head/deskutils/qownnotes/Makefile
==============================================================================
--- head/deskutils/qownnotes/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/deskutils/qownnotes/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -10,7 +10,7 @@ COMMENT= Manage notes using nextcloud and markdown
LICENSE= GPLv2
-USES= qmake qt:5 tar:xz
+USES= gmake qmake qt:5 tar:xz
USE_QT= buildtools_build linguisttools_build core dbus gui network sql svg webkit xml
.include <bsd.port.mk>
Modified: head/devel/cmake-doc/Makefile
==============================================================================
--- head/devel/cmake-doc/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/cmake-doc/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -23,7 +23,7 @@ USE_QT= help_build
CMAKE_OFF= SPHINX_MAN
CMAKE_ON= SPHINX_HTML SPHINX_QTHELP
CMAKE_ARGS= -DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \
- -DQCOLLECTIONGENERATOR_EXECUTABLE=${QT_BINDIR}/qcollectiongenerator
+ -DQCOLLECTIONGENERATOR_EXECUTABLE=${QT_BINDIR}/qhelpgenerator
CMAKE_SOURCE_PATH= ${WRKSRC}/Utilities/Sphinx
ALL_TARGET= documentation
Modified: head/devel/fuel/Makefile
==============================================================================
--- head/devel/fuel/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/fuel/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -18,7 +18,7 @@ OPTIONS_SINGLE= GUI
OPTIONS_SINGLE_GUI= QT4 QT5
OPTIONS_DEFAULT= QT5
-USES= qmake shebangfix
+USES= gmake qmake shebangfix
QT4_USES= qt:4
QT4_USE= QT=corelib,gui,webkit,linguisttools_build,moc_build,rcc_build,uic_build
QT5_USES= qt:5
Added: head/devel/kf5-extra-cmake-modules/files/patch-kdephab_D17015.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/kf5-extra-cmake-modules/files/patch-kdephab_D17015.diff Sun Dec 16 14:49:16 2018 (r487594)
@@ -0,0 +1,199 @@
+diff --git a/cmake/FindQHelpGenerator.cmake b/cmake/FindQHelpGenerator.cmake
+new file mode 100644
+--- /dev/null
++++ cmake/FindQHelpGenerator.cmake
+@@ -0,0 +1,94 @@
++#.rst:
++# FindQHelpGenerator
++# ------------------
++#
++# Try to find the Qt help generator.
++# Based on FindQCollectionGenerator.cmake
++#
++# This will define the following variables:
++#
++# ``QHelpGenerator_FOUND``
++# True if (the requested version of) Sphinx is available
++# ``QHelpGenerator_VERSION``
++# The version of the Qt help generator. Note that this not the
++# same as the version of Qt it is provided by.
++# ``QHelpGenerator_QT_VERSION``
++# The version of Qt that the Qt help generator is from.
++# ``QHelpGenerator_EXECUTABLE``
++# The path to the Qt help generator executable.
++#
++# If ``QHelpGenerator_FOUND`` is TRUE, it will also define the following
++# imported target:
++#
++# ``QHelpGenerator::Generator``
++# The Qt help generator.
++#
++# In general we recommend using the imported target, as it is easier to use.
++#
++# Since 5.53.0.
++
++#=============================================================================
++# Copyright 2015 Alex Merry <alex.merry at kde.org>
++#
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++#
++# 1. Redistributions of source code must retain the copyright
++# notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the copyright
++# notice, this list of conditions and the following disclaimer in the
++# documentation and/or other materials provided with the distribution.
++# 3. The name of the author may not be used to endorse or promote products
++# derived from this software without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++#=============================================================================
++
++find_program(QHelpGenerator_EXECUTABLE
++ NAMES
++ qhelpgenerator-qt5
++ qhelpgenerator
++ DOC "Qt help generator"
++)
++
++if (QHelpGenerator_EXECUTABLE)
++ if(NOT TARGET QHelpGenerator::Generator)
++ add_executable(QHelpGenerator::Generator IMPORTED)
++ set_target_properties(QHelpGenerator::Generator PROPERTIES
++ IMPORTED_LOCATION "${QHelpGenerator_EXECUTABLE}"
++ )
++ endif()
++
++ execute_process(
++ COMMAND "${QHelpGenerator_EXECUTABLE}" -v
++ OUTPUT_VARIABLE _QHelpGenerator_version_raw
++ ERROR_VARIABLE _QHelpGenerator_version_raw
++ )
++ if (_QHelpGenerator_version_raw MATCHES "^Qt Help Generator version ([0-9]+(\\.[0-9]+)*) \\(Qt ([0-9]+(\\.[0-9]+)*)\\)")
++ set(QHelpGenerator_VERSION "${CMAKE_MATCH_1}")
++ set(QHelpGenerator_QT_VERSION "${CMAKE_MATCH_3}")
++ endif()
++ unset(_QHelpGenerator_version_raw)
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(QHelpGenerator
++ FOUND_VAR
++ QHelpGenerator_FOUND
++ REQUIRED_VARS
++ QHelpGenerator_EXECUTABLE
++ VERSION_VAR
++ QHelpGenerator_VERSION
++)
++
++mark_as_advanced(QHelpGenerator_EXECUTABLE)
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+--- docs/CMakeLists.txt
++++ docs/CMakeLists.txt
+@@ -27,6 +27,7 @@
+ #=============================================================================
+
+ include(CMakeDependentOption)
++include("${CMAKE_SOURCE_DIR}/modules/ECMQueryQmake.cmake")
+
+ find_package(Sphinx 1.2 MODULE)
+ set_package_properties(
+@@ -38,15 +39,39 @@
+ PURPOSE "Required to build documentation for Extra CMake Modules."
+ )
+
+-find_package(QCollectionGenerator MODULE)
+-set_package_properties(
+- QCollectionGenerator
+- PROPERTIES
+- URL "http://www.qt.io/"
+- DESCRIPTION "Qt help collection generator."
+- TYPE OPTIONAL
+- PURPOSE "Required to build Extra CMake Modules documentation in Qt Help format."
+-)
++# QCollectionGenerator and QHelpGenerator were merged in Qt 5.12
++query_qmake(QT_VERSION QT_VERSION)
++
++if(QT_VERSION VERSION_LESS 5.12.0)
++ find_package(QCollectionGenerator MODULE)
++ set_package_properties(
++ QCollectionGenerator
++ PROPERTIES
++ URL "http://www.qt.io/"
++ DESCRIPTION "Qt help collection generator"
++ TYPE OPTIONAL
++ PURPOSE "Required to build Extra CMake Modules documentation in Qt Help format."
++ )
++ if(QCollectionGenerator_FOUND)
++ set(_ecm_qtdoc_generator QCollectionGenerator::Generator)
++ endif()
++else()
++ find_package(QHelpGenerator MODULE)
++ set_package_properties(
++ QHelpGenerator
++ PROPERTIES
++ URL "http://www.qt.io/"
++ DESCRIPTION "Qt help generator"
++ TYPE OPTIONAL
++ PURPOSE "Required to build Extra CMake Modules documentation in Qt Help format."
++ )
++ if(QHelpGenerator_FOUND)
++ set(_ecm_qtdoc_generator QHelpGenerator::Generator)
++ endif()
++endif()
++if(DEFINED _ecm_qtdoc_generator)
++ set(QT_HELP_GENERATOR_FOUND TRUE)
++endif()
+
+ cmake_dependent_option(
+ BUILD_HTML_DOCS "Build html help with Sphinx" ON
+@@ -62,7 +87,7 @@
+
+ cmake_dependent_option(
+ BUILD_QTHELP_DOCS "Build Qt help with Sphinx" OFF
+- "Sphinx_FOUND;QCollectionGenerator_FOUND" OFF
++ "Sphinx_FOUND;QT_HELP_GENERATOR_FOUND" OFF
+ )
+ add_feature_info(BUILD_QTHELP_DOCS BUILD_QTHELP_DOCS "Generate QtHelp documentation for installed modules.")
+
+@@ -78,7 +103,7 @@
+ list(APPEND doc_formats qthelp)
+ set(qthelp_extra_commands
+ COMMAND
+- QCollectionGenerator::Generator
++ "${_ecm_qtdoc_generator}"
+ ${CMAKE_CURRENT_BINARY_DIR}/qthelp/ExtraCMakeModules.qhcp
+ )
+ endif()
+diff --git a/modules/ECMQueryQmake.cmake b/modules/ECMQueryQmake.cmake
+--- modules/ECMQueryQmake.cmake
++++ modules/ECMQueryQmake.cmake
+@@ -1,11 +1,14 @@
+ find_package(Qt5Core QUIET)
+
+-if (Qt5Core_FOUND)
+- set(_qmake_executable_default "qmake-qt5")
+-endif ()
+ if (TARGET Qt5::qmake)
+ get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
++else()
++ # If the project() line contains the 'NONE' keyword, the find_package call
++ # above will not be able to find Qt5Core.
++ # We need to look for the executable directly.
++ find_program(_qmake_executable_default NAMES qmake)
+ endif()
++
+ set(QMAKE_EXECUTABLE ${_qmake_executable_default}
+ CACHE FILEPATH "Location of the Qt5 qmake executable")
+
+
Modified: head/devel/qbs/Makefile
==============================================================================
--- head/devel/qbs/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qbs/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -2,8 +2,7 @@
PORTNAME= qbs
DISTVERSIONPREFIX= src-
-DISTVERSION= 1.11.1
-PORTREVISION= 3
+DISTVERSION= 1.12.2
CATEGORIES= devel
MASTER_SITES= QT/official_releases/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= KDE/Qt/qbs
Modified: head/devel/qbs/distinfo
==============================================================================
--- head/devel/qbs/distinfo Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qbs/distinfo Sun Dec 16 14:49:16 2018 (r487594)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525502657
-SHA256 (KDE/Qt/qbs/qbs-src-1.11.1.tar.gz) = 8a301e8e94169e44f2ca4ad65fc4d393215bf3b81bc51daa970f50ddb6231f5b
-SIZE (KDE/Qt/qbs/qbs-src-1.11.1.tar.gz) = 4299125
+TIMESTAMP = 1544551386
+SHA256 (KDE/Qt/qbs/qbs-src-1.12.2.tar.gz) = 97819b8b404a6ee5715d38ceda5ac1d992500a38f8956abe4a58a1d66e64d6f1
+SIZE (KDE/Qt/qbs/qbs-src-1.12.2.tar.gz) = 4374830
Modified: head/devel/qbs/pkg-plist
==============================================================================
--- head/devel/qbs/pkg-plist Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qbs/pkg-plist Sun Dec 16 14:49:16 2018 (r487594)
@@ -11,6 +11,7 @@ include/qbs/api/project.h
include/qbs/api/projectdata.h
include/qbs/api/rulecommand.h
include/qbs/api/runenvironment.h
+include/qbs/api/transformerdata.h
include/qbs/buildgraph/forward_decls.h
include/qbs/generators/generator.h
include/qbs/generators/generatordata.h
@@ -19,6 +20,7 @@ include/qbs/logging/ilogsink.h
include/qbs/qbs.h
include/qbs/qbs_version.pri
include/qbs/qtenvironment.h
+include/qbs/qtmsvctools.h
include/qbs/qtprofilesetup.h
include/qbs/tools/architectures.h
include/qbs/tools/buildoptions.h
@@ -35,6 +37,7 @@ include/qbs/tools/projectgeneratormanager.h
include/qbs/tools/qbs_export.h
include/qbs/tools/settings.h
include/qbs/tools/settingsmodel.h
+include/qbs/tools/settingsrepresentation.h
include/qbs/tools/setupprojectparameters.h
include/qbs/tools/toolchains.h
include/qbs/tools/version.h
@@ -43,14 +46,15 @@ include/qbs/use_installed_qtprofilesetup.pri
lib/libqbscore.prl
lib/libqbscore.so
lib/libqbscore.so.1
-lib/libqbscore.so.1.11
+lib/libqbscore.so.1.12
lib/libqbscore.so.%%SHLIB_VERSION%%
lib/libqbsqtprofilesetup.prl
lib/libqbsqtprofilesetup.so
lib/libqbsqtprofilesetup.so.1
-lib/libqbsqtprofilesetup.so.1.11
+lib/libqbsqtprofilesetup.so.1.12
lib/libqbsqtprofilesetup.so.%%SHLIB_VERSION%%
lib/qbs/plugins/libclangcompilationdbgenerator.so
+lib/qbs/plugins/libmakefilegenerator.so
lib/qbs/plugins/libqbs_cpp_scanner.so
lib/qbs/plugins/libqbs_qt_scanner.so
lib/qbs/plugins/libvisualstudiogenerator.so
@@ -69,6 +73,7 @@ man/man1/qbs.1.gz
%%PORTDOCS%%%%DOCSDIR%%/html/cli-generate.html
%%PORTDOCS%%%%DOCSDIR%%/html/cli-help.html
%%PORTDOCS%%%%DOCSDIR%%/html/cli-install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cli-list-products.html
%%PORTDOCS%%%%DOCSDIR%%/html/cli-resolve.html
%%PORTDOCS%%%%DOCSDIR%%/html/cli-run.html
%%PORTDOCS%%%%DOCSDIR%%/html/cli-setup-android.html
@@ -222,6 +227,10 @@ man/man1/qbs.1.gz
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-cpufeatures.html
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-dmg-members.html
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-dmg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-exporter-pkgconfig-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-exporter-pkgconfig.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-exporter-qbs-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-exporter-qbs.html
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-ib-members.html
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-ib.html
%%PORTDOCS%%%%DOCSDIR%%/html/qml-qbsmodules-ico-members.html
@@ -428,6 +437,10 @@ man/man1/qbs.1.gz
%%DATADIR%%/modules/Android/ndk/utils.js
%%DATADIR%%/modules/Android/sdk/sdk.qbs
%%DATADIR%%/modules/Android/sdk/utils.js
+%%DATADIR%%/modules/Exporter/pkgconfig/pkgconfig.js
+%%DATADIR%%/modules/Exporter/pkgconfig/pkgconfig.qbs
+%%DATADIR%%/modules/Exporter/qbs/qbsexporter.js
+%%DATADIR%%/modules/Exporter/qbs/qbsexporter.qbs
%%DATADIR%%/modules/archiver/archiver.qbs
%%DATADIR%%/modules/bundle/BundleModule.qbs
%%DATADIR%%/modules/bundle/MacOSX-Package-Types.xcspec
@@ -443,6 +456,7 @@ man/man1/qbs.1.gz
%%DATADIR%%/modules/cpp/LinuxGCC.qbs
%%DATADIR%%/modules/cpp/UnixGCC.qbs
%%DATADIR%%/modules/cpp/android-gcc.qbs
+%%DATADIR%%/modules/cpp/cpp.js
%%DATADIR%%/modules/cpp/darwin.js
%%DATADIR%%/modules/cpp/freebsd-gcc.qbs
%%DATADIR%%/modules/cpp/freebsd.js
Modified: head/devel/qt5-assistant/Makefile
==============================================================================
--- head/devel/qt5-assistant/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qt5-assistant/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -9,9 +9,9 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde at FreeBSD.org
COMMENT= Qt 5 documentation browser
+USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_QT= core gui help network printsupport sql widgets \
buildtools_build sql-sqlite3_run
-USES= compiler:c++11-lang qmake qt-dist:5,tools
DESKTOP_ENTRIES="Qt 5 Assistant" "" \
"${PREFIX}/share/pixmaps/assistant-qt5.png" \
Modified: head/devel/qt5-assistant/files/patch-src__src.pro
==============================================================================
--- head/devel/qt5-assistant/files/patch-src__src.pro Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qt5-assistant/files/patch-src__src.pro Sun Dec 16 14:49:16 2018 (r487594)
@@ -1,20 +1,24 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
---- src/src.pro.orig 2018-09-21 17:42:18 UTC
+--- src/src.pro.orig 2018-10-16 20:19:26 UTC
+++ src/src.pro
-@@ -1,48 +1,3 @@
+@@ -1,52 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
- no-png {
- message("Some graphics-related tools are unavailable without PNG support")
- } else {
-- SUBDIRS = assistant \
-- pixeltool \
-- designer
+- QT_FOR_CONFIG += widgets
+- qtConfig(pushbutton):qtConfig(toolbutton) {
+- SUBDIRS = assistant \
+- designer \
+- pixeltool
-
-- linguist.depends = designer
+- linguist.depends = designer
+- }
+- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
- }
-}
-
@@ -25,11 +29,11 @@ missing dependencies.
- !android|android_app: SUBDIRS += qtplugininfo
-}
-
--config_clang: SUBDIRS += qdoc
+-config_clang: qtConfig(thread): SUBDIRS += qdoc
-
--if(!android|android_app):!uikit: SUBDIRS += qtpaths
+-!android|android_app: SUBDIRS += qtpaths
-
--mac {
+-macos {
- SUBDIRS += macdeployqt
-}
-
@@ -40,8 +44,8 @@ missing dependencies.
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
+- distancefieldgenerator \
- pixeltool \
-- macdeployqt \
-)
-
-# This is necessary to avoid a race condition between toolchain.prf
Modified: head/devel/qt5-core/Makefile
==============================================================================
--- head/devel/qt5-core/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qt5-core/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -2,7 +2,6 @@
PORTNAME= core
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 2
CATEGORIES= devel
PKGNAMEPREFIX= qt5-
@@ -24,7 +23,7 @@ CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -
-no-iconv -no-dbus -no-opengl \
-no-egl -no-evdev \
-no-fontconfig -no-freetype -no-gtk -no-harfbuzz \
- -no-libudev -no-xcb -no-xinput2 -no-xkb -no-xcb-xlib \
+ -no-libudev -no-xcb -no-xkb -no-xcb-xlib \
-no-xkbcommon -no-libinput
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
@@ -34,16 +33,18 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
QT_DEFINES= GLIB
QT_CONFIG= glib icu
+MORE_WRKSRCS= src/tools/bootstrap src/tools/qfloat16-tables src/corelib src/tools/qlalr
+
.include <bsd.port.pre.mk>
post-configure:
-.for d in src/tools/bootstrap src/tools/qfloat16-tables src/corelib
+.for d in ${MORE_WRKSRCS}
${MKDIR} ${WRKSRC}/${d}
cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d}
.endfor
pre-build:
-.for d in src/tools/bootstrap src/tools/qfloat16-tables src/corelib
+.for d in ${MORE_WRKSRCS}
${MKDIR} ${WRKSRC}/${d}
cd ${WRKSRC}/${d} && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
@@ -54,6 +55,10 @@ post-install:
# Allow qconfig.h to be customized by single ports.
${AWK} 'BEGIN{print "#include <QtCore/qconfig-modules.h>"}{print}' \
${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h > ${WRKDIR}/qconfig.h
+# Manually install qlalr
+ cd ${WRKSRC}/src/tools/qlalr && \
+ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${MAKE_ARGS} ${INSTALL_TARGET}
# Cleanup qconfig.h and remove stray '#define QT_NO_FOO'
${REINPLACE_CMD} "/#define QT_NO_/d" ${WRKDIR}/qconfig.h
${MV} ${WRKDIR}/qconfig.h ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h
Modified: head/devel/qt5-core/pkg-plist
==============================================================================
--- head/devel/qt5-core/pkg-plist Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qt5-core/pkg-plist Sun Dec 16 14:49:16 2018 (r487594)
@@ -11,6 +11,7 @@
%%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/qcborvalue_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/qconfig_p.h
@@ -90,6 +91,7 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlogging_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qloggingregistry_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmachparser_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmakearray_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobject_moc_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobject_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobjectbuilder_p.h
@@ -111,6 +113,7 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qoperatingsystemversion_win_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qorderedmutexlocker_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qparallelanimationgroup_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qplugin_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qpoll_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsattribute_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsattributeprivate_p.h
@@ -131,6 +134,7 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsignaleventgenerator_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsignaltransition_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_x86_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimplecodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsjiscodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstate_p.h
@@ -203,6 +207,14 @@
%%QT_INCDIR%%/QtCore/QByteArrayMatcher
%%QT_INCDIR%%/QtCore/QByteRef
%%QT_INCDIR%%/QtCore/QCache
+%%QT_INCDIR%%/QtCore/QCborArray
+%%QT_INCDIR%%/QtCore/QCborError
+%%QT_INCDIR%%/QtCore/QCborMap
+%%QT_INCDIR%%/QtCore/QCborParserError
+%%QT_INCDIR%%/QtCore/QCborStreamReader
+%%QT_INCDIR%%/QtCore/QCborStreamWriter
+%%QT_INCDIR%%/QtCore/QCborValue
+%%QT_INCDIR%%/QtCore/QCborValueRef
%%QT_INCDIR%%/QtCore/QChar
%%QT_INCDIR%%/QtCore/QCharRef
%%QT_INCDIR%%/QtCore/QChildEvent
@@ -370,6 +382,7 @@
%%QT_INCDIR%%/QtCore/QReturnArgument
%%QT_INCDIR%%/QtCore/QRunnable
%%QT_INCDIR%%/QtCore/QSaveFile
+%%QT_INCDIR%%/QtCore/QScopeGuard
%%QT_INCDIR%%/QtCore/QScopedArrayPointer
%%QT_INCDIR%%/QtCore/QScopedPointer
%%QT_INCDIR%%/QtCore/QScopedPointerArrayDeleter
@@ -479,6 +492,7 @@
%%QT_INCDIR%%/QtCore/Q_STARTUPINFO
%%QT_INCDIR%%/QtCore/Qt
%%QT_INCDIR%%/QtCore/QtAlgorithms
+%%QT_INCDIR%%/QtCore/QtCborCommon
%%QT_INCDIR%%/QtCore/QtCleanUpFunction
%%QT_INCDIR%%/QtCore/QtConfig
%%QT_INCDIR%%/QtCore/QtContainerFwd
@@ -519,6 +533,11 @@
%%QT_INCDIR%%/QtCore/qbytearraylist.h
%%QT_INCDIR%%/QtCore/qbytearraymatcher.h
%%QT_INCDIR%%/QtCore/qcache.h
+%%QT_INCDIR%%/QtCore/qcborarray.h
+%%QT_INCDIR%%/QtCore/qcborcommon.h
+%%QT_INCDIR%%/QtCore/qcbormap.h
+%%QT_INCDIR%%/QtCore/qcborstream.h
+%%QT_INCDIR%%/QtCore/qcborvalue.h
%%QT_INCDIR%%/QtCore/qchar.h
%%QT_INCDIR%%/QtCore/qcollator.h
%%QT_INCDIR%%/QtCore/qcommandlineoption.h
@@ -624,6 +643,7 @@
%%QT_INCDIR%%/QtCore/qsavefile.h
%%QT_INCDIR%%/QtCore/qscopedpointer.h
%%QT_INCDIR%%/QtCore/qscopedvaluerollback.h
+%%QT_INCDIR%%/QtCore/qscopeguard.h
%%QT_INCDIR%%/QtCore/qsemaphore.h
%%QT_INCDIR%%/QtCore/qsequentialanimationgroup.h
%%QT_INCDIR%%/QtCore/qset.h
@@ -658,6 +678,7 @@
%%QT_INCDIR%%/QtCore/qtcoreversion.h
%%QT_INCDIR%%/QtCore/qtemporarydir.h
%%QT_INCDIR%%/QtCore/qtemporaryfile.h
+%%QT_INCDIR%%/QtCore/qtestsupport_core.h
%%QT_INCDIR%%/QtCore/qtextboundaryfinder.h
%%QT_INCDIR%%/QtCore/qtextcodec.h
%%QT_INCDIR%%/QtCore/qtextstream.h
@@ -691,6 +712,7 @@
%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreMacros.cmake
+%%QT_BINDIR%%/qlalr
%%QT_LIBDIR%%/libQt5Core.prl
%%QT_LIBDIR%%/libQt5Core.so
%%QT_LIBDIR%%/libQt5Core.so.5
Modified: head/devel/qt5-designer/Makefile
==============================================================================
--- head/devel/qt5-designer/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qt5-designer/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -2,16 +2,15 @@
PORTNAME= designer
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 2
CATEGORIES= devel
PKGNAMEPREFIX= qt5-
MAINTAINER= kde at FreeBSD.org
COMMENT= Qt 5 graphical user interface designer
+USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_QT= assistant_run core declarative gui network printsupport uiplugin \
widgets xml buildtools_build
-USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
DESKTOP_ENTRIES="Qt 5 Designer" "" \
Modified: head/devel/qt5-designer/files/patch-src__src.pro
==============================================================================
--- head/devel/qt5-designer/files/patch-src__src.pro Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qt5-designer/files/patch-src__src.pro Sun Dec 16 14:49:16 2018 (r487594)
@@ -1,20 +1,24 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
---- src/src.pro.orig 2018-09-21 17:48:55 UTC
+--- src/src.pro.orig 2018-10-16 20:21:44 UTC
+++ src/src.pro
-@@ -1,48 +1,3 @@
+@@ -1,52 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
- no-png {
- message("Some graphics-related tools are unavailable without PNG support")
- } else {
-- SUBDIRS = assistant \
-- pixeltool \
-- designer
+- QT_FOR_CONFIG += widgets
+- qtConfig(pushbutton):qtConfig(toolbutton) {
+- SUBDIRS = assistant \
+- designer \
+- pixeltool
-
-- linguist.depends = designer
+- linguist.depends = designer
+- }
+- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
- }
-}
-
@@ -25,11 +29,11 @@ missing dependencies.
- !android|android_app: SUBDIRS += qtplugininfo
-}
-
--config_clang: SUBDIRS += qdoc
+-config_clang: qtConfig(thread): SUBDIRS += qdoc
-
--if(!android|android_app):!uikit: SUBDIRS += qtpaths
+-!android|android_app: SUBDIRS += qtpaths
-
--mac {
+-macos {
- SUBDIRS += macdeployqt
-}
-
@@ -40,8 +44,8 @@ missing dependencies.
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
+- distancefieldgenerator \
- pixeltool \
-- macdeployqt \
-)
-
-# This is necessary to avoid a race condition between toolchain.prf
Modified: head/devel/qt5-help/Makefile
==============================================================================
--- head/devel/qt5-help/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qt5-help/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -9,12 +9,18 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde at FreeBSD.org
COMMENT= Qt online help integration module
+USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_QT= core gui network sql widgets \
buildtools_build sql-sqlite3_run
-USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src/assistant
INSTALL_WRKSRC= ${WRKSRC}/src/assistant
+
+post-install:
+# qcollectiongenerator was integrated into qhelpgenerator.
+# Instead of fixing 20 ports, simply provide it.
+ ${RLN} ${STAGEDIR}${QT_BINDIR}/qhelpgenerator \
+ ${STAGEDIR}${QT_BINDIR}/qcollectiongenerator
.include <bsd.port.mk>
Modified: head/devel/qt5-help/files/patch-src__assistant__assistant.pro
==============================================================================
--- head/devel/qt5-help/files/patch-src__assistant__assistant.pro Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qt5-help/files/patch-src__assistant__assistant.pro Sun Dec 16 14:49:16 2018 (r487594)
@@ -3,24 +3,19 @@ missing dependencies.
assistant/ is built in devel/qt5-assistant.
---- src/assistant/assistant.pro.orig 2016-06-10 14:46:48 UTC
+--- src/assistant/assistant.pro.orig 2018-10-12 10:07:26 UTC
+++ src/assistant/assistant.pro
-@@ -2,18 +2,15 @@ TEMPLATE = subdirs
+@@ -3,13 +3,11 @@ TEMPLATE = subdirs
SUBDIRS += \
help \
- assistant \
- qhelpgenerator \
- qcollectiongenerator \
- qhelpconverter
+ qhelpgenerator
--assistant.depends = help
+ assistant.depends = help
qhelpgenerator.depends = help
- qcollectiongenerator.depends = help
- qhelpconverter.depends = help
qtNomakeTools( \
- assistant \
qhelpgenerator \
- qcollectiongenerator \
- qhelpconverter \
+ )
Modified: head/devel/qt5-help/files/patch-src__src.pro
==============================================================================
--- head/devel/qt5-help/files/patch-src__src.pro Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qt5-help/files/patch-src__src.pro Sun Dec 16 14:49:16 2018 (r487594)
@@ -1,20 +1,24 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
---- src/src.pro.orig 2018-09-21 17:32:13 UTC
+--- src/src.pro.orig 2018-10-16 20:12:43 UTC
+++ src/src.pro
-@@ -1,48 +1,3 @@
+@@ -1,52 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
- no-png {
- message("Some graphics-related tools are unavailable without PNG support")
- } else {
-- SUBDIRS = assistant \
-- pixeltool \
-- designer
+- QT_FOR_CONFIG += widgets
+- qtConfig(pushbutton):qtConfig(toolbutton) {
+- SUBDIRS = assistant \
+- designer \
+- pixeltool
-
-- linguist.depends = designer
+- linguist.depends = designer
+- }
+- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
- }
-}
-
@@ -25,11 +29,11 @@ missing dependencies.
- !android|android_app: SUBDIRS += qtplugininfo
-}
-
--config_clang: SUBDIRS += qdoc
+-config_clang: qtConfig(thread): SUBDIRS += qdoc
-
--if(!android|android_app):!uikit: SUBDIRS += qtpaths
+-!android|android_app: SUBDIRS += qtpaths
-
--mac {
+-macos {
- SUBDIRS += macdeployqt
-}
-
@@ -40,8 +44,8 @@ missing dependencies.
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
+- distancefieldgenerator \
- pixeltool \
-- macdeployqt \
-)
-
-# This is necessary to avoid a race condition between toolchain.prf
Modified: head/devel/qt5-help/pkg-plist
==============================================================================
--- head/devel/qt5-help/pkg-plist Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qt5-help/pkg-plist Sun Dec 16 14:49:16 2018 (r487594)
@@ -1,9 +1,6 @@
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpcollectionhandler_p.h
-%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdatainterface_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdbreader_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpengine_p.h
-%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpgenerator_p.h
-%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpprojectdata_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_default_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_default_p.h
@@ -42,7 +39,6 @@
%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%.debug
%%QT_BINDIR%%/qcollectiongenerator
-%%QT_BINDIR%%/qhelpconverter
%%QT_BINDIR%%/qhelpgenerator
%%QT_MKSPECDIR%%/modules/qt_lib_help.pri
%%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri
Modified: head/devel/qt5-linguist/Makefile
==============================================================================
--- head/devel/qt5-linguist/Makefile Sun Dec 16 14:39:29 2018 (r487593)
+++ head/devel/qt5-linguist/Makefile Sun Dec 16 14:49:16 2018 (r487594)
@@ -9,10 +9,10 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde at FreeBSD.org
COMMENT= Qt 5 translation tool
+USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_QT= core gui printsupport widgets xml \
assistant_run linguisttools_run \
buildtools_build designer_build uitools_build
-USES= compiler:c++11-lang qmake qt-dist:5,tools
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list