FreeBSD Bugzilla – Attachment 201870 Details for
Bug 235622
[exp-run] Update Qt5 to 5.12.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v1
qt5-5.12.1.v1.diff (text/plain), 91.21 KB, created by
Tobias C. Berner
on 2019-02-09 15:17:32 UTC
(
hide
)
Description:
v1
Filename:
MIME Type:
Creator:
Tobias C. Berner
Created:
2019-02-09 15:17:32 UTC
Size:
91.21 KB
patch
obsolete
>diff --git Mk/Uses/qt-dist.mk Mk/Uses/qt-dist.mk >index db8427aa7132..a09a22a68087 100644 >--- Mk/Uses/qt-dist.mk >+++ Mk/Uses/qt-dist.mk >@@ -318,8 +318,8 @@ qtbase-pre-configure: > # ports/194088. > post-patch: qtbase-post-patch > qtbase-post-patch: >- ${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \ >- ${WRKSRC}/configure >+ ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ >+ ${WRKSRC}//mkspecs/common/bsd/bsd.conf > > . if ${PORTNAME} != "qmake" > _QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake >@@ -348,6 +348,8 @@ qt5-pre-configure: > # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them. > # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. > ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache >+ ${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS = ${LOCALBASE}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache >+ ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS = ${LOCALBASE}/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache > > post-install: qt-post-install > qt-post-install: >diff --git Mk/Uses/qt.mk Mk/Uses/qt.mk >index 09853a26e65e..768ed7cad679 100644 >--- Mk/Uses/qt.mk >+++ Mk/Uses/qt.mk >@@ -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.12.0 >+QT5_VERSION?= 5.12.1 > > # 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) >diff --git accessibility/qt5-speech/Makefile accessibility/qt5-speech/Makefile >index de2a7ae72187..4da2e231ac51 100644 >--- accessibility/qt5-speech/Makefile >+++ accessibility/qt5-speech/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= speech > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= accessibility > PKGNAMEPREFIX= qt5- > >diff --git comms/qt5-connectivity/Makefile comms/qt5-connectivity/Makefile >index 407f58d5f6c1..95dad0a7d9aa 100644 >--- comms/qt5-connectivity/Makefile >+++ comms/qt5-connectivity/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= connectivity > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= comms > PKGNAMEPREFIX= qt5- > >diff --git comms/qt5-sensors/Makefile comms/qt5-sensors/Makefile >index 315e633a5b5f..556e740ec743 100644 >--- comms/qt5-sensors/Makefile >+++ comms/qt5-sensors/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= sensors > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= comms > PKGNAMEPREFIX= qt5- > >diff --git comms/qt5-serialbus/Makefile comms/qt5-serialbus/Makefile >index e94232ce9f19..aeccbf4933ae 100644 >--- comms/qt5-serialbus/Makefile >+++ comms/qt5-serialbus/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= serialbus > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= comms > PKGNAMEPREFIX= qt5- > >diff --git comms/qt5-serialport/Makefile comms/qt5-serialport/Makefile >index d321a57dadfb..57d113647247 100644 >--- comms/qt5-serialport/Makefile >+++ comms/qt5-serialport/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= serialport > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= comms > PKGNAMEPREFIX= qt5- > >diff --git databases/qt5-sql/Makefile databases/qt5-sql/Makefile >index 9a2586e67ec1..ae52f74ffee6 100644 >--- databases/qt5-sql/Makefile >+++ databases/qt5-sql/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= sql > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= databases > PKGNAMEPREFIX= qt5- > >diff --git databases/qt5-sqldrivers-ibase/Makefile databases/qt5-sqldrivers-ibase/Makefile >index 2d18bc877641..4e833adb9193 100644 >--- databases/qt5-sqldrivers-ibase/Makefile >+++ databases/qt5-sqldrivers-ibase/Makefile >@@ -1,6 +1,5 @@ > # $FreeBSD$ > >-PORTREVISION= 1 > > DB= IBase > DB_DESC= InterBase/Firebird >diff --git databases/qt5-sqldrivers-mysql/Makefile databases/qt5-sqldrivers-mysql/Makefile >index b364a2bdf27b..514e44909786 100644 >--- databases/qt5-sqldrivers-mysql/Makefile >+++ databases/qt5-sqldrivers-mysql/Makefile >@@ -1,6 +1,5 @@ > # $FreeBSD$ > >-PORTREVISION= 1 > > DB= MYSQL > DB_DESC= MySQL >diff --git databases/qt5-sqldrivers-odbc/Makefile databases/qt5-sqldrivers-odbc/Makefile >index 8ac684b15e6d..6b1d23f9f564 100644 >--- databases/qt5-sqldrivers-odbc/Makefile >+++ databases/qt5-sqldrivers-odbc/Makefile >@@ -1,6 +1,5 @@ > # $FreeBSD$ > >-PORTREVISION= 1 > > COMMENT= Qt ${DB_DESC} plugin > >diff --git databases/qt5-sqldrivers-pgsql/Makefile databases/qt5-sqldrivers-pgsql/Makefile >index 0ebab3535a77..bf7cb5bdaa22 100644 >--- databases/qt5-sqldrivers-pgsql/Makefile >+++ databases/qt5-sqldrivers-pgsql/Makefile >@@ -1,7 +1,6 @@ > # $FreeBSD$ > > PORTNAME= pgsql >-PORTREVISION= 1 > > DB= PSQL > DB_DESC= PostgreSQL >diff --git databases/qt5-sqldrivers-sqlite2/Makefile databases/qt5-sqldrivers-sqlite2/Makefile >index aead3727c8bf..7af749b06742 100644 >--- databases/qt5-sqldrivers-sqlite2/Makefile >+++ databases/qt5-sqldrivers-sqlite2/Makefile >@@ -1,6 +1,5 @@ > # $FreeBSD$ > >-PORTREVISION= 1 > > DB= SQLite2 > DB_DESC= SQLite 2 >diff --git databases/qt5-sqldrivers-sqlite3/Makefile databases/qt5-sqldrivers-sqlite3/Makefile >index 2a805747e5e2..6a8554bce8f4 100644 >--- databases/qt5-sqldrivers-sqlite3/Makefile >+++ databases/qt5-sqldrivers-sqlite3/Makefile >@@ -1,7 +1,6 @@ > # $FreeBSD$ > > PORTNAME= sqlite3 >-PORTREVISION= 1 > > DB= SQLite > DB_DESC= SQLite 3 >diff --git databases/qt5-sqldrivers-tds/Makefile databases/qt5-sqldrivers-tds/Makefile >index f2953412a270..36a41f930488 100644 >--- databases/qt5-sqldrivers-tds/Makefile >+++ databases/qt5-sqldrivers-tds/Makefile >@@ -1,6 +1,5 @@ > # $FreeBSD$ > >-PORTREVISION= 1 > > DB= TDS > DB_DESC= TDS Database Connectivity >diff --git devel/qt5-assistant/Makefile devel/qt5-assistant/Makefile >index e05a62ef75d0..12c0e87a9c7b 100644 >--- devel/qt5-assistant/Makefile >+++ devel/qt5-assistant/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= assistant > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-assistant/files/patch-src__src.pro devel/qt5-assistant/files/patch-src__src.pro >index 69e0f8d64ad1..94373df48b18 100644 >--- devel/qt5-assistant/files/patch-src__src.pro >+++ devel/qt5-assistant/files/patch-src__src.pro >@@ -1,9 +1,9 @@ > Only enter the directories we want to build, otherwise we might fail due to > missing dependencies. > >---- src/src.pro.orig 2018-10-16 20:19:26 UTC >+--- src/src.pro.orig 2019-02-08 21:21:18 UTC > +++ src/src.pro >-@@ -1,52 +1,3 @@ >+@@ -1,54 +1,3 @@ > TEMPLATE = subdirs > > -qtHaveModule(widgets) { >@@ -29,7 +29,9 @@ missing dependencies. > - !android|android_app: SUBDIRS += qtplugininfo > -} > - >--config_clang: qtConfig(thread): SUBDIRS += qdoc >+-include($$OUT_PWD/qdoc/qtqdoc-config.pri) >+-QT_FOR_CONFIG += qdoc-private >+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc > - > -!android|android_app: SUBDIRS += qtpaths > - >diff --git devel/qt5-buildtools/Makefile devel/qt5-buildtools/Makefile >index 460aedac66c5..ab86eed4f1f4 100644 >--- devel/qt5-buildtools/Makefile >+++ devel/qt5-buildtools/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= buildtools > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-concurrent/Makefile devel/qt5-concurrent/Makefile >index ff11a30401a2..cc9b3a04fc51 100644 >--- devel/qt5-concurrent/Makefile >+++ devel/qt5-concurrent/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= concurrent > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-core/Makefile devel/qt5-core/Makefile >index 575dfc122126..c1a554d5b985 100644 >--- devel/qt5-core/Makefile >+++ devel/qt5-core/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= core > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-dbus/Makefile devel/qt5-dbus/Makefile >index eb787a6435f2..bb1b65531d34 100644 >--- devel/qt5-dbus/Makefile >+++ devel/qt5-dbus/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= dbus > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-designer/Makefile devel/qt5-designer/Makefile >index 1fe82c4ddbc9..098bf1efac76 100644 >--- devel/qt5-designer/Makefile >+++ devel/qt5-designer/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= designer > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-designer/files/patch-src__src.pro devel/qt5-designer/files/patch-src__src.pro >index 8347dcc9eba7..38f2c720bb9d 100644 >--- devel/qt5-designer/files/patch-src__src.pro >+++ devel/qt5-designer/files/patch-src__src.pro >@@ -1,9 +1,9 @@ > Only enter the directories we want to build, otherwise we might fail due to > missing dependencies. > >---- src/src.pro.orig 2018-10-16 20:21:44 UTC >+--- src/src.pro.orig 2019-02-08 21:28:33 UTC > +++ src/src.pro >-@@ -1,52 +1,3 @@ >+@@ -1,54 +1,3 @@ > TEMPLATE = subdirs > > -qtHaveModule(widgets) { >@@ -29,7 +29,9 @@ missing dependencies. > - !android|android_app: SUBDIRS += qtplugininfo > -} > - >--config_clang: qtConfig(thread): SUBDIRS += qdoc >+-include($$OUT_PWD/qdoc/qtqdoc-config.pri) >+-QT_FOR_CONFIG += qdoc-private >+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc > - > -!android|android_app: SUBDIRS += qtpaths > - >diff --git devel/qt5-help/Makefile devel/qt5-help/Makefile >index 964128bfdfb1..6b05aab6cc33 100644 >--- devel/qt5-help/Makefile >+++ devel/qt5-help/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= help > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >@@ -17,10 +16,4 @@ 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> >diff --git devel/qt5-help/files/patch-src__assistant__assistant.pro devel/qt5-help/files/patch-src__assistant__assistant.pro >index ce807468f164..76f874d7b7f5 100644 >--- devel/qt5-help/files/patch-src__assistant__assistant.pro >+++ devel/qt5-help/files/patch-src__assistant__assistant.pro >@@ -3,19 +3,21 @@ missing dependencies. > > assistant/ is built in devel/qt5-assistant. > >---- src/assistant/assistant.pro.orig 2018-10-12 10:07:26 UTC >+--- src/assistant/assistant.pro.orig 2019-01-15 05:20:10 UTC > +++ src/assistant/assistant.pro >-@@ -3,13 +3,11 @@ TEMPLATE = subdirs >+@@ -3,7 +3,6 @@ TEMPLATE = subdirs > > SUBDIRS += \ > help \ > - assistant \ >- qhelpgenerator >+ qhelpgenerator \ >+ qcollectiongenerator > >- assistant.depends = help >+@@ -11,7 +10,6 @@ assistant.depends = help > qhelpgenerator.depends = help > > qtNomakeTools( \ > - assistant \ > qhelpgenerator \ >+ qcollectiongenerator \ > ) >diff --git devel/qt5-help/files/patch-src__src.pro devel/qt5-help/files/patch-src__src.pro >index 8b7d58180866..9f3ff9425e7b 100644 >--- devel/qt5-help/files/patch-src__src.pro >+++ devel/qt5-help/files/patch-src__src.pro >@@ -1,9 +1,9 @@ > Only enter the directories we want to build, otherwise we might fail due to > missing dependencies. > >---- src/src.pro.orig 2018-10-16 20:12:43 UTC >+--- src/src.pro.orig 2019-02-08 21:08:58 UTC > +++ src/src.pro >-@@ -1,52 +1,3 @@ >+@@ -1,54 +1,3 @@ > TEMPLATE = subdirs > > -qtHaveModule(widgets) { >@@ -29,7 +29,9 @@ missing dependencies. > - !android|android_app: SUBDIRS += qtplugininfo > -} > - >--config_clang: qtConfig(thread): SUBDIRS += qdoc >+-include($$OUT_PWD/qdoc/qtqdoc-config.pri) >+-QT_FOR_CONFIG += qdoc-private >+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc > - > -!android|android_app: SUBDIRS += qtpaths > - >diff --git devel/qt5-linguist/Makefile devel/qt5-linguist/Makefile >index 409a9c047f6b..b774755429ef 100644 >--- devel/qt5-linguist/Makefile >+++ devel/qt5-linguist/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= linguist > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-linguist/files/patch-src__src.pro devel/qt5-linguist/files/patch-src__src.pro >index 3aa680409fdd..8f8972f30171 100644 >--- devel/qt5-linguist/files/patch-src__src.pro >+++ devel/qt5-linguist/files/patch-src__src.pro >@@ -1,9 +1,9 @@ > Only enter the directories we want to build, otherwise we might fail due to > missing dependencies. > >---- src/src.pro.orig 2018-10-16 20:23:55 UTC >+--- src/src.pro.orig 2019-02-08 21:36:50 UTC > +++ src/src.pro >-@@ -1,52 +1,3 @@ >+@@ -1,54 +1,3 @@ > TEMPLATE = subdirs > > -qtHaveModule(widgets) { >@@ -29,7 +29,9 @@ missing dependencies. > - !android|android_app: SUBDIRS += qtplugininfo > -} > - >--config_clang: qtConfig(thread): SUBDIRS += qdoc >+-include($$OUT_PWD/qdoc/qtqdoc-config.pri) >+-QT_FOR_CONFIG += qdoc-private >+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc > - > -!android|android_app: SUBDIRS += qtpaths > - >diff --git devel/qt5-linguisttools/Makefile devel/qt5-linguisttools/Makefile >index 7fa12d2681ba..dd095a8ee2f6 100644 >--- devel/qt5-linguisttools/Makefile >+++ devel/qt5-linguisttools/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= linguisttools > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-linguisttools/files/patch-src__src.pro devel/qt5-linguisttools/files/patch-src__src.pro >index d122a4b452ad..be3bf89a4d56 100644 >--- devel/qt5-linguisttools/files/patch-src__src.pro >+++ devel/qt5-linguisttools/files/patch-src__src.pro >@@ -1,9 +1,9 @@ > Only enter the directories we want to build, otherwise we might fail due to > missing dependencies. > >---- src/src.pro.orig 2018-10-16 20:06:18 UTC >+--- src/src.pro.orig 2019-02-08 21:14:29 UTC > +++ src/src.pro >-@@ -1,52 +1,3 @@ >+@@ -1,54 +1,3 @@ > TEMPLATE = subdirs > > -qtHaveModule(widgets) { >@@ -29,7 +29,9 @@ missing dependencies. > - !android|android_app: SUBDIRS += qtplugininfo > -} > - >--config_clang: qtConfig(thread): SUBDIRS += qdoc >+-include($$OUT_PWD/qdoc/qtqdoc-config.pri) >+-QT_FOR_CONFIG += qdoc-private >+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc > - > -!android|android_app: SUBDIRS += qtpaths > - >@@ -56,4 +58,4 @@ missing dependencies. > - winrtrunner.depends += qtattributionsscanner > - linguist.depends += qtattributionsscanner > -} >-+SUBDIRS += linguist >++SUBDIRS += linguist \ >diff --git devel/qt5-location/Makefile devel/qt5-location/Makefile >index b33ac1d15260..4deabe000ac1 100644 >--- devel/qt5-location/Makefile >+++ devel/qt5-location/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= location > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >@@ -10,7 +9,8 @@ MAINTAINER= kde@FreeBSD.org > COMMENT= Qt location module > > USES= compiler:c++11-lang qmake:norecursive qt-dist:5,location >-USE_QT= concurrent core dbus declarative gui network buildtools_build >+USE_QT= concurrent core dbus declarative gui network serialport \ >+ buildtools_build > > USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} > >diff --git devel/qt5-location/files/patch-src_plugins_position_position.pro devel/qt5-location/files/patch-src_plugins_position_position.pro >new file mode 100644 >index 000000000000..127034a90da6 >--- /dev/null >+++ devel/qt5-location/files/patch-src_plugins_position_position.pro >@@ -0,0 +1,13 @@ >+--- src/plugins/position/position.pro.orig 2019-02-08 20:56:53 UTC >++++ src/plugins/position/position.pro >+@@ -2,8 +2,8 @@ TEMPLATE = subdirs >+ >+ QT_FOR_CONFIG += positioning-private >+ >+-linux:qtHaveModule(dbus):SUBDIRS += geoclue >+-linux:qtHaveModule(dbus):SUBDIRS += geoclue2 >++linux|freebsd:qtHaveModule(dbus):SUBDIRS += geoclue >++linux|freebsd:qtHaveModule(dbus):SUBDIRS += geoclue2 >+ qtConfig(gypsy):SUBDIRS += gypsy >+ qtConfig(winrt_geolocation):SUBDIRS += winrt >+ qtHaveModule(simulator):SUBDIRS += simulator >diff --git devel/qt5-location/pkg-plist devel/qt5-location/pkg-plist >index 9aef988f5c8a..dbcea9de4d25 100644 >--- devel/qt5-location/pkg-plist >+++ devel/qt5-location/pkg-plist >@@ -44,6 +44,7 @@ > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameracapabilities_p.h > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameradata_p.h > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameratiles_p.h >+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameratiles_p_p.h > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodereply_p.h > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodingmanager_p.h > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodingmanagerengine_p.h >@@ -82,6 +83,7 @@ > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapreply_p.h > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapreply_p_p.h > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapscene_p.h >+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapscene_p_p.h > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilefetcher_p.h > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilefetcher_p_p.h > %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilerequestmanager_p.h >@@ -302,6 +304,7 @@ > %%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake > %%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue2.cmake > %%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake >+%%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactorySerialNmea.cmake > %%QT_CMAKEDIR%%/Qt5PositioningQuick/Qt5PositioningQuickConfig.cmake > %%QT_CMAKEDIR%%/Qt5PositioningQuick/Qt5PositioningQuickConfigVersion.cmake > %%QT_LIBDIR%%/libQt5Location.prl >@@ -344,6 +347,8 @@ > %%DEBUG%%%%QT_PLUGINDIR%%/position/libqtposition_geoclue2.so.debug > %%QT_PLUGINDIR%%/position/libqtposition_positionpoll.so > %%DEBUG%%%%QT_PLUGINDIR%%/position/libqtposition_positionpoll.so.debug >+%%QT_PLUGINDIR%%/position/libqtposition_serialnmea.so >+%%DEBUG%%%%QT_PLUGINDIR%%/position/libqtposition_serialnmea.so.debug > %%QT_QMLDIR%%/Qt/labs/location/liblocationlabsplugin.so > %%DEBUG%%%%QT_QMLDIR%%/Qt/labs/location/liblocationlabsplugin.so.debug > %%QT_QMLDIR%%/Qt/labs/location/plugins.qmltypes >diff --git devel/qt5-qdbus/Makefile devel/qt5-qdbus/Makefile >index 58075db73110..1f43f0470b62 100644 >--- devel/qt5-qdbus/Makefile >+++ devel/qt5-qdbus/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= qdbus > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-qdbus/files/patch-src_src.pro devel/qt5-qdbus/files/patch-src_src.pro >index b8b4f88a8ceb..c864594fb7e0 100644 >--- devel/qt5-qdbus/files/patch-src_src.pro >+++ devel/qt5-qdbus/files/patch-src_src.pro >@@ -1,9 +1,9 @@ > Only enter the directories we want to build, otherwise we might fail due to >-missing dependencies. >+missing dependencies > >---- src/src.pro.orig 2018-10-16 19:57:17 UTC >+--- src/src.pro.orig 2019-02-07 05:50:19 UTC > +++ src/src.pro >-@@ -1,52 +1,3 @@ >+@@ -1,54 +1,3 @@ > TEMPLATE = subdirs > > -qtHaveModule(widgets) { >@@ -29,7 +29,9 @@ missing dependencies. > - !android|android_app: SUBDIRS += qtplugininfo > -} > - >--config_clang: qtConfig(thread): SUBDIRS += qdoc >+-include($$OUT_PWD/qdoc/qtqdoc-config.pri) >+-QT_FOR_CONFIG += qdoc-private >+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc > - > -!android|android_app: SUBDIRS += qtpaths > - >diff --git devel/qt5-qdbusviewer/Makefile devel/qt5-qdbusviewer/Makefile >index 2d3366e0e5d1..4e85a308e30b 100644 >--- devel/qt5-qdbusviewer/Makefile >+++ devel/qt5-qdbusviewer/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= qdbusviewer > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-qdbusviewer/files/patch-src__src.pro devel/qt5-qdbusviewer/files/patch-src__src.pro >index a8a70489d39c..8dbad51d202d 100644 >--- devel/qt5-qdbusviewer/files/patch-src__src.pro >+++ devel/qt5-qdbusviewer/files/patch-src__src.pro >@@ -1,9 +1,9 @@ > Only enter the directories we want to build, otherwise we might fail due to > missing dependencies. > >---- src/src.pro.orig 2018-10-16 20:13:51 UTC >+--- src/src.pro.orig 2019-02-08 21:10:39 UTC > +++ src/src.pro >-@@ -1,52 +1,3 @@ >+@@ -1,54 +1,3 @@ > TEMPLATE = subdirs > > -qtHaveModule(widgets) { >@@ -29,7 +29,9 @@ missing dependencies. > - !android|android_app: SUBDIRS += qtplugininfo > -} > - >--config_clang: qtConfig(thread): SUBDIRS += qdoc >+-include($$OUT_PWD/qdoc/qtqdoc-config.pri) >+-QT_FOR_CONFIG += qdoc-private >+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc > - > -!android|android_app: SUBDIRS += qtpaths > - >diff --git devel/qt5-qdoc/Makefile devel/qt5-qdoc/Makefile >index 4daf0f152692..ec92d875a1eb 100644 >--- devel/qt5-qdoc/Makefile >+++ devel/qt5-qdoc/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= qdoc > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel textproc > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-qdoc/files/patch-src_src.pro devel/qt5-qdoc/files/patch-src_src.pro >index cd605911e693..4ec1411c7120 100644 >--- devel/qt5-qdoc/files/patch-src_src.pro >+++ devel/qt5-qdoc/files/patch-src_src.pro >@@ -1,9 +1,9 @@ > Only enter the directories we want to build, otherwise we might fail due to > missing dependencies. > >---- src/src.pro.orig 2018-10-16 20:05:35 UTC >+--- src/src.pro.orig 2019-02-08 21:19:15 UTC > +++ src/src.pro >-@@ -1,52 +1,3 @@ >+@@ -1,54 +1,5 @@ > TEMPLATE = subdirs > > -qtHaveModule(widgets) { >@@ -29,7 +29,9 @@ missing dependencies. > - !android|android_app: SUBDIRS += qtplugininfo > -} > - >- config_clang: qtConfig(thread): SUBDIRS += qdoc >+ include($$OUT_PWD/qdoc/qtqdoc-config.pri) >+ QT_FOR_CONFIG += qdoc-private >+ qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc > - > -!android|android_app: SUBDIRS += qtpaths > - >diff --git devel/qt5-qmake/Makefile devel/qt5-qmake/Makefile >index 4f60ae78c7c1..44e4319947ef 100644 >--- devel/qt5-qmake/Makefile >+++ devel/qt5-qmake/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= qmake > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-qmake/pkg-plist devel/qt5-qmake/pkg-plist >index d4d9af8e5af8..b09dc7acb667 100644 >--- devel/qt5-qmake/pkg-plist >+++ devel/qt5-qmake/pkg-plist >@@ -38,6 +38,7 @@ > %%QT_MKSPECDIR%%/common/mac.conf > %%QT_MKSPECDIR%%/common/mac/qplatformdefs.h > %%QT_MKSPECDIR%%/common/macx.conf >+%%QT_MKSPECDIR%%/common/msvc-based-version.conf > %%QT_MKSPECDIR%%/common/msvc-desktop.conf > %%QT_MKSPECDIR%%/common/msvc-version.conf > %%QT_MKSPECDIR%%/common/nacl/g++-nacl32.conf >@@ -178,6 +179,7 @@ > %%QT_MKSPECDIR%%/features/data/cmake/Qt5PluginTarget.cmake.in > %%QT_MKSPECDIR%%/features/data/configure.json > %%QT_MKSPECDIR%%/features/data/dummy.cpp >+%%QT_MKSPECDIR%%/features/data/dumpvcvars.bat > %%QT_MKSPECDIR%%/features/data/mac/objc_namespace.sh > %%QT_MKSPECDIR%%/features/data/macros.cpp > %%QT_MKSPECDIR%%/features/data/unix/findclasslist.pl >@@ -222,8 +224,6 @@ > %%QT_MKSPECDIR%%/features/qgltf.prf > %%QT_MKSPECDIR%%/features/qlalr.prf > %%QT_MKSPECDIR%%/features/qmake_use.prf >-%%QT_MKSPECDIR%%/features/qml1_module.prf >-%%QT_MKSPECDIR%%/features/qml1_plugin.prf > %%QT_MKSPECDIR%%/features/qml_debug.prf > %%QT_MKSPECDIR%%/features/qml_module.prf > %%QT_MKSPECDIR%%/features/qml_plugin.prf >@@ -299,7 +299,6 @@ > %%QT_MKSPECDIR%%/features/vxworks.prf > %%QT_MKSPECDIR%%/features/warn_off.prf > %%QT_MKSPECDIR%%/features/warn_on.prf >-%%QT_MKSPECDIR%%/features/wasm/qt.prf > %%QT_MKSPECDIR%%/features/wasm/wasm.prf > %%QT_MKSPECDIR%%/features/wayland-scanner.prf > %%QT_MKSPECDIR%%/features/win32/console.prf >@@ -451,6 +450,8 @@ > %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qplatformdefs.h > %%QT_MKSPECDIR%%/wasm-emscripten/qmake.conf > %%QT_MKSPECDIR%%/wasm-emscripten/qplatformdefs.h >+%%QT_MKSPECDIR%%/win32-arm64-msvc2017/qmake.conf >+%%QT_MKSPECDIR%%/win32-arm64-msvc2017/qplatformdefs.h > %%QT_MKSPECDIR%%/win32-clang-g++/qmake.conf > %%QT_MKSPECDIR%%/win32-clang-g++/qplatformdefs.h > %%QT_MKSPECDIR%%/win32-clang-msvc/qmake.conf >diff --git devel/qt5-remoteobjects/Makefile devel/qt5-remoteobjects/Makefile >index e1b0dd477020..474cf7d97554 100644 >--- devel/qt5-remoteobjects/Makefile >+++ devel/qt5-remoteobjects/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= remoteobjects > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-script/Makefile devel/qt5-script/Makefile >index 01044dc136c4..fa519ba36781 100644 >--- devel/qt5-script/Makefile >+++ devel/qt5-script/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= script > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-script/pkg-plist devel/qt5-script/pkg-plist >index afc74c4377fd..d10f3a8a2721 100644 >--- devel/qt5-script/pkg-plist >+++ devel/qt5-script/pkg-plist >@@ -1,3 +1,4 @@ >+%%QT_INCDIR%%/QtScript/%%FULLVER%%/QtScript/private/qtscript-config_p.h > %%QT_INCDIR%%/QtScript/%%FULLVER%%/QtScript/private/qscriptable_p.h > %%QT_INCDIR%%/QtScript/%%FULLVER%%/QtScript/private/qscriptactivationobject_p.h > %%QT_INCDIR%%/QtScript/%%FULLVER%%/QtScript/private/qscriptast_p.h >@@ -41,6 +42,7 @@ > %%QT_INCDIR%%/QtScript/QtScript > %%QT_INCDIR%%/QtScript/QtScriptDepends > %%QT_INCDIR%%/QtScript/QtScriptVersion >+%%QT_INCDIR%%/QtScript/qtscript-config.h > %%QT_INCDIR%%/QtScript/qscriptable.h > %%QT_INCDIR%%/QtScript/qscriptclass.h > %%QT_INCDIR%%/QtScript/qscriptclasspropertyiterator.h >diff --git devel/qt5-scripttools/Makefile devel/qt5-scripttools/Makefile >index b5e43ad31a74..c55d1820bcb1 100644 >--- devel/qt5-scripttools/Makefile >+++ devel/qt5-scripttools/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= scripttools > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-scxml/Makefile devel/qt5-scxml/Makefile >index 770e30e033b3..d994bca6eaaf 100644 >--- devel/qt5-scxml/Makefile >+++ devel/qt5-scxml/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= scxml > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-testlib/Makefile devel/qt5-testlib/Makefile >index 668ecd53fefc..52a3d32e83a0 100644 >--- devel/qt5-testlib/Makefile >+++ devel/qt5-testlib/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= testlib > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-uitools/Makefile devel/qt5-uitools/Makefile >index a3a3ca36a4cf..7bca3c5cdc0a 100644 >--- devel/qt5-uitools/Makefile >+++ devel/qt5-uitools/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= uitools > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= devel > PKGNAMEPREFIX= qt5- > >diff --git devel/qt5-uitools/files/patch-src__src.pro devel/qt5-uitools/files/patch-src__src.pro >index 53616a9ad080..4bdda40641aa 100644 >--- devel/qt5-uitools/files/patch-src__src.pro >+++ devel/qt5-uitools/files/patch-src__src.pro >@@ -1,9 +1,9 @@ > Only enter the directories we want to build, otherwise we might fail due to > missing dependencies. > >---- src/src.pro.orig 2018-10-16 20:20:18 UTC >+--- src/src.pro.orig 2019-02-08 21:08:17 UTC > +++ src/src.pro >-@@ -1,52 +1,3 @@ >+@@ -1,54 +1,3 @@ > TEMPLATE = subdirs > > -qtHaveModule(widgets) { >@@ -29,7 +29,9 @@ missing dependencies. > - !android|android_app: SUBDIRS += qtplugininfo > -} > - >--config_clang: qtConfig(thread): SUBDIRS += qdoc >+-include($$OUT_PWD/qdoc/qtqdoc-config.pri) >+-QT_FOR_CONFIG += qdoc-private >+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc > - > -!android|android_app: SUBDIRS += qtpaths > - >diff --git devel/qt5/distinfo devel/qt5/distinfo >index 3b874c4ff3ab..97eb93c2cf14 100644 >--- devel/qt5/distinfo >+++ devel/qt5/distinfo >@@ -1,79 +1,79 @@ >-TIMESTAMP = 1544129524 >-SHA256 (KDE/Qt/5.12.0/qt3d-everywhere-src-5.12.0.tar.xz) = a12adc9c14ffa18ff5c4951efb41914d4840a0c2a88486eb8d39a4833e4631da >-SIZE (KDE/Qt/5.12.0/qt3d-everywhere-src-5.12.0.tar.xz) = 84949704 >-SHA256 (KDE/Qt/5.12.0/qtactiveqt-everywhere-src-5.12.0.tar.xz) = a22876b4243cb433042e7f4812974eac05935872f39cc880a3587bc3eae86d3e >-SIZE (KDE/Qt/5.12.0/qtactiveqt-everywhere-src-5.12.0.tar.xz) = 261880 >-SHA256 (KDE/Qt/5.12.0/qtandroidextras-everywhere-src-5.12.0.tar.xz) = f5a9a13bf8b8999250b27fd68c1ed4287f333d1cebed05ae9d0b29bf9f1d0868 >-SIZE (KDE/Qt/5.12.0/qtandroidextras-everywhere-src-5.12.0.tar.xz) = 104620 >-SHA256 (KDE/Qt/5.12.0/qtbase-everywhere-src-5.12.0.tar.xz) = 5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb >-SIZE (KDE/Qt/5.12.0/qtbase-everywhere-src-5.12.0.tar.xz) = 48288896 >-SHA256 (KDE/Qt/5.12.0/qtcanvas3d-everywhere-src-5.12.0.tar.xz) = b21b9f01c498d0e51e3db4c54344147fb901c0f40ec8b3135609905b55f9c128 >-SIZE (KDE/Qt/5.12.0/qtcanvas3d-everywhere-src-5.12.0.tar.xz) = 10914876 >-SHA256 (KDE/Qt/5.12.0/qtcharts-everywhere-src-5.12.0.tar.xz) = 9cd71c4a4c10611083ce8f16992c59666d51b5275cc1a79f324ee18579ced450 >-SIZE (KDE/Qt/5.12.0/qtcharts-everywhere-src-5.12.0.tar.xz) = 4242288 >-SHA256 (KDE/Qt/5.12.0/qtconnectivity-everywhere-src-5.12.0.tar.xz) = 8ebca1ba859ebb5b0e8e6fffff1f8131dd84f9e44448df6ac58c8be32b5122a4 >-SIZE (KDE/Qt/5.12.0/qtconnectivity-everywhere-src-5.12.0.tar.xz) = 2740124 >-SHA256 (KDE/Qt/5.12.0/qtdatavis3d-everywhere-src-5.12.0.tar.xz) = 4eda7e352b5d7d58a19611f76a906e952f6a86451740a80a3759b8871090f433 >-SIZE (KDE/Qt/5.12.0/qtdatavis3d-everywhere-src-5.12.0.tar.xz) = 5201308 >-SHA256 (KDE/Qt/5.12.0/qtdeclarative-everywhere-src-5.12.0.tar.xz) = 4ffd58102b5714ae058f91cc31511f1c928978f77f01652beb9ce2352a4c227b >-SIZE (KDE/Qt/5.12.0/qtdeclarative-everywhere-src-5.12.0.tar.xz) = 20436712 >-SHA256 (KDE/Qt/5.12.0/qtdoc-everywhere-src-5.12.0.tar.xz) = 306576d717ffd37eafe10914dfa5a51301f3d5c701ef2416cc36b16a83520ccd >-SIZE (KDE/Qt/5.12.0/qtdoc-everywhere-src-5.12.0.tar.xz) = 5588676 >-SHA256 (KDE/Qt/5.12.0/qtgamepad-everywhere-src-5.12.0.tar.xz) = 4c1900b9917dc18584b2287cd7382f0668d71237ef8e71e3feb4d457c2b56091 >-SIZE (KDE/Qt/5.12.0/qtgamepad-everywhere-src-5.12.0.tar.xz) = 385484 >-SHA256 (KDE/Qt/5.12.0/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz) = 81058fb12d4dd019bed6bb196a13ea5d308a390d72a1468da11171f8c3003455 >-SIZE (KDE/Qt/5.12.0/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz) = 14270812 >-SHA256 (KDE/Qt/5.12.0/qtimageformats-everywhere-src-5.12.0.tar.xz) = 5f907de96d3db6276816f321b7e11cba7beb1fcc81bcb3f1729cde3b7599732e >-SIZE (KDE/Qt/5.12.0/qtimageformats-everywhere-src-5.12.0.tar.xz) = 1774820 >-SHA256 (KDE/Qt/5.12.0/qtlocation-everywhere-src-5.12.0.tar.xz) = b0a3134df3a00f6045405d3c12e0ea3ae7e640feaf38e238873df85424674449 >-SIZE (KDE/Qt/5.12.0/qtlocation-everywhere-src-5.12.0.tar.xz) = 5898856 >-SHA256 (KDE/Qt/5.12.0/qtmacextras-everywhere-src-5.12.0.tar.xz) = d90a7ba25543503ed40f6c248780b6859254536735d8f87fe5598f688c9cb003 >-SIZE (KDE/Qt/5.12.0/qtmacextras-everywhere-src-5.12.0.tar.xz) = 68592 >-SHA256 (KDE/Qt/5.12.0/qtmultimedia-everywhere-src-5.12.0.tar.xz) = 5c4b0cb9c08c57ce1aad3aee267c6f6270d254addfb2a6dd363a272e98e926a9 >-SIZE (KDE/Qt/5.12.0/qtmultimedia-everywhere-src-5.12.0.tar.xz) = 3716764 >-SHA256 (KDE/Qt/5.12.0/qtnetworkauth-everywhere-src-5.12.0.tar.xz) = 41111946f40ee110b789f365a398c3f27bc4fd6c0f9a8b1a72b79c81543e0775 >-SIZE (KDE/Qt/5.12.0/qtnetworkauth-everywhere-src-5.12.0.tar.xz) = 139012 >-SHA256 (KDE/Qt/5.12.0/qtpurchasing-everywhere-src-5.12.0.tar.xz) = d90bed1ec3e937255246873831f035684723f54fe91124ed7239ec43c46d60da >-SIZE (KDE/Qt/5.12.0/qtpurchasing-everywhere-src-5.12.0.tar.xz) = 207680 >-SHA256 (KDE/Qt/5.12.0/qtquickcontrols2-everywhere-src-5.12.0.tar.xz) = 89777e2ee89a08d203e0e394be0c47dc52008ea58506f4b3bdf1a696c5907dc6 >-SIZE (KDE/Qt/5.12.0/qtquickcontrols2-everywhere-src-5.12.0.tar.xz) = 9279804 >-SHA256 (KDE/Qt/5.12.0/qtquickcontrols-everywhere-src-5.12.0.tar.xz) = 2bfb63240beed6926be429310e91b33df836fe38bcaf9de6883d5e781511cd73 >-SIZE (KDE/Qt/5.12.0/qtquickcontrols-everywhere-src-5.12.0.tar.xz) = 6054956 >-SHA256 (KDE/Qt/5.12.0/qtremoteobjects-everywhere-src-5.12.0.tar.xz) = 0940d0a4a961b64f38c52a2e5638c2b3341fe46bd6bd88d1c638707f42159d5f >-SIZE (KDE/Qt/5.12.0/qtremoteobjects-everywhere-src-5.12.0.tar.xz) = 335472 >-SHA256 (KDE/Qt/5.12.0/qtscript-everywhere-src-5.12.0.tar.xz) = 97fe1a22e5d0e89d3850546c0771fe41707d4c40062dc16fae8e21bf6f8cffa8 >-SIZE (KDE/Qt/5.12.0/qtscript-everywhere-src-5.12.0.tar.xz) = 2674336 >-SHA256 (KDE/Qt/5.12.0/qtscxml-everywhere-src-5.12.0.tar.xz) = dc6ece52669976836844b0d9bcf4910bca7b5d2c446c6755d7b9f79bfa1add6b >-SIZE (KDE/Qt/5.12.0/qtscxml-everywhere-src-5.12.0.tar.xz) = 433896 >-SHA256 (KDE/Qt/5.12.0/qtsensors-everywhere-src-5.12.0.tar.xz) = c53132847a1f70d5a4c5fe689a9943d8afae3f3648bf5b0d824015093addc5a6 >-SIZE (KDE/Qt/5.12.0/qtsensors-everywhere-src-5.12.0.tar.xz) = 2031092 >-SHA256 (KDE/Qt/5.12.0/qtserialbus-everywhere-src-5.12.0.tar.xz) = 6b9286c9762341a48c636da62fecb7b76168a4634e44508b42c19eb0058a359a >-SIZE (KDE/Qt/5.12.0/qtserialbus-everywhere-src-5.12.0.tar.xz) = 324680 >-SHA256 (KDE/Qt/5.12.0/qtserialport-everywhere-src-5.12.0.tar.xz) = 59d4005695089c6b50fc5123094125d9224c1715655128640158a2404075a9bb >-SIZE (KDE/Qt/5.12.0/qtserialport-everywhere-src-5.12.0.tar.xz) = 298892 >-SHA256 (KDE/Qt/5.12.0/qtspeech-everywhere-src-5.12.0.tar.xz) = 1939a2ece528b115e4682dba7fa7138c132c62bb88db7d1f3552c543a1e2a4fb >-SIZE (KDE/Qt/5.12.0/qtspeech-everywhere-src-5.12.0.tar.xz) = 99696 >-SHA256 (KDE/Qt/5.12.0/qtsvg-everywhere-src-5.12.0.tar.xz) = ebe68d8ad73b6b8d8eabac81edcbf395838caf4d498d6b047c74b57341c3fbce >-SIZE (KDE/Qt/5.12.0/qtsvg-everywhere-src-5.12.0.tar.xz) = 1845656 >-SHA256 (KDE/Qt/5.12.0/qttools-everywhere-src-5.12.0.tar.xz) = 574ce34b6e5bcd5dce4020a3947730f3c2223eee65d0396a311099223364dac3 >-SIZE (KDE/Qt/5.12.0/qttools-everywhere-src-5.12.0.tar.xz) = 9775520 >-SHA256 (KDE/Qt/5.12.0/qttranslations-everywhere-src-5.12.0.tar.xz) = 5b4f186e0b96703041319b5b131393b6aa829ea74e067697ede548d936327508 >-SIZE (KDE/Qt/5.12.0/qttranslations-everywhere-src-5.12.0.tar.xz) = 1424236 >-SHA256 (KDE/Qt/5.12.0/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz) = db93b89ba13ec1a688850f456be9f10037033cebf7b4deb151ed9f5322d0d6da >-SIZE (KDE/Qt/5.12.0/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz) = 10913328 >-SHA256 (KDE/Qt/5.12.0/qtwayland-everywhere-src-5.12.0.tar.xz) = 555c2d1b31733735d94c228f5f9183ea8216d61f85e30af08044763639d97ed7 >-SIZE (KDE/Qt/5.12.0/qtwayland-everywhere-src-5.12.0.tar.xz) = 427640 >-SHA256 (KDE/Qt/5.12.0/qtwebchannel-everywhere-src-5.12.0.tar.xz) = 851af30ab951c7543c82640f46686227b244331ebf9235f963edcb7e5a184bf0 >-SIZE (KDE/Qt/5.12.0/qtwebchannel-everywhere-src-5.12.0.tar.xz) = 177328 >-SHA256 (KDE/Qt/5.12.0/qtwebengine-everywhere-src-5.12.0.tar.xz) = bd581e390a30e0f74d41b0e3334b3cf612dd4af23de36a3bf5931d5b4453687c >-SIZE (KDE/Qt/5.12.0/qtwebengine-everywhere-src-5.12.0.tar.xz) = 252044400 >-SHA256 (KDE/Qt/5.12.0/qtwebsockets-everywhere-src-5.12.0.tar.xz) = 444da1c1d32910738a01b8251c1ccc3ffe4df148f125bb4af532b247ad74fc3f >-SIZE (KDE/Qt/5.12.0/qtwebsockets-everywhere-src-5.12.0.tar.xz) = 230980 >-SHA256 (KDE/Qt/5.12.0/qtwebview-everywhere-src-5.12.0.tar.xz) = b7a82cc4edf9361d64155f0ec7848b37c947e0cfe9a9f03efe8af515c6326185 >-SIZE (KDE/Qt/5.12.0/qtwebview-everywhere-src-5.12.0.tar.xz) = 130676 >-SHA256 (KDE/Qt/5.12.0/qtwinextras-everywhere-src-5.12.0.tar.xz) = c64f5acde4d73d4bf45fab377cf3db7f4cf7044fb8854bb24aabbbbc0109dad0 >-SIZE (KDE/Qt/5.12.0/qtwinextras-everywhere-src-5.12.0.tar.xz) = 759912 >-SHA256 (KDE/Qt/5.12.0/qtx11extras-everywhere-src-5.12.0.tar.xz) = 06d4b4e9868d206f07ae4e884c46d46a5540172a85ce67d829fdb1fba7228b84 >-SIZE (KDE/Qt/5.12.0/qtx11extras-everywhere-src-5.12.0.tar.xz) = 109676 >-SHA256 (KDE/Qt/5.12.0/qtxmlpatterns-everywhere-src-5.12.0.tar.xz) = f36279bcafb8052a0b60edd473e1d341b4733a43eb26239848b4382303679375 >-SIZE (KDE/Qt/5.12.0/qtxmlpatterns-everywhere-src-5.12.0.tar.xz) = 1389248 >+TIMESTAMP = 1549515795 >+SHA256 (KDE/Qt/5.12.1/qt3d-everywhere-src-5.12.1.tar.xz) = ce51ed3fe403672db2c874cbaa60f3a139ec817abd1270dc5e4255d35fd64bf1 >+SIZE (KDE/Qt/5.12.1/qt3d-everywhere-src-5.12.1.tar.xz) = 84953112 >+SHA256 (KDE/Qt/5.12.1/qtactiveqt-everywhere-src-5.12.1.tar.xz) = a56fbd9aa018b9b91a1de6018db6538f4bc4309bfbdd86c52d437e7297983c45 >+SIZE (KDE/Qt/5.12.1/qtactiveqt-everywhere-src-5.12.1.tar.xz) = 261984 >+SHA256 (KDE/Qt/5.12.1/qtandroidextras-everywhere-src-5.12.1.tar.xz) = 17d0bfe13e75b1a28de2f35dc81670741fd227664aa155170453dc34c82e071e >+SIZE (KDE/Qt/5.12.1/qtandroidextras-everywhere-src-5.12.1.tar.xz) = 104620 >+SHA256 (KDE/Qt/5.12.1/qtbase-everywhere-src-5.12.1.tar.xz) = 533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049 >+SIZE (KDE/Qt/5.12.1/qtbase-everywhere-src-5.12.1.tar.xz) = 48239912 >+SHA256 (KDE/Qt/5.12.1/qtcanvas3d-everywhere-src-5.12.1.tar.xz) = c7c940a06062b1e5078fd697e1da0cdaeaa315b6fcea81de15308a9d3f8ac254 >+SIZE (KDE/Qt/5.12.1/qtcanvas3d-everywhere-src-5.12.1.tar.xz) = 10915000 >+SHA256 (KDE/Qt/5.12.1/qtcharts-everywhere-src-5.12.1.tar.xz) = 142eb2b87a0bc2220a9f12e56bf390b846968c201d135b1a2a2338545692fdc0 >+SIZE (KDE/Qt/5.12.1/qtcharts-everywhere-src-5.12.1.tar.xz) = 4242664 >+SHA256 (KDE/Qt/5.12.1/qtconnectivity-everywhere-src-5.12.1.tar.xz) = 0edd0bd784a71809540dc23d24a842bd88dee2cdb5394b69c9e704f7e1ac8d6c >+SIZE (KDE/Qt/5.12.1/qtconnectivity-everywhere-src-5.12.1.tar.xz) = 2748888 >+SHA256 (KDE/Qt/5.12.1/qtdatavis3d-everywhere-src-5.12.1.tar.xz) = 8ebb94459e5eb5b978dcdac1d2d6503a7763d790ce74b03f78388beb480436a0 >+SIZE (KDE/Qt/5.12.1/qtdatavis3d-everywhere-src-5.12.1.tar.xz) = 5199768 >+SHA256 (KDE/Qt/5.12.1/qtdeclarative-everywhere-src-5.12.1.tar.xz) = a384a734d94f28a98aa74e076d50fa6b9724af83526feb6c371945545d8cb409 >+SIZE (KDE/Qt/5.12.1/qtdeclarative-everywhere-src-5.12.1.tar.xz) = 20486428 >+SHA256 (KDE/Qt/5.12.1/qtdoc-everywhere-src-5.12.1.tar.xz) = 7d4204e6ef5d9307975337cd18ffdc0b04e2d851c368eb36a48b9331377deadd >+SIZE (KDE/Qt/5.12.1/qtdoc-everywhere-src-5.12.1.tar.xz) = 5588248 >+SHA256 (KDE/Qt/5.12.1/qtgamepad-everywhere-src-5.12.1.tar.xz) = 717c11f8fba4e23c0096fcf3161d43223956038e866fcd7a18d2255755415d62 >+SIZE (KDE/Qt/5.12.1/qtgamepad-everywhere-src-5.12.1.tar.xz) = 385492 >+SHA256 (KDE/Qt/5.12.1/qtgraphicaleffects-everywhere-src-5.12.1.tar.xz) = 2e63abf6b02b86461b73b317eba00b6721601a9469c22da28e3f4ea1d5df68d7 >+SIZE (KDE/Qt/5.12.1/qtgraphicaleffects-everywhere-src-5.12.1.tar.xz) = 14270888 >+SHA256 (KDE/Qt/5.12.1/qtimageformats-everywhere-src-5.12.1.tar.xz) = 0425f35dbcc83cd5840e2d3a73ed4c57c426af9d6ac7b9fe3a40d23560653421 >+SIZE (KDE/Qt/5.12.1/qtimageformats-everywhere-src-5.12.1.tar.xz) = 1782660 >+SHA256 (KDE/Qt/5.12.1/qtlocation-everywhere-src-5.12.1.tar.xz) = 8b922373e6eefd1b0e2a993dbf3d0b3f3df777bc720d40cad3ccb46e1936bc50 >+SIZE (KDE/Qt/5.12.1/qtlocation-everywhere-src-5.12.1.tar.xz) = 5902336 >+SHA256 (KDE/Qt/5.12.1/qtmacextras-everywhere-src-5.12.1.tar.xz) = af6449c052aea19d100deb2b7f558835b8b88862d6bfdae3c510b60c80bc64c3 >+SIZE (KDE/Qt/5.12.1/qtmacextras-everywhere-src-5.12.1.tar.xz) = 68680 >+SHA256 (KDE/Qt/5.12.1/qtmultimedia-everywhere-src-5.12.1.tar.xz) = 9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18 >+SIZE (KDE/Qt/5.12.1/qtmultimedia-everywhere-src-5.12.1.tar.xz) = 3740192 >+SHA256 (KDE/Qt/5.12.1/qtnetworkauth-everywhere-src-5.12.1.tar.xz) = 090fbb6be35b2f2edf7cc4cb32f0f9c27a9a66defa06f6d23e1397836e31d44c >+SIZE (KDE/Qt/5.12.1/qtnetworkauth-everywhere-src-5.12.1.tar.xz) = 139024 >+SHA256 (KDE/Qt/5.12.1/qtpurchasing-everywhere-src-5.12.1.tar.xz) = 80485095ab64f48951b27795c72e7ed7c13e1ab3db2670c061548834584b1d19 >+SIZE (KDE/Qt/5.12.1/qtpurchasing-everywhere-src-5.12.1.tar.xz) = 207812 >+SHA256 (KDE/Qt/5.12.1/qtquickcontrols2-everywhere-src-5.12.1.tar.xz) = caa47b6d771b11c65d595fdd0f0942c3d78cda2884d318e3b1da8ec67155a8e7 >+SIZE (KDE/Qt/5.12.1/qtquickcontrols2-everywhere-src-5.12.1.tar.xz) = 9289452 >+SHA256 (KDE/Qt/5.12.1/qtquickcontrols-everywhere-src-5.12.1.tar.xz) = 15164b00921352b5145a4fc3be0015b8521138a0cb1ecfb9811f39fd35ecd62c >+SIZE (KDE/Qt/5.12.1/qtquickcontrols-everywhere-src-5.12.1.tar.xz) = 6055248 >+SHA256 (KDE/Qt/5.12.1/qtremoteobjects-everywhere-src-5.12.1.tar.xz) = f18cfde8d060d76f5f56ffb701a27f6e0c39b5abdae3dbac933dbb41d191f740 >+SIZE (KDE/Qt/5.12.1/qtremoteobjects-everywhere-src-5.12.1.tar.xz) = 335956 >+SHA256 (KDE/Qt/5.12.1/qtscript-everywhere-src-5.12.1.tar.xz) = e5c158fb85799404d20d1ec5dd33a25d5f5736807e1008ce626f666a52c80624 >+SIZE (KDE/Qt/5.12.1/qtscript-everywhere-src-5.12.1.tar.xz) = 2674208 >+SHA256 (KDE/Qt/5.12.1/qtscxml-everywhere-src-5.12.1.tar.xz) = 59a2aa1000fe03b0a3eff6fddd21f782e305408fcdd7af1f564a382331cb20b7 >+SIZE (KDE/Qt/5.12.1/qtscxml-everywhere-src-5.12.1.tar.xz) = 434112 >+SHA256 (KDE/Qt/5.12.1/qtsensors-everywhere-src-5.12.1.tar.xz) = ebc8b4bcfacf10c3bea3f400da7bf3fc7f44f90fa9eb0320c3b87f17307a63e4 >+SIZE (KDE/Qt/5.12.1/qtsensors-everywhere-src-5.12.1.tar.xz) = 2036116 >+SHA256 (KDE/Qt/5.12.1/qtserialbus-everywhere-src-5.12.1.tar.xz) = 97f0c690c77b0e19a8c90e376ecc94d59b21adb20a90179700d1c514a4c50d74 >+SIZE (KDE/Qt/5.12.1/qtserialbus-everywhere-src-5.12.1.tar.xz) = 328608 >+SHA256 (KDE/Qt/5.12.1/qtserialport-everywhere-src-5.12.1.tar.xz) = 243b2502283c45f5163d68c3f23c787d46eb0e3ba58f3d9a0560dc7968a6ce19 >+SIZE (KDE/Qt/5.12.1/qtserialport-everywhere-src-5.12.1.tar.xz) = 302656 >+SHA256 (KDE/Qt/5.12.1/qtspeech-everywhere-src-5.12.1.tar.xz) = 147524ba6f97c76784beb315ee939614b7a3b4eb1a6417cc0beea662cf0d9121 >+SIZE (KDE/Qt/5.12.1/qtspeech-everywhere-src-5.12.1.tar.xz) = 99716 >+SHA256 (KDE/Qt/5.12.1/qtsvg-everywhere-src-5.12.1.tar.xz) = 5bc1f744d32c06f5aa4eff33759568106a995ce21fa1326a247dfa5f783f63c8 >+SIZE (KDE/Qt/5.12.1/qtsvg-everywhere-src-5.12.1.tar.xz) = 1859248 >+SHA256 (KDE/Qt/5.12.1/qttools-everywhere-src-5.12.1.tar.xz) = ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3 >+SIZE (KDE/Qt/5.12.1/qttools-everywhere-src-5.12.1.tar.xz) = 9818060 >+SHA256 (KDE/Qt/5.12.1/qttranslations-everywhere-src-5.12.1.tar.xz) = 7443d70d8572321e810c52fbdd096666e61510e07e17437f1910f0b800cca6a7 >+SIZE (KDE/Qt/5.12.1/qttranslations-everywhere-src-5.12.1.tar.xz) = 1372812 >+SHA256 (KDE/Qt/5.12.1/qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz) = a9e3ed4786d603314144c7ad29a9fdeb6e5c3f2ea5a27f6545cc9777244cd683 >+SIZE (KDE/Qt/5.12.1/qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz) = 10917704 >+SHA256 (KDE/Qt/5.12.1/qtwayland-everywhere-src-5.12.1.tar.xz) = 88f0507628b3697b0d59349d27b5e60a313a3138927722d6cf981089fff02553 >+SIZE (KDE/Qt/5.12.1/qtwayland-everywhere-src-5.12.1.tar.xz) = 430032 >+SHA256 (KDE/Qt/5.12.1/qtwebchannel-everywhere-src-5.12.1.tar.xz) = 40c3e74347c67a9864d0d54f14120555860e4ce529746407325b3cd6e9aeb5bf >+SIZE (KDE/Qt/5.12.1/qtwebchannel-everywhere-src-5.12.1.tar.xz) = 182060 >+SHA256 (KDE/Qt/5.12.1/qtwebengine-everywhere-src-5.12.1.tar.xz) = 43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0 >+SIZE (KDE/Qt/5.12.1/qtwebengine-everywhere-src-5.12.1.tar.xz) = 249191844 >+SHA256 (KDE/Qt/5.12.1/qtwebsockets-everywhere-src-5.12.1.tar.xz) = 2fd0627916d817599c5f855a97156113ed3625b90b350603be6f668762abfc79 >+SIZE (KDE/Qt/5.12.1/qtwebsockets-everywhere-src-5.12.1.tar.xz) = 235360 >+SHA256 (KDE/Qt/5.12.1/qtwebview-everywhere-src-5.12.1.tar.xz) = 092624ba45913f6c90f7311c96bb5c3e97f2c2b427d834d3669434f97234bc97 >+SIZE (KDE/Qt/5.12.1/qtwebview-everywhere-src-5.12.1.tar.xz) = 130712 >+SHA256 (KDE/Qt/5.12.1/qtwinextras-everywhere-src-5.12.1.tar.xz) = 8d312155a7da329df41cc2ea5d265eb632be7dd9cbd789fa3bc0206b4022f557 >+SIZE (KDE/Qt/5.12.1/qtwinextras-everywhere-src-5.12.1.tar.xz) = 759900 >+SHA256 (KDE/Qt/5.12.1/qtx11extras-everywhere-src-5.12.1.tar.xz) = 08fb1c40e1562d43087368a5efa39569fa1ad52b72d2360f9fc1fe18b00da366 >+SIZE (KDE/Qt/5.12.1/qtx11extras-everywhere-src-5.12.1.tar.xz) = 115964 >+SHA256 (KDE/Qt/5.12.1/qtxmlpatterns-everywhere-src-5.12.1.tar.xz) = 76988ca9a7a184b9013b8a5864dad150e4603890c7eb7aecad4baad071802ecb >+SIZE (KDE/Qt/5.12.1/qtxmlpatterns-everywhere-src-5.12.1.tar.xz) = 1389136 >diff --git devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf >index e1ff44b3de69..095b3d1e63de 100644 >--- devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf >+++ devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf >@@ -4,24 +4,24 @@ > QMAKE_LIBS_OPENGL = -lGL > QMAKE_LIBS_THREAD = > >-+QMAKE_INCDIR_X11 = $$PREFIX/include >-+QMAKE_LIBDIR_X11 = $$PREFIX/lib >-+QMAKE_INCDIR_OPENGL = $$PREFIX/include >-+QMAKE_LIBDIR_OPENGL = $$PREFIX/lib >++QMAKE_INCDIR_X11 = %%LOCALBASE%%/include >++QMAKE_LIBDIR_X11 = %%LOCALBASE%%/lib >++QMAKE_INCDIR_OPENGL = %%LOCALBASE%%/include >++QMAKE_LIBDIR_OPENGL = %%LOCALBASE%%/lib > +QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL > +QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL >-+QMAKE_INCDIR_EGL = $$PREFIX/include >-+QMAKE_LIBDIR_EGL = $$PREFIX/lib >++QMAKE_INCDIR_EGL = %%LOCALBASE%%/include >++QMAKE_LIBDIR_EGL = %%LOCALBASE%%/lib > + > +QMAKE_LIBS_EGL = -lEGL > +QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 > +QMAKE_LIBS_LIBUDEV = -ludev > + > +QMAKE_CFLAGS_WAYLAND = >-+QMAKE_INCDIR_WAYLAND = $$PREFIX/include >++QMAKE_INCDIR_WAYLAND = %%LOCALBASE%%/include > +QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client > +QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server >-+QMAKE_LIBDIR_WAYLAND = $$PREFIX/lib >++QMAKE_LIBDIR_WAYLAND = %%LOCALBASE%%/lib > +QMAKE_DEFINES_WAYLAND = > +QMAKE_WAYLAND_SCANNER = wayland-scanner > + >diff --git graphics/qt5-3d/Makefile graphics/qt5-3d/Makefile >index 68c3c5df150e..641f22665d44 100644 >--- graphics/qt5-3d/Makefile >+++ graphics/qt5-3d/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= 3d > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= graphics > PKGNAMEPREFIX= qt5- > >diff --git graphics/qt5-graphicaleffects/Makefile graphics/qt5-graphicaleffects/Makefile >index 20fb2f83aa13..f16a34db1609 100644 >--- graphics/qt5-graphicaleffects/Makefile >+++ graphics/qt5-graphicaleffects/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= graphicaleffects > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= graphics > PKGNAMEPREFIX= qt5- > >diff --git graphics/qt5-imageformats/Makefile graphics/qt5-imageformats/Makefile >index 104bbd06b640..b37a90f09c0a 100644 >--- graphics/qt5-imageformats/Makefile >+++ graphics/qt5-imageformats/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= imageformats > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= graphics > PKGNAMEPREFIX= qt5- > >diff --git graphics/qt5-opengl/Makefile graphics/qt5-opengl/Makefile >index b910007a6014..be001a76ef30 100644 >--- graphics/qt5-opengl/Makefile >+++ graphics/qt5-opengl/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= opengl > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= graphics > PKGNAMEPREFIX= qt5- > >diff --git graphics/qt5-pixeltool/Makefile graphics/qt5-pixeltool/Makefile >index 29c952425293..a2fccc06154f 100644 >--- graphics/qt5-pixeltool/Makefile >+++ graphics/qt5-pixeltool/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= pixeltool > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= graphics > PKGNAMEPREFIX= qt5- > >diff --git graphics/qt5-pixeltool/files/patch-src__src.pro graphics/qt5-pixeltool/files/patch-src__src.pro >index 937cf66c18e6..f1690e919635 100644 >--- graphics/qt5-pixeltool/files/patch-src__src.pro >+++ graphics/qt5-pixeltool/files/patch-src__src.pro >@@ -1,9 +1,9 @@ > Only enter the directories we want to build, otherwise we might fail due to > missing dependencies. > >---- src/src.pro.orig 2018-10-16 20:14:56 UTC >+--- src/src.pro.orig 2019-02-08 21:09:32 UTC > +++ src/src.pro >-@@ -1,52 +1,3 @@ >+@@ -1,54 +1,3 @@ > TEMPLATE = subdirs > > -qtHaveModule(widgets) { >@@ -29,7 +29,9 @@ missing dependencies. > - !android|android_app: SUBDIRS += qtplugininfo > -} > - >--config_clang: qtConfig(thread): SUBDIRS += qdoc >+-include($$OUT_PWD/qdoc/qtqdoc-config.pri) >+-QT_FOR_CONFIG += qdoc-private >+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc > - > -!android|android_app: SUBDIRS += qtpaths > - >diff --git graphics/qt5-svg/Makefile graphics/qt5-svg/Makefile >index 61e761eadf63..b0a2e193dbeb 100644 >--- graphics/qt5-svg/Makefile >+++ graphics/qt5-svg/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= svg > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= graphics > PKGNAMEPREFIX= qt5- > >diff --git graphics/qt5-wayland/Makefile graphics/qt5-wayland/Makefile >index e44ec5b9b1d5..bfb8c14b14f3 100644 >--- graphics/qt5-wayland/Makefile >+++ graphics/qt5-wayland/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= wayland > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= graphics > PKGNAMEPREFIX= qt5- > >diff --git graphics/qt5-wayland/pkg-plist graphics/qt5-wayland/pkg-plist >index be9ee4b7f0ae..c94b2937bb67 100644 >--- graphics/qt5-wayland/pkg-plist >+++ graphics/qt5-wayland/pkg-plist >@@ -245,6 +245,7 @@ > %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_DmaBufServerBufferIntegrationPlugin.cmake > %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_DrmEglServerBufferIntegrationPlugin.cmake > %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandEglClientBufferIntegrationPlugin.cmake >+%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandEglStreamBufferIntegrationPlugin.cmake > %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeEglClientBufferIntegrationPlugin.cmake > %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeGlxClientBufferIntegrationPlugin.cmake > %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_ShmServerBufferIntegrationPlugin.cmake >@@ -295,6 +296,8 @@ > %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so.debug > %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so > %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so.debug >+%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so >+%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so.debug > %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so > %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so.debug > %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so >diff --git misc/qt5-doc/Makefile misc/qt5-doc/Makefile >index 91be3b2dc369..6e3b6b21a8fa 100644 >--- misc/qt5-doc/Makefile >+++ misc/qt5-doc/Makefile >@@ -6,7 +6,7 @@ DISTVERSION= ${QT5_VERSION} > CATEGORIES= misc > MASTER_SITES= QT/online/qtsdkrepository/linux_x64/desktop/qt5_${QT5_VERSION:S/.//g}_src_doc_examples/qt.qt5.${QT5_VERSION:S/.//g}.doc/ > PKGNAMEPREFIX= qt5- >-DISTNAME= ${QT5_VERSION}-0-201812040400qt-everywhere-documentation >+DISTNAME= ${QT5_VERSION}-0-201901300533qt-everywhere-documentation > DIST_SUBDIR= KDE/Qt/${QT5_VERSION} > > MAINTAINER= kde@FreeBSD.org >@@ -25,8 +25,6 @@ DESCR= ${.CURDIR:H:H}/devel/qt5/pkg-descr > NO_ARCH= yes > NO_BUILD= yes > >-QT5_VERSION= 5.12.0 >- > post-extract: > ${RM} ${WRKSRC}/Makefile > ${RM} -r ${WRKSRC}/global >diff --git misc/qt5-doc/distinfo misc/qt5-doc/distinfo >index 4f72a9460945..51d5734b673f 100644 >--- misc/qt5-doc/distinfo >+++ misc/qt5-doc/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1544129560 >-SHA256 (KDE/Qt/5.12.0/5.12.0-0-201812040400qt-everywhere-documentation.7z) = 5509d4018b01ce0c06cb3b03f421a7d18bc9d18bfd55f5e67600d2119ac1ab03 >-SIZE (KDE/Qt/5.12.0/5.12.0-0-201812040400qt-everywhere-documentation.7z) = 237771529 >+TIMESTAMP = 1549517894 >+SHA256 (KDE/Qt/5.12.1/5.12.1-0-201901300533qt-everywhere-documentation.7z) = 7396a7154e30ba53719f8f147ebbf04c89111e66876a9f2f7c798924563b35a9 >+SIZE (KDE/Qt/5.12.1/5.12.1-0-201901300533qt-everywhere-documentation.7z) = 253481395 >diff --git misc/qt5-doc/pkg-plist misc/qt5-doc/pkg-plist >index 0ed965f7a26f..d7283b0b097e 100644 >--- misc/qt5-doc/pkg-plist >+++ misc/qt5-doc/pkg-plist >@@ -101,6 +101,158 @@ > %%QT_DOCDIR%%/activeqt/qaxwidget.html > %%QT_DOCDIR%%/activeqt/style/offline-simple.css > %%QT_DOCDIR%%/activeqt/style/offline.css >+%%QT_DOCDIR%%/gammaray-manual.qch >+%%QT_DOCDIR%%/gammaray-manual/examples-gammaray.html >+%%QT_DOCDIR%%/gammaray-manual/examples-manifest.xml >+%%QT_DOCDIR%%/gammaray-manual/gammaray-action-inspector.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-advanced-usage.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-application-attributes.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-basic-operations.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-classinfo.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-client.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-codec-browser.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-command-line.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-connections.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-enums.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-font-browser.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-geo-positioning.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-getting-started.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-graphicsscene-inspector.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-http-cookies.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-install.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-launcher-gui.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-licenses-and-attributions.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-locales.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-manual-attribution-backward-cpp.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-manual-attribution-kitemmodels.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-manual-attribution-kuserfeedback.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-manual-attribution-lz4.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-manual-attribution-qt.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-manual-attribution-stackwalker.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-manual.qhp >+%%QT_DOCDIR%%/gammaray-manual/gammaray-manual.qhp.sha1 >+%%QT_DOCDIR%%/gammaray-manual/gammaray-messages.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-metaobject-browser.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-metatype-browser.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-methods.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-mime-types.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-model-inspector.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-network.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-object-inspection.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-paint-analyzer.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-properties.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qmlbindings.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qmlcontext.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qmltype.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qobject-browser.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qresource-browser.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qsggeometry.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qsgmaterial.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qsgtexture.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-geometry-example.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-geometry-mycylinder-cpp.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-geometry-mycylinder-h.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-geometry-qt3d-geometry-cpp.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-geometry-qt3d-geometry-pro.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-inspector.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3dgeometry-inspector.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qtcreator.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-qtquick2-inspector.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-batching-example.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-batching-quick-batching-pro.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-batching-quick-batching-qml.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-batching-slider-qml.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-event-handling-example.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-event-handling-quick-event-handling-pro.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-event-handling-quick-event-handling-qml.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-signal-plotter.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-signal-slot-example.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-signal-slot-signal-slot-cpp.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-signal-slot-signal-slot-pro.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-stack-trace.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-standard-paths.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-state-machine-debugger.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-state-machine-example.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-state-machine-state-machine-pro.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-state-machine-state-machine-qml.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-styles.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-text-documents.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-timer-example.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-timer-timer-cpp.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-timer-timer-pro.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-timertop.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-tools.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-translator-inspector.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-wayland-compositors.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-web-inspector.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-widget-attributes.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-widget-inspector.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-widget-layouting-example.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-widget-layouting-widget-layouting-cpp.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray-widget-layouting-widget-layouting-pro.html >+%%QT_DOCDIR%%/gammaray-manual/gammaray.index >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-action-inspector.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-application-attributes.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-bindings.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-classinfo.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-codec-browser.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-connections.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-enums.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-font-browser.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-geo-positioning.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-graphicsitem-paint-analyzer.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-graphicsscene-inspector.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-http-cookies.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-launcher-attach.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-launcher-connect.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-launcher-launch.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-launcher-selftest.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-locales.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-logging-categories.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-metaobject-browser.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-metatype-browser.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-method-invocation.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-methods.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-mime-types.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-model-inspector.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-network-interfaces.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-object-inspector.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-paint-analyzer.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-properties.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qmlcontext.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qmltype.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qq2-geometry.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qq2-inspector.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qq2-qsg-visualize.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qqpainteditem-paint-analyzer.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qrc-browser.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qsggeometry.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qsgmaterial.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qsgtexture.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qsm-debugger.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-buffers.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-geometry-backface-culling.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-geometry-buffers.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-geometry-diagnostic-shading.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-geometry-normals.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-geometry-wireframe.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-geometry.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qtcreator-attach.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qtcreator-connect.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qtcreator.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-signal-plotter.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-stack-trace.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-standard-paths.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-style-controls.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-text-documents.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-timertop.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-timezones.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-translations.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-wayland-compositor.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-web-inspector.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-widget-attributes.png >+%%QT_DOCDIR%%/gammaray-manual/images/gammaray-widget-inspector.png >+%%QT_DOCDIR%%/gammaray-manual/index.html > %%QT_DOCDIR%%/qdoc.qch > %%QT_DOCDIR%%/qdoc/01-qdoc-manual.html > %%QT_DOCDIR%%/qdoc/03-qdoc-commands-markup.html >@@ -135,7 +287,6 @@ > %%QT_DOCDIR%%/qdoc/27-qdoc-commands-alphabetical.html > %%QT_DOCDIR%%/qdoc/28-qdoc-qa-pages.html > %%QT_DOCDIR%%/qdoc/corefeatures.html >-%%QT_DOCDIR%%/qdoc/examples-manifest.xml > %%QT_DOCDIR%%/qdoc/images/arrow_bc.png > %%QT_DOCDIR%%/qdoc/images/bgrContent.png > %%QT_DOCDIR%%/qdoc/images/btn_next.png >@@ -155,12 +306,6 @@ > %%QT_DOCDIR%%/qdoc/images/training.jpg > %%QT_DOCDIR%%/qdoc/images/windowsvista-pushbutton.png > %%QT_DOCDIR%%/qdoc/qdoc-categories.html >-%%QT_DOCDIR%%/qdoc/qdoc-componentset-componentset-pro.html >-%%QT_DOCDIR%%/qdoc/qdoc-componentset-example.html >-%%QT_DOCDIR%%/qdoc/qdoc-componentset-progressbar-qml.html >-%%QT_DOCDIR%%/qdoc/qdoc-componentset-switch-qml.html >-%%QT_DOCDIR%%/qdoc/qdoc-componentset-tabwidget-qml.html >-%%QT_DOCDIR%%/qdoc/qdoc-componentset-uicomponents-qdoc-sample.html > %%QT_DOCDIR%%/qdoc/qdoc-guide-clang.html > %%QT_DOCDIR%%/qdoc/qdoc-guide-conf.html > %%QT_DOCDIR%%/qdoc/qdoc-guide-writing.html >@@ -171,18 +316,11 @@ > %%QT_DOCDIR%%/qdoc/qdoc.qhp > %%QT_DOCDIR%%/qdoc/qdoc.qhp.sha1 > %%QT_DOCDIR%%/qdoc/qdoc.tags >-%%QT_DOCDIR%%/qdoc/qml-uicomponents-progressbar-members.html >-%%QT_DOCDIR%%/qdoc/qml-uicomponents-progressbar.html >-%%QT_DOCDIR%%/qdoc/qml-uicomponents-switch-members.html >-%%QT_DOCDIR%%/qdoc/qml-uicomponents-switch.html >-%%QT_DOCDIR%%/qdoc/qml-uicomponents-tabwidget-members.html >-%%QT_DOCDIR%%/qdoc/qml-uicomponents-tabwidget.html > %%QT_DOCDIR%%/qdoc/qtgui-qdocconf.html > %%QT_DOCDIR%%/qdoc/qtwritingstyle-cpp.html > %%QT_DOCDIR%%/qdoc/qtwritingstyle-qml.html > %%QT_DOCDIR%%/qdoc/style/offline-simple.css > %%QT_DOCDIR%%/qdoc/style/offline.css >-%%QT_DOCDIR%%/qdoc/uicomponents-qmlmodule.html > %%QT_DOCDIR%%/qmake.qch > %%QT_DOCDIR%%/qmake/images/arrow_bc.png > %%QT_DOCDIR%%/qmake/images/bgrContent.png >@@ -410,6 +548,8 @@ > %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-spheregeometry.html > %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-spheremesh-members.html > %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-spheremesh.html >+%%QT_DOCDIR%%/qt3d/qml-qt3d-extras-text2dentity-members.html >+%%QT_DOCDIR%%/qt3d/qml-qt3d-extras-text2dentity.html > %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-torusgeometry-members.html > %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-torusgeometry.html > %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-torusmesh-members.html >@@ -1090,6 +1230,7 @@ > %%QT_DOCDIR%%/qt3d/qt3dextras-qt3dwindow-members.html > %%QT_DOCDIR%%/qt3d/qt3dextras-qt3dwindow.html > %%QT_DOCDIR%%/qt3d/qt3dextras-qtext2dentity-members.html >+%%QT_DOCDIR%%/qt3d/qt3dextras-qtext2dentity-obsolete.html > %%QT_DOCDIR%%/qt3d/qt3dextras-qtext2dentity.html > %%QT_DOCDIR%%/qt3d/qt3dextras-qtexturedmetalroughmaterial-members.html > %%QT_DOCDIR%%/qt3d/qt3dextras-qtexturedmetalroughmaterial-obsolete.html >@@ -1182,6 +1323,7 @@ > %%QT_DOCDIR%%/qt3d/qt3dinput-qwheelevent-obsolete.html > %%QT_DOCDIR%%/qt3d/qt3dinput-qwheelevent.html > %%QT_DOCDIR%%/qt3d/qt3dinput.html >+%%QT_DOCDIR%%/qt3d/qt3dlogic-logic.html > %%QT_DOCDIR%%/qt3d/qt3dlogic-module.html > %%QT_DOCDIR%%/qt3d/qt3dlogic-qframeaction-members.html > %%QT_DOCDIR%%/qt3d/qt3dlogic-qframeaction-obsolete.html >@@ -1196,10 +1338,6 @@ > %%QT_DOCDIR%%/qt3d/qt3drender-functortype-members.html > %%QT_DOCDIR%%/qt3d/qt3drender-functortype.html > %%QT_DOCDIR%%/qt3d/qt3drender-geometry.html >-%%QT_DOCDIR%%/qt3d/qt3drender-gltfgeometryloader-gltf1-members.html >-%%QT_DOCDIR%%/qt3d/qt3drender-gltfgeometryloader-gltf1.html >-%%QT_DOCDIR%%/qt3d/qt3drender-gltfgeometryloader-gltf2-members.html >-%%QT_DOCDIR%%/qt3d/qt3drender-gltfgeometryloader-gltf2.html > %%QT_DOCDIR%%/qt3d/qt3drender-gltfgeometryloader-members.html > %%QT_DOCDIR%%/qt3d/qt3drender-gltfgeometryloader.html > %%QT_DOCDIR%%/qt3d/qt3drender-module.html >@@ -1540,6 +1678,7 @@ > %%QT_DOCDIR%%/qt3d/qt3drender-qviewport-members.html > %%QT_DOCDIR%%/qt3d/qt3drender-qviewport-obsolete.html > %%QT_DOCDIR%%/qt3d/qt3drender-qviewport.html >+%%QT_DOCDIR%%/qt3d/qt3drender-render.html > %%QT_DOCDIR%%/qt3d/qt3drender-stlgeometryloader-members.html > %%QT_DOCDIR%%/qt3d/qt3drender-stlgeometryloader.html > %%QT_DOCDIR%%/qt3d/qt3drender.html >@@ -1581,6 +1720,7 @@ > %%QT_DOCDIR%%/qtandroidextras/qandroidparcel-members.html > %%QT_DOCDIR%%/qtandroidextras/qandroidparcel.html > %%QT_DOCDIR%%/qtandroidextras/qandroidservice-members.html >+%%QT_DOCDIR%%/qtandroidextras/qandroidservice-obsolete.html > %%QT_DOCDIR%%/qtandroidextras/qandroidservice.html > %%QT_DOCDIR%%/qtandroidextras/qandroidserviceconnection-members.html > %%QT_DOCDIR%%/qtandroidextras/qandroidserviceconnection.html >@@ -2629,8 +2769,6 @@ > %%QT_DOCDIR%%/qtcore/qlocale.html > %%QT_DOCDIR%%/qtcore/qlockfile-members.html > %%QT_DOCDIR%%/qtcore/qlockfile.html >-%%QT_DOCDIR%%/qtcore/qloggingcategory-atomicbools-members.html >-%%QT_DOCDIR%%/qtcore/qloggingcategory-atomicbools.html > %%QT_DOCDIR%%/qtcore/qloggingcategory-members.html > %%QT_DOCDIR%%/qtcore/qloggingcategory.html > %%QT_DOCDIR%%/qtcore/qmap-const-iterator-members.html >@@ -3934,7 +4072,6 @@ > %%QT_DOCDIR%%/qtdoc/images/project-view-2.png > %%QT_DOCDIR%%/qtdoc/images/project-view.png > %%QT_DOCDIR%%/qtdoc/images/project-wizard.png >-%%QT_DOCDIR%%/qtdoc/images/qml-extending-types.png > %%QT_DOCDIR%%/qtdoc/images/qml-uses-animation.png > %%QT_DOCDIR%%/qtdoc/images/qml-uses-integratingjs.png > %%QT_DOCDIR%%/qtdoc/images/qml-uses-layouts-anchors.png >@@ -5582,7 +5719,6 @@ > %%QT_DOCDIR%%/qtgui/qtgui-attribution-webgradients.html > %%QT_DOCDIR%%/qtgui/qtgui-attribution-wintab.html > %%QT_DOCDIR%%/qtgui/qtgui-attribution-xcb.html >-%%QT_DOCDIR%%/qtgui/qtgui-attribution-xkbcommon.html > %%QT_DOCDIR%%/qtgui/qtgui-hellovulkancubes-camera-cpp.html > %%QT_DOCDIR%%/qtgui/qtgui-hellovulkancubes-camera-h.html > %%QT_DOCDIR%%/qtgui/qtgui-hellovulkancubes-example.html >@@ -8376,6 +8512,7 @@ > %%QT_DOCDIR%%/qtquick/images/modelview-overview.png > %%QT_DOCDIR%%/qtquick/images/openglunderqml-example.jpg > %%QT_DOCDIR%%/qtquick/images/parentchange.png >+%%QT_DOCDIR%%/qtquick/images/pathitem-code-example.png > %%QT_DOCDIR%%/qtquick/images/pathview.gif > %%QT_DOCDIR%%/qtquick/images/pointerHandlerMargin.png > %%QT_DOCDIR%%/qtquick/images/positioner-example.png >@@ -8501,6 +8638,7 @@ > %%QT_DOCDIR%%/qtquick/images/screen-and-window-dimensions.jpg > %%QT_DOCDIR%%/qtquick/images/sg-renderloop-singlethreaded.jpg > %%QT_DOCDIR%%/qtquick/images/sg-renderloop-threaded.jpg >+%%QT_DOCDIR%%/qtquick/images/shape-radial-gradient.png > %%QT_DOCDIR%%/qtquick/images/simplematerial-example.jpg > %%QT_DOCDIR%%/qtquick/images/spritecutting.png > %%QT_DOCDIR%%/qtquick/images/spriteenginegraph.png >@@ -8608,6 +8746,7 @@ > %%QT_DOCDIR%%/qtquick/images/visualize-original.png > %%QT_DOCDIR%%/qtquick/images/visualize-overdraw-1.png > %%QT_DOCDIR%%/qtquick/images/visualize-overdraw-2.png >+%%QT_DOCDIR%%/qtquick/images/visualpath-code-example.png > %%QT_DOCDIR%%/qtquick/qml-advtutorial.html > %%QT_DOCDIR%%/qtquick/qml-color.html > %%QT_DOCDIR%%/qtquick/qml-dynamicview-tutorial.html >@@ -8893,6 +9032,18 @@ > %%QT_DOCDIR%%/qtquick/qml-qtquick-shadereffect.html > %%QT_DOCDIR%%/qtquick/qml-qtquick-shadereffectsource-members.html > %%QT_DOCDIR%%/qtquick/qml-qtquick-shadereffectsource.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-conicalgradient-members.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-conicalgradient.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-lineargradient-members.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-lineargradient.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-radialgradient-members.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-radialgradient.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-shape-members.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-shape.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-shapegradient-members.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-shapegradient.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-shapepath-members.html >+%%QT_DOCDIR%%/qtquick/qml-qtquick-shapes-shapepath.html > %%QT_DOCDIR%%/qtquick/qml-qtquick-shortcut-members.html > %%QT_DOCDIR%%/qtquick/qml-qtquick-shortcut.html > %%QT_DOCDIR%%/qtquick/qml-qtquick-singlepointhandler-members.html >@@ -9473,6 +9624,7 @@ > %%QT_DOCDIR%%/qtquick/qtquick-shapes-content-tiger-qml.html > %%QT_DOCDIR%%/qtquick/qtquick-shapes-example.html > %%QT_DOCDIR%%/qtquick/qtquick-shapes-main-cpp.html >+%%QT_DOCDIR%%/qtquick/qtquick-shapes-qmlmodule.html > %%QT_DOCDIR%%/qtquick/qtquick-shapes-shapes-pro.html > %%QT_DOCDIR%%/qtquick/qtquick-shapes-shapes-qrc.html > %%QT_DOCDIR%%/qtquick/qtquick-statesanimations-animations.html >@@ -12586,6 +12738,7 @@ > %%QT_DOCDIR%%/qttestlib/qsignalspy-members.html > %%QT_DOCDIR%%/qttestlib/qsignalspy-obsolete.html > %%QT_DOCDIR%%/qttestlib/qsignalspy.html >+%%QT_DOCDIR%%/qttestlib/qtest-obsolete.html > %%QT_DOCDIR%%/qttestlib/qtest-overview.html > %%QT_DOCDIR%%/qttestlib/qtest-qtoucheventsequence-members.html > %%QT_DOCDIR%%/qttestlib/qtest-qtoucheventsequence.html >@@ -12730,6 +12883,7 @@ > %%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-xdgtoplevelv6-members.html > %%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-xdgtoplevelv6.html > %%QT_DOCDIR%%/qtwaylandcompositor/qtwayland-compositor-qmlmodule.html >+%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-attribution-wayland-eglstream-controller.html > %%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-attribution-wayland-ivi-extension-protocol.html > %%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-attribution-wayland-protocol.html > %%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-attribution-wayland-txt-input-unstable.html >@@ -13727,6 +13881,7 @@ > %%QT_DOCDIR%%/qtwidgets/images/used-in-examples/richtext/textedit/images/win/textunder.png > %%QT_DOCDIR%%/qtwidgets/images/used-in-examples/richtext/textedit/images/win/zoomin.png > %%QT_DOCDIR%%/qtwidgets/images/used-in-examples/richtext/textedit/images/win/zoomout.png >+%%QT_DOCDIR%%/qtwidgets/images/used-in-examples/tools/codecs/images/editcopy.png > %%QT_DOCDIR%%/qtwidgets/images/used-in-examples/tools/regularexpression/images/copy.png > %%QT_DOCDIR%%/qtwidgets/images/used-in-examples/tools/undo/icons/background.png > %%QT_DOCDIR%%/qtwidgets/images/used-in-examples/tools/undo/icons/blue.png >@@ -15040,6 +15195,9 @@ > %%QT_DOCDIR%%/qtwidgets/qtwidgets-statemachine-twowaybutton-main-cpp.html > %%QT_DOCDIR%%/qtwidgets/qtwidgets-statemachine-twowaybutton-twowaybutton-pro.html > %%QT_DOCDIR%%/qtwidgets/qtwidgets-tools-codecs-codecs-pro.html >+%%QT_DOCDIR%%/qtwidgets/qtwidgets-tools-codecs-codecs-qrc.html >+%%QT_DOCDIR%%/qtwidgets/qtwidgets-tools-codecs-encodingdialog-cpp.html >+%%QT_DOCDIR%%/qtwidgets/qtwidgets-tools-codecs-encodingdialog-h.html > %%QT_DOCDIR%%/qtwidgets/qtwidgets-tools-codecs-example.html > %%QT_DOCDIR%%/qtwidgets/qtwidgets-tools-codecs-main-cpp.html > %%QT_DOCDIR%%/qtwidgets/qtwidgets-tools-codecs-mainwindow-cpp.html >@@ -15739,10 +15897,15 @@ > %%QT_DOCDIR%%/qtxmlpatterns/qabstracturiresolver.html > %%QT_DOCDIR%%/qtxmlpatterns/qabstractxmlnodemodel-members.html > %%QT_DOCDIR%%/qtxmlpatterns/qabstractxmlnodemodel.html >+%%QT_DOCDIR%%/qtxmlpatterns/qml-qtquick-xmllistmodel-xmllistmodel-members.html >+%%QT_DOCDIR%%/qtxmlpatterns/qml-qtquick-xmllistmodel-xmllistmodel.html >+%%QT_DOCDIR%%/qtxmlpatterns/qml-qtquick-xmllistmodel-xmlrole-members.html >+%%QT_DOCDIR%%/qtxmlpatterns/qml-qtquick-xmllistmodel-xmlrole.html > %%QT_DOCDIR%%/qtxmlpatterns/qsimplexmlnodemodel-members.html > %%QT_DOCDIR%%/qtxmlpatterns/qsimplexmlnodemodel.html > %%QT_DOCDIR%%/qtxmlpatterns/qsourcelocation-members.html > %%QT_DOCDIR%%/qtxmlpatterns/qsourcelocation.html >+%%QT_DOCDIR%%/qtxmlpatterns/qtquick-xmllistmodel-qmlmodule.html > %%QT_DOCDIR%%/qtxmlpatterns/qtxmlpatterns-attribution-xml-xsd.html > %%QT_DOCDIR%%/qtxmlpatterns/qtxmlpatterns-filetree-example.html > %%QT_DOCDIR%%/qtxmlpatterns/qtxmlpatterns-filetree-filetree-cpp.html >diff --git misc/qt5-examples/distinfo misc/qt5-examples/distinfo >index 27f6f0471735..ebb6d51eb0f8 100644 >--- misc/qt5-examples/distinfo >+++ misc/qt5-examples/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1544129633 >-SHA256 (KDE/Qt/5.12.0/qt-everywhere-src-5.12.0.tar.xz) = 356f42d9087718f22f03d13d0c2cdfb308f91dc3cf0c6318bed33f2094cd9d6c >-SIZE (KDE/Qt/5.12.0/qt-everywhere-src-5.12.0.tar.xz) = 510292820 >+TIMESTAMP = 1549517708 >+SHA256 (KDE/Qt/5.12.1/qt-everywhere-src-5.12.1.tar.xz) = caffbd625c7bc10ff8c5c7a27dbc7d84fa4de146975c0e1ffe904b514ccd6da4 >+SIZE (KDE/Qt/5.12.1/qt-everywhere-src-5.12.1.tar.xz) = 507568064 >diff --git misc/qt5-examples/pkg-plist misc/qt5-examples/pkg-plist >index a65bdd04c7c9..0dbc109c0479 100644 >--- misc/qt5-examples/pkg-plist >+++ misc/qt5-examples/pkg-plist >@@ -6379,6 +6379,7 @@ > %%QT_EXAMPLEDIR%%/widgets/statemachine/twowaybutton/main.cpp > %%QT_EXAMPLEDIR%%/widgets/statemachine/twowaybutton/twowaybutton.pro > %%QT_EXAMPLEDIR%%/widgets/tools/codecs/codecs.pro >+%%QT_EXAMPLEDIR%%/widgets/tools/codecs/codecs.qrc > %%QT_EXAMPLEDIR%%/widgets/tools/codecs/doc/images/codecs-example.png > %%QT_EXAMPLEDIR%%/widgets/tools/codecs/doc/src/codecs.qdoc > %%QT_EXAMPLEDIR%%/widgets/tools/codecs/encodedfiles/iso-8859-1.txt >@@ -6387,6 +6388,9 @@ > %%QT_EXAMPLEDIR%%/widgets/tools/codecs/encodedfiles/utf-16be.txt > %%QT_EXAMPLEDIR%%/widgets/tools/codecs/encodedfiles/utf-16le.txt > %%QT_EXAMPLEDIR%%/widgets/tools/codecs/encodedfiles/utf-8.txt >+%%QT_EXAMPLEDIR%%/widgets/tools/codecs/encodingdialog.cpp >+%%QT_EXAMPLEDIR%%/widgets/tools/codecs/encodingdialog.h >+%%QT_EXAMPLEDIR%%/widgets/tools/codecs/images/editcopy.png > %%QT_EXAMPLEDIR%%/widgets/tools/codecs/main.cpp > %%QT_EXAMPLEDIR%%/widgets/tools/codecs/mainwindow.cpp > %%QT_EXAMPLEDIR%%/widgets/tools/codecs/mainwindow.h >diff --git misc/qt5-l10n/Makefile misc/qt5-l10n/Makefile >index 9a14fe32bb43..161347669831 100644 >--- misc/qt5-l10n/Makefile >+++ misc/qt5-l10n/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= l10n > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= misc > PKGNAMEPREFIX= qt5- > >diff --git misc/qt5-l10n/pkg-plist misc/qt5-l10n/pkg-plist >index 29bcfd9bc056..7cdf4d663477 100644 >--- misc/qt5-l10n/pkg-plist >+++ misc/qt5-l10n/pkg-plist >@@ -53,22 +53,6 @@ > %%QT_L10NDIR%%/linguist_uk.qm > %%QT_L10NDIR%%/linguist_zh_CN.qm > %%QT_L10NDIR%%/linguist_zh_TW.qm >-%%QT_L10NDIR%%/qmlviewer_ar.qm >-%%QT_L10NDIR%%/qmlviewer_bg.qm >-%%QT_L10NDIR%%/qmlviewer_cs.qm >-%%QT_L10NDIR%%/qmlviewer_da.qm >-%%QT_L10NDIR%%/qmlviewer_en.qm >-%%QT_L10NDIR%%/qmlviewer_es.qm >-%%QT_L10NDIR%%/qmlviewer_fi.qm >-%%QT_L10NDIR%%/qmlviewer_fr.qm >-%%QT_L10NDIR%%/qmlviewer_he.qm >-%%QT_L10NDIR%%/qmlviewer_hu.qm >-%%QT_L10NDIR%%/qmlviewer_ja.qm >-%%QT_L10NDIR%%/qmlviewer_ko.qm >-%%QT_L10NDIR%%/qmlviewer_pl.qm >-%%QT_L10NDIR%%/qmlviewer_ru.qm >-%%QT_L10NDIR%%/qmlviewer_sk.qm >-%%QT_L10NDIR%%/qmlviewer_uk.qm > %%QT_L10NDIR%%/qt_ar.qm > %%QT_L10NDIR%%/qt_bg.qm > %%QT_L10NDIR%%/qt_ca.qm >@@ -169,6 +153,7 @@ > %%QT_L10NDIR%%/qtlocation_de.qm > %%QT_L10NDIR%%/qtlocation_en.qm > %%QT_L10NDIR%%/qtlocation_es.qm >+%%QT_L10NDIR%%/qtlocation_fi.qm > %%QT_L10NDIR%%/qtlocation_fr.qm > %%QT_L10NDIR%%/qtlocation_hu.qm > %%QT_L10NDIR%%/qtlocation_ko.qm >@@ -193,24 +178,6 @@ > %%QT_L10NDIR%%/qtmultimedia_ru.qm > %%QT_L10NDIR%%/qtmultimedia_sk.qm > %%QT_L10NDIR%%/qtmultimedia_uk.qm >-%%QT_L10NDIR%%/qtquick1_bg.qm >-%%QT_L10NDIR%%/qtquick1_ca.qm >-%%QT_L10NDIR%%/qtquick1_cs.qm >-%%QT_L10NDIR%%/qtquick1_da.qm >-%%QT_L10NDIR%%/qtquick1_de.qm >-%%QT_L10NDIR%%/qtquick1_en.qm >-%%QT_L10NDIR%%/qtquick1_es.qm >-%%QT_L10NDIR%%/qtquick1_fi.qm >-%%QT_L10NDIR%%/qtquick1_fr.qm >-%%QT_L10NDIR%%/qtquick1_he.qm >-%%QT_L10NDIR%%/qtquick1_hu.qm >-%%QT_L10NDIR%%/qtquick1_it.qm >-%%QT_L10NDIR%%/qtquick1_ja.qm >-%%QT_L10NDIR%%/qtquick1_ko.qm >-%%QT_L10NDIR%%/qtquick1_pl.qm >-%%QT_L10NDIR%%/qtquick1_ru.qm >-%%QT_L10NDIR%%/qtquick1_sk.qm >-%%QT_L10NDIR%%/qtquick1_uk.qm > %%QT_L10NDIR%%/qtquickcontrols2_ar.qm > %%QT_L10NDIR%%/qtquickcontrols2_bg.qm > %%QT_L10NDIR%%/qtquickcontrols2_da.qm >diff --git multimedia/qt5-multimedia/Makefile multimedia/qt5-multimedia/Makefile >index 1510953f8f92..d583d4761293 100644 >--- multimedia/qt5-multimedia/Makefile >+++ multimedia/qt5-multimedia/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= multimedia > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= multimedia > PKGNAMEPREFIX= qt5- > >diff --git net/qt5-network/Makefile net/qt5-network/Makefile >index 35e2145fcd80..3918871f81c0 100644 >--- net/qt5-network/Makefile >+++ net/qt5-network/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= network > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 5 > CATEGORIES= net ipv6 > PKGNAMEPREFIX= qt5- > >diff --git net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp >index 50747b2c88f0..732fc793d947 100644 >--- net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp >+++ net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp >@@ -9,9 +9,9 @@ Clean up interface type and MTU detection. > place them on top of each other, that would be ok). > - IFM_FDDI (still) exists in 11.2, not in 12.0 > >---- src/network/kernel/qnetworkinterface_unix.cpp.orig 2018-12-03 11:15:26 UTC >-+++ src/network/kernel/qnetworkinterface_unix.cpp >-@@ -419,12 +419,23 @@ QT_BEGIN_INCLUDE_NAMESPACE >+--- src/network/kernel/qnetworkinterface_unix.cpp.orig 2019-02-09 11:35:25.320227000 +0100 >++++ src/network/kernel/qnetworkinterface_unix.cpp 2019-02-09 11:43:51.515736000 +0100 >+@@ -420,13 +420,25 @@ > #endif // QT_PLATFORM_UIKIT > QT_END_INCLUDE_NAMESPACE > >@@ -22,6 +22,7 @@ Clean up interface type and MTU detection. > - socket = qt_safe_socket(AF_INET, SOCK_DGRAM, 0); > - return socket; > -} >+ > + int socket{-1}; > + > + int open() >@@ -36,21 +37,12 @@ Clean up interface type and MTU detection. > + if (socket != -1) > + qt_safe_close(socket); > + } >-+} ; >- >++}; >++ > static QNetworkInterface::InterfaceType probeIfType(int socket, int iftype, struct ifmediareq *req) > { >-@@ -463,9 +474,6 @@ static QNetworkInterface::InterfaceType >- case IFM_ETHER: >- return QNetworkInterface::Ethernet; >- >-- case IFM_FDDI: >-- return QNetworkInterface::Fddi; >-- >- case IFM_IEEE80211: >- return QNetworkInterface::Ieee80211; >- } >-@@ -477,15 +485,8 @@ static QNetworkInterface::InterfaceType >+ // Determine the interface type. >+@@ -480,16 +492,9 @@ > static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList) > { > QList<QNetworkInterfacePrivate *> interfaces; >@@ -59,20 +51,21 @@ Clean up interface type and MTU detection. > - struct ifreq req; > - }; > - int socket = -1; >-- >-- // ensure both structs start with the name field, of size IFNAMESIZ >-- Q_STATIC_ASSERT(sizeof(mediareq.ifm_name) == sizeof(req.ifr_name)); >-- Q_ASSERT(&mediareq.ifm_name == &req.ifr_name); > + SockPuppet<AF_INET> socket; > + SockPuppet<AF_LOCAL> localSocket; > >+- // ensure both structs start with the name field, of size IFNAMESIZ >+- Q_STATIC_ASSERT(sizeof(mediareq.ifm_name) == sizeof(req.ifr_name)); >+- Q_ASSERT(&mediareq.ifm_name == &req.ifr_name); >+- > // on NetBSD we use AF_LINK and sockaddr_dl > // scan the list for that family >-@@ -500,13 +501,21 @@ static QList<QNetworkInterfacePrivate *> >+ for (ifaddrs *ptr = rawList; ptr; ptr = ptr->ifa_next) >+@@ -503,13 +508,22 @@ > iface->flags = convertFlags(ptr->ifa_flags); > iface->hardwareAddress = iface->makeHwAddress(sdl->sdl_alen, (uchar*)LLADDR(sdl)); > >-- strlcpy(mediareq.ifm_name, ptr->ifa_name, sizeof(mediareq.ifm_name)); >+- qstrncpy(mediareq.ifm_name, ptr->ifa_name, sizeof(mediareq.ifm_name)); > - iface->type = probeIfType(openSocket(socket), sdl->sdl_type, &mediareq); > - iface->mtu = getMtu(socket, &req); > + { >@@ -88,6 +81,7 @@ Clean up interface type and MTU detection. > + req.ifr_addr.sa_family = AF_LOCAL; > + iface->mtu = getMtu(localSocket.open(), &req); > + } >++ > } > > - if (socket != -1) >@@ -95,7 +89,7 @@ Clean up interface type and MTU detection. > return interfaces; > } > >-@@ -605,7 +614,7 @@ static QList<QNetworkInterfacePrivate *> >+@@ -608,7 +622,7 @@ > { > QList<QNetworkInterfacePrivate *> interfaces; > >diff --git net/qt5-networkauth/Makefile net/qt5-networkauth/Makefile >index c16bc9a61f2d..848d0cdf40f2 100644 >--- net/qt5-networkauth/Makefile >+++ net/qt5-networkauth/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= networkauth > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= net ipv6 > PKGNAMEPREFIX= qt5- > >diff --git print/qt5-printsupport/Makefile print/qt5-printsupport/Makefile >index 04537b1cfaf7..6cd3c690753c 100644 >--- print/qt5-printsupport/Makefile >+++ print/qt5-printsupport/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= printsupport > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= print > PKGNAMEPREFIX= qt5- > >diff --git sysutils/qt5-qtdiag/Makefile sysutils/qt5-qtdiag/Makefile >index 7aad8d76c73a..34e18b168457 100644 >--- sysutils/qt5-qtdiag/Makefile >+++ sysutils/qt5-qtdiag/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= qtdiag > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= sysutils > PKGNAMEPREFIX= qt5- > >diff --git sysutils/qt5-qtpaths/Makefile sysutils/qt5-qtpaths/Makefile >index a759a015eb2e..00c2a7e2bd5b 100644 >--- sysutils/qt5-qtpaths/Makefile >+++ sysutils/qt5-qtpaths/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= qtpaths > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= sysutils > PKGNAMEPREFIX= qt5- > >diff --git sysutils/qt5-qtplugininfo/Makefile sysutils/qt5-qtplugininfo/Makefile >index ce8852a019fc..eb61e1db0d89 100644 >--- sysutils/qt5-qtplugininfo/Makefile >+++ sysutils/qt5-qtplugininfo/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= qtplugininfo > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= sysutils > PKGNAMEPREFIX= qt5- > >diff --git textproc/qt5-xml/Makefile textproc/qt5-xml/Makefile >index 7f45e1d339c7..e5929d163a87 100644 >--- textproc/qt5-xml/Makefile >+++ textproc/qt5-xml/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= xml > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= textproc > PKGNAMEPREFIX= qt5- > >diff --git textproc/qt5-xmlpatterns/Makefile textproc/qt5-xmlpatterns/Makefile >index 9e0fbf59b993..8370b7d852f9 100644 >--- textproc/qt5-xmlpatterns/Makefile >+++ textproc/qt5-xmlpatterns/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= xmlpatterns > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= textproc > PKGNAMEPREFIX= qt5- > >diff --git www/qt5-webchannel/Makefile www/qt5-webchannel/Makefile >index 45c240462efe..3c03268016da 100644 >--- www/qt5-webchannel/Makefile >+++ www/qt5-webchannel/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= webchannel > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= www > PKGNAMEPREFIX= qt5- > >diff --git www/qt5-webengine/Makefile www/qt5-webengine/Makefile >index 269d2538f6ce..ee62e15b9506 100644 >--- www/qt5-webengine/Makefile >+++ www/qt5-webengine/Makefile >@@ -20,7 +20,7 @@ > > PORTNAME= webengine > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 14 >+PORTREVISION= 15 > CATEGORIES= www > PKGNAMEPREFIX= qt5- > >diff --git www/qt5-webkit/Makefile www/qt5-webkit/Makefile >index 47ff5259a0b0..19cf0d8ad281 100644 >--- www/qt5-webkit/Makefile >+++ www/qt5-webkit/Makefile >@@ -2,7 +2,7 @@ > > PORTNAME= webkit > DISTVERSION= 5.212.0-alpha2 >-PORTREVISION= 18 >+PORTREVISION= 19 > CATEGORIES= www > MASTER_SITES= https://github.com/annulen/${PORTNAME}/releases/download/${DISTNAME}/ > PKGNAMEPREFIX= qt5- >diff --git www/qt5-websockets-qml/Makefile www/qt5-websockets-qml/Makefile >index ab5167ee2883..dc6bfdae1292 100644 >--- www/qt5-websockets-qml/Makefile >+++ www/qt5-websockets-qml/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= websockets-qml > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= www > PKGNAMEPREFIX= qt5- > >diff --git www/qt5-websockets/Makefile www/qt5-websockets/Makefile >index 8f5c6012ac03..fa22ebcaec44 100644 >--- www/qt5-websockets/Makefile >+++ www/qt5-websockets/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= websockets > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= www > PKGNAMEPREFIX= qt5- > >diff --git www/qt5-webview/Makefile www/qt5-webview/Makefile >index 63c6d7909fdf..0a2f6d6bc02a 100644 >--- www/qt5-webview/Makefile >+++ www/qt5-webview/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= webview > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= www > PKGNAMEPREFIX= qt5- > >diff --git x11-toolkits/qt5-canvas3d/Makefile x11-toolkits/qt5-canvas3d/Makefile >index 8ec9032624ab..f8895b381701 100644 >--- x11-toolkits/qt5-canvas3d/Makefile >+++ x11-toolkits/qt5-canvas3d/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= canvas3d > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= x11-toolkits > PKGNAMEPREFIX= qt5- > >diff --git x11-toolkits/qt5-charts/Makefile x11-toolkits/qt5-charts/Makefile >index 5a0ba2774b21..7783c311dcac 100644 >--- x11-toolkits/qt5-charts/Makefile >+++ x11-toolkits/qt5-charts/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= charts > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= x11-toolkits > PKGNAMEPREFIX= qt5- > >diff --git x11-toolkits/qt5-datavis3d/Makefile x11-toolkits/qt5-datavis3d/Makefile >index 87613b526f0a..9a2ca789f6f4 100644 >--- x11-toolkits/qt5-datavis3d/Makefile >+++ x11-toolkits/qt5-datavis3d/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= datavis3d > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= x11-toolkits > PKGNAMEPREFIX= qt5- > >diff --git x11-toolkits/qt5-declarative/Makefile x11-toolkits/qt5-declarative/Makefile >index 1dfd7db9b324..eb84c7be52a4 100644 >--- x11-toolkits/qt5-declarative/Makefile >+++ x11-toolkits/qt5-declarative/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= declarative > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= x11-toolkits > PKGNAMEPREFIX= qt5- > >diff --git x11-toolkits/qt5-gamepad/Makefile x11-toolkits/qt5-gamepad/Makefile >index 7fb40724f442..7ac388416a95 100644 >--- x11-toolkits/qt5-gamepad/Makefile >+++ x11-toolkits/qt5-gamepad/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= gamepad > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= x11-toolkits > PKGNAMEPREFIX= qt5- > >diff --git x11-toolkits/qt5-gui/Makefile x11-toolkits/qt5-gui/Makefile >index 8c2fca4567f6..0fae38ab65be 100644 >--- x11-toolkits/qt5-gui/Makefile >+++ x11-toolkits/qt5-gui/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= gui > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= x11-toolkits graphics > PKGNAMEPREFIX= qt5- > >diff --git x11-toolkits/qt5-gui/pkg-plist x11-toolkits/qt5-gui/pkg-plist >index 43ddf416dad5..c54527a57afc 100644 >--- x11-toolkits/qt5-gui/pkg-plist >+++ x11-toolkits/qt5-gui/pkg-plist >@@ -1,4 +1,3 @@ >-%%QT_BINDIR%%/qvkgen > %%QT_INCDIR%%/QtAccessibilitySupport/%%FULLVER%%/QtAccessibilitySupport/private/qaccessiblebridgeutils_p.h > %%QT_INCDIR%%/QtAccessibilitySupport/QtAccessibilitySupport > %%QT_INCDIR%%/QtAccessibilitySupport/QtAccessibilitySupportDepends >@@ -109,8 +108,8 @@ > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qiconloader_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimage_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimagepixmapcleanuphooks_p.h >-%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimagescale_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimagereaderwriterhelpers_p.h >+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimagescale_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputcontrol_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputdevicemanager_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputdevicemanager_p_p.h >@@ -199,10 +198,10 @@ > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextobject_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextodfwriter_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtexttable_p.h >-%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextureglyphcache_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtexturefiledata_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtexturefilehandler_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtexturefilereader_p.h >+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtextureglyphcache_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtgui-config_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtguiglobal_p.h > %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtouchdevice_p.h >@@ -742,6 +741,7 @@ > %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake > %%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake > %%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake >+%%QT_BINDIR%%/qvkgen > %%QT_LIBDIR%%/libQt5AccessibilitySupport.a > %%QT_LIBDIR%%/libQt5AccessibilitySupport.prl > %%QT_LIBDIR%%/libQt5DeviceDiscoverySupport.a >@@ -818,12 +818,12 @@ > %%DEBUG%%%%QT_PLUGINDIR%%/platforminputcontexts/libibusplatforminputcontextplugin.so.debug > %%QT_PLUGINDIR%%/platforms/libqbsdfb.so > %%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqbsdfb.so.debug >-%%QT_PLUGINDIR%%/platforms/libqvnc.so >-%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqvnc.so.debug > %%QT_PLUGINDIR%%/platforms/libqminimal.so > %%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqminimal.so.debug > %%QT_PLUGINDIR%%/platforms/libqoffscreen.so > %%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqoffscreen.so.debug >+%%QT_PLUGINDIR%%/platforms/libqvnc.so >+%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqvnc.so.debug > %%QT_PLUGINDIR%%/platforms/libqxcb.so > %%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqxcb.so.debug > %%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so >diff --git x11-toolkits/qt5-quickcontrols/Makefile x11-toolkits/qt5-quickcontrols/Makefile >index 8d2beabd0a03..d2898e1f446a 100644 >--- x11-toolkits/qt5-quickcontrols/Makefile >+++ x11-toolkits/qt5-quickcontrols/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= quickcontrols > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= x11-toolkits > PKGNAMEPREFIX= qt5- > >diff --git x11-toolkits/qt5-quickcontrols2/Makefile x11-toolkits/qt5-quickcontrols2/Makefile >index 63027dc41262..046a8c68a3c8 100644 >--- x11-toolkits/qt5-quickcontrols2/Makefile >+++ x11-toolkits/qt5-quickcontrols2/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= quickcontrols2 > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= x11-toolkits > PKGNAMEPREFIX= qt5- > >diff --git x11-toolkits/qt5-uiplugin/Makefile x11-toolkits/qt5-uiplugin/Makefile >index e8f85e0ccaae..f36cb97c4d44 100644 >--- x11-toolkits/qt5-uiplugin/Makefile >+++ x11-toolkits/qt5-uiplugin/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= uiplugin > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 1 > CATEGORIES= x11-toolkits devel > PKGNAMEPREFIX= qt5- > >diff --git x11-toolkits/qt5-uiplugin/files/patch-src__src.pro x11-toolkits/qt5-uiplugin/files/patch-src__src.pro >index 56a603d27a1f..660bf38d4d29 100644 >--- x11-toolkits/qt5-uiplugin/files/patch-src__src.pro >+++ x11-toolkits/qt5-uiplugin/files/patch-src__src.pro >@@ -1,8 +1,8 @@ > Only enter the directories we want to build, otherwise we might fail due to > missing dependencies. >---- src/src.pro.orig 2018-10-16 20:12:06 UTC >+--- src/src.pro.orig 2019-02-08 21:07:16 UTC > +++ src/src.pro >-@@ -1,52 +1,3 @@ >+@@ -1,54 +1,3 @@ > TEMPLATE = subdirs > > -qtHaveModule(widgets) { >@@ -28,7 +28,9 @@ missing dependencies. > - !android|android_app: SUBDIRS += qtplugininfo > -} > - >--config_clang: qtConfig(thread): SUBDIRS += qdoc >+-include($$OUT_PWD/qdoc/qtqdoc-config.pri) >+-QT_FOR_CONFIG += qdoc-private >+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc > - > -!android|android_app: SUBDIRS += qtpaths > - >diff --git x11-toolkits/qt5-virtualkeyboard/Makefile x11-toolkits/qt5-virtualkeyboard/Makefile >index b07a4c484692..10ce02bcadb7 100644 >--- x11-toolkits/qt5-virtualkeyboard/Makefile >+++ x11-toolkits/qt5-virtualkeyboard/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= virtualkeyboard > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= x11-toolkits > PKGNAMEPREFIX= qt5- > >diff --git x11-toolkits/qt5-widgets/Makefile x11-toolkits/qt5-widgets/Makefile >index 9ba8c0440785..7e63dac85b53 100644 >--- x11-toolkits/qt5-widgets/Makefile >+++ x11-toolkits/qt5-widgets/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= widgets > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= x11-toolkits > PKGNAMEPREFIX= qt5- > >diff --git x11/qt5-qev/Makefile x11/qt5-qev/Makefile >index 87cc12582055..4ef012577306 100644 >--- x11/qt5-qev/Makefile >+++ x11/qt5-qev/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= qev > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= x11 > PKGNAMEPREFIX= qt5- > >diff --git x11/qt5-x11extras/Makefile x11/qt5-x11extras/Makefile >index 578c1ded4311..3534ee2a8666 100644 >--- x11/qt5-x11extras/Makefile >+++ x11/qt5-x11extras/Makefile >@@ -2,7 +2,6 @@ > > PORTNAME= x11extras > DISTVERSION= ${QT5_VERSION} >-PORTREVISION= 2 > CATEGORIES= x11 > PKGNAMEPREFIX= qt5- >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=201870">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 235622
: 201870