[Midnightbsd-cvs] mports [23358] trunk: update qt
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 5 14:35:03 EDT 2018
Revision: 23358
http://svnweb.midnightbsd.org/mports/?rev=23358
Author: laffer1
Date: 2018-05-05 14:35:02 -0400 (Sat, 05 May 2018)
Log Message:
-----------
update qt
Modified Paths:
--------------
trunk/Mk/extensions/qt.mk
trunk/accessibility/qt4-accessible/distinfo
trunk/databases/qt4-mysql-plugin/distinfo
trunk/databases/qt4-odbc-plugin/distinfo
trunk/databases/qt4-pgsql-plugin/distinfo
trunk/databases/qt4-sql/distinfo
trunk/databases/qt4-sqlite3-plugin/distinfo
trunk/devel/qmake4/Makefile
trunk/devel/qmake4/distinfo
trunk/devel/qmake4/pkg-plist
trunk/devel/qt4/Makefile
trunk/devel/qt4/distinfo
trunk/devel/qt4/files/extrapatch-configure
trunk/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h
trunk/devel/qt4-assistant-adp/distinfo
trunk/devel/qt4-corelib/distinfo
trunk/devel/qt4-help/distinfo
trunk/devel/qt4-libqtassistantclient/distinfo
trunk/devel/qt4-moc/Makefile
trunk/devel/qt4-moc/distinfo
trunk/devel/qt4-moc/files/patch-src__tools__moc__main.cpp
trunk/devel/qt4-qdbusviewer/distinfo
trunk/devel/qt4-qdoc3/distinfo
trunk/devel/qt4-qt3support/distinfo
trunk/devel/qt4-qtsolutions-singleapplication/distinfo
trunk/devel/qt4-qvfb/distinfo
trunk/devel/qt4-rcc/distinfo
trunk/devel/qt4-script/distinfo
trunk/devel/qt4-scripttools/distinfo
trunk/devel/qt4-uic/distinfo
trunk/devel/qt4-uic3/distinfo
trunk/devel/qt5/distinfo
trunk/devel/qt5/files/extrapatch-config.tests-unix-compile.test
trunk/devel/qt5/files/extrapatch-libtool
trunk/graphics/qt4-iconengines/distinfo
trunk/graphics/qt4-imageformats/distinfo
trunk/graphics/qt4-svg/distinfo
trunk/textproc/qt4-xml/distinfo
trunk/www/Makefile
trunk/x11-toolkits/qt4-gui/distinfo
Added Paths:
-----------
trunk/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp
trunk/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp
trunk/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro
trunk/www/webkit-qt4/
trunk/www/webkit-qt5/
Removed Paths:
-------------
trunk/www/qt4-webkit/
trunk/www/qt5-webkit/
Modified: trunk/Mk/extensions/qt.mk
===================================================================
--- trunk/Mk/extensions/qt.mk 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/Mk/extensions/qt.mk 2018-05-05 18:35:02 UTC (rev 23358)
@@ -24,8 +24,8 @@
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 4 5
-QT4_VERSION?= 4.8.6
-QT5_VERSION?= 5.5.1
+QT4_VERSION?= 4.8.7
+QT5_VERSION?= 5.6.2
QT_PREFIX?= ${LOCALBASE}
@@ -77,15 +77,11 @@
DISTNAME= qt-everywhere-opensource-src-${_QT_VERSION}
DIST_SUBDIR= KDE
. else
-. if ${_QT_VERSION:M*-*}
-# Pre-releases.
-MASTER_SITE_SUBDIR= development_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
-. else
-MASTER_SITE_SUBDIR= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
-. endif
-DISTNAME= ${QT_DIST:S,^,qt,:S,$,-opensource-src-${_QT_VERSION},}
+MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
+DISTNAME= ${QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},}
DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},}
DIST_SUBDIR= KDE/Qt/${_QT_VERSION}
+
USES+= tar:xz
# Qt (at least when used with qmake) has a tendency to overlink: some libraries
@@ -101,9 +97,11 @@
defined(DISABLE_SIZE) && defined(NO_CHECKSUM)
# Ensure that the "makesum" target (with its inner "fetch" one) uses
# devel/qt*/distinfo for every port.
-QT_DIST= 3d base canvas3d connectivity declarative doc graphicaleffects imageformats \
- location multimedia quick1 quickcontrols script sensors serialport svg tools \
- translations webchannel webkit webkit-examples websockets x11extras xmlpatterns
+. if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME}
+QT_DIST= 3d base canvas3d connectivity declarative graphicaleffects imageformats \
+ location multimedia quickcontrols quickcontrols2 script sensors serialbus serialport svg tools \
+ translations webchannel websockets x11extras xmlpatterns
+. endif
. endif
. if ${QT_DIST} == "base" && ${PORTNAME} != "qmake"
@@ -181,8 +179,7 @@
. if ${_QT_VERSION:M4*}
_EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h
. else
-_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h \
- ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs__qt_functions.prf
+_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h
. endif
EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \
@@ -214,8 +211,8 @@
QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
. endif
-PLIST_SUB+= SHORTVER=${_QT_VERSION:R} \
- FULLVER=${_QT_VERSION:C/-.*//}
+PLIST_SUB+= SHORTVER=${DISTVERSION:R} \
+ FULLVER=${DISTVERSION:C/-.*//}
.endif # defined(QT_DIST)
.if ${_QT_VERSION:M4*}
@@ -300,8 +297,8 @@
_USE_QT_ALL= assistant clucene dbus declarative designer doc gui help \
imageformats l10n linguist linguisttools multimedia \
network opengl pixeltool qdbusviewer qmake script \
- scripttools sql sql-mysql sql-odbc sql-pgsql \
- sql-sqlite3 svg testlib webkit \
+ scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \
+ sql-sqlite2 sql-sqlite3 svg testlib webkit \
xml xmlpatterns
_USE_QT4_ONLY= accessible assistant-adp assistantclient codecs-cn codecs-jp \
@@ -312,9 +309,9 @@
_USE_QT5_ONLY= 3d buildtools canvas3d concurrent connectivity core \
examples graphicaleffects location paths phonon4 \
- printsupport qdbus qdoc qev qml quick quickcontrols \
- sensors serialport sql-tds uiplugin uitools webchannel \
- websockets widgets x11extras
+ printsupport qdbus qdoc qdoc-data qev qml quick quickcontrols \
+ quickcontrols2 sensors serialbus serialport sql-tds \
+ uiplugin uitools webchannel websockets widgets x11extras
3d_PORT= graphics/${_QT_RELNAME}-3d
3d_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}3DCore.so
@@ -463,6 +460,9 @@
qdoc_PORT= devel/${_QT_RELNAME}-qdoc
qdoc_PATH= ${QT_BINDIR}/qdoc
+qdoc-data_PORT= devel/${_QT_RELNAME}-qdoc-data
+qdoc-data_PATH= ${QT_DOCDIR}/global/config.qdocconf
+
qdoc3_PORT= devel/${_QT_RELNAME}-qdoc3
qdoc3_PATH= ${QT_BINDIR}/qdoc3
@@ -493,6 +493,9 @@
quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols
quickcontrols_PATH= ${QT_QMLDIR}/QtQuick/Controls/qmldir
+quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2
+quickcontrols2_PATH= ${QT_QMLDIR}/Qt/labs/controls/qmldir
+
qvfb_PORT= devel/${_QT_RELNAME}-qvfb
qvfb_PATH= ${QT_BINDIR}/qvfb${_QT_BINSUFX}
@@ -508,6 +511,9 @@
scripttools_PORT= devel/${_QT_RELNAME}-scripttools
scripttools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}ScriptTools.so
+serialbus_PORT= comms/${_QT_RELNAME}-serialbus
+serialbus_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}SerialBus.so
+
serialport_PORT= comms/${_QT_RELNAME}-serialport
serialport_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}SerialPort.so
@@ -522,7 +528,7 @@
sql-sqlite3_PATH= ${QT_PLUGINDIR}/sqldrivers/libqsqlite.so
-.for db in mysql odbc pgsql sqlite3 tds
+.for db in ibase mysql odbc pgsql sqlite2 sqlite3 tds
.if ${_QT_VERSION:M4*}
sql-${db}_PORT?= databases/${_QT_RELNAME}-${db}-plugin
.else
@@ -555,7 +561,7 @@
websockets_PORT= www/${_QT_RELNAME}-websockets
websockets_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}WebSockets.so
-webkit_PORT= www/${_QT_RELNAME}-webkit
+webkit_PORT= www/webkit-${_QT_RELNAME}
webkit_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}WebKit.so
widgets_PORT= x11-toolkits/${_QT_RELNAME}-widgets
@@ -575,8 +581,8 @@
_USE_QT_ALL+= ${_USE_QT${_QT_VERSION:R:R}_ONLY}
.for comp in ${_USE_QT_ALL}
-${comp}_BUILD_DEPENDS?= ${${comp}_PATH}:${PORTSDIR}/${${comp}_PORT}
-${comp}_RUN_DEPENDS?= ${${comp}_PATH}:${PORTSDIR}/${${comp}_PORT}
+${comp}_BUILD_DEPENDS?= ${${comp}_PATH}:${${comp}_PORT}
+${comp}_RUN_DEPENDS?= ${${comp}_PATH}:${${comp}_PORT}
${comp}_build_BUILD_DEPENDS?= ${${comp}_BUILD_DEPENDS}
${comp}_run_RUN_DEPENDS?= ${${comp}_RUN_DEPENDS}
_USE_QT_ALL_SUFFIXED+= ${comp} ${comp}_build ${comp}_run
@@ -645,7 +651,8 @@
# Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same
# time, we have to disable the check in a cache file (the only way to get this
# value through to the configure script in qtbase).
- ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${WRKSRC}/.qmake.cache
+ ${MKDIR} ${CONFIGURE_WRKSRC}
+ ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache
# We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to
# the linker before -L/usr/local/lib. By default, the opposite happens, which
# is a problem when a Qt port is being upgraded, since an existing library
@@ -654,7 +661,7 @@
# latter to get the linker path order right. qmake is smart enough to strip
# 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${WRKSRC}/lib' >> ${WRKSRC}/.qmake.cache
+ ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
pre-install: qt-pre-install
qt-pre-install:
Modified: trunk/accessibility/qt4-accessible/distinfo
===================================================================
--- trunk/accessibility/qt4-accessible/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/accessibility/qt4-accessible/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/databases/qt4-mysql-plugin/distinfo
===================================================================
--- trunk/databases/qt4-mysql-plugin/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/databases/qt4-mysql-plugin/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/databases/qt4-odbc-plugin/distinfo
===================================================================
--- trunk/databases/qt4-odbc-plugin/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/databases/qt4-odbc-plugin/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/databases/qt4-pgsql-plugin/distinfo
===================================================================
--- trunk/databases/qt4-pgsql-plugin/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/databases/qt4-pgsql-plugin/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,3 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.7.4.tar.gz) = 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e
-RMD160 (KDE/qt-everywhere-opensource-src-4.7.4.tar.gz) = 3e47b09663a89973b1c8628506c995dfc2a5387c
-SIZE (KDE/qt-everywhere-opensource-src-4.7.4.tar.gz) = 220388303
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/databases/qt4-sql/distinfo
===================================================================
--- trunk/databases/qt4-sql/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/databases/qt4-sql/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/databases/qt4-sqlite3-plugin/distinfo
===================================================================
--- trunk/databases/qt4-sqlite3-plugin/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/databases/qt4-sqlite3-plugin/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qmake4/Makefile
===================================================================
--- trunk/devel/qmake4/Makefile 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qmake4/Makefile 2018-05-05 18:35:02 UTC (rev 23358)
@@ -15,7 +15,7 @@
USE_QT4=
QT_DIST= yes
REINPLACE_ARGS= -i ""
-WRKSRC= ${WRKDIR}/qt-everywhere-opensource-src-4.8.6/qmake
+WRKSRC= ${WRKDIR}/qt-everywhere-opensource-src-4.8.7/qmake
MAKEFILE= ${FILESDIR}/Makefile.bsd
MAKE_ENV+= FILESDIR="${FILESDIR}" \
QMAKE_COMPILER="${QMAKE_COMPILER}" \
Modified: trunk/devel/qmake4/distinfo
===================================================================
--- trunk/devel/qmake4/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qmake4/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
-SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qmake4/pkg-plist
===================================================================
--- trunk/devel/qmake4/pkg-plist 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qmake4/pkg-plist 2018-05-05 18:35:02 UTC (rev 23358)
@@ -487,6 +487,8 @@
%%QT_MKSPECDIR%%/win32-msvc2012/qplatformdefs.h
%%QT_MKSPECDIR%%/win32-msvc2013/qmake.conf
%%QT_MKSPECDIR%%/win32-msvc2013/qplatformdefs.h
+%%QT_MKSPECDIR%%/win32-msvc2015/qmake.conf
+%%QT_MKSPECDIR%%/win32-msvc2015/qplatformdefs.h
%%QT_MKSPECDIR%%/wince50standard-armv4i-msvc2005/default_post.prf
%%QT_MKSPECDIR%%/wince50standard-armv4i-msvc2005/qmake.conf
%%QT_MKSPECDIR%%/wince50standard-armv4i-msvc2005/qplatformdefs.h
Modified: trunk/devel/qt4/Makefile
===================================================================
--- trunk/devel/qt4/Makefile 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4/Makefile 2018-05-05 18:35:02 UTC (rev 23358)
@@ -21,9 +21,12 @@
NO_BUILD= yes
NO_MTREE= yes
-OPTIONS_DEFINE= DOCS EXAMPLES GSTREAMER NLS SQL_PLUGINS TOOLS
+OPTIONS_DEFINE= CODECS DOCS EXAMPLES GSTREAMER NLS SQL_PLUGINS TOOLS
OPTIONS_DEFAULT=${OPTIONS_DEFINE}
+CODECS_DESC= CN, JP, KR, TW codecs support
+CODECS_USE= codecs-cn codecs-jp codecs-kr codecs-tw
+
DOCS_USE= doc
EXAMPLES_USE= demo
@@ -33,16 +36,17 @@
NLS_USE= l10n
SQL_PLUGINS_DESC= Install database plugins for QtSql
-SQL_PLUGINS_USE=sql-mysql sql-odbc sql-pgsql \
+SQL_PLUGINS_USE=sql-ibase sql-mysql sql-odbc sql-pgsql sql-sqlite2 \
sql-sqlite3
TOOLS_DESC= Install Qt tools (qmake, moc, etc.)
-TOOLS_USE= assistant help-tools linguist makeqpf moc pixeltool \
+TOOLS_USE= assistant help-tools linguist linguisttools makeqpf \
+ moc pixeltool \
porting qdbusviewer qdoc3 qmake qmlviewer qtconfig \
qvfb rcc uic uic3 xmlpatterns-tool
.for opt in ${OPTIONS_DEFINE}
-${opt}_USE:= ${${opt}_USE:S/^/QT4=/}
+${opt}_USE:= ${${opt}_USE:S/^/QT4=/:S/$/_run/}
.endfor
.include <bsd.mport.options.mk>
Modified: trunk/devel/qt4/distinfo
===================================================================
--- trunk/devel/qt4/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
-SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4/files/extrapatch-configure
===================================================================
--- trunk/devel/qt4/files/extrapatch-configure 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4/files/extrapatch-configure 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,6 +1,6 @@
---- ./configure.orig 2013-06-07 07:16:41.000000000 +0200
-+++ ./configure 2013-10-27 23:22:00.000000000 +0100
-@@ -916,7 +916,7 @@
+--- configure.orig 2014-04-10 18:37:08.000000000 +0000
++++ configure
+@@ -916,7 +916,7 @@ OPT_HELP=
CFG_SILENT=no
CFG_GRAPHICS_SYSTEM=default
CFG_RUNTIME_SYSTEM=
@@ -9,7 +9,7 @@
CFG_PULSEAUDIO=auto
CFG_COREWLAN=auto
CFG_ICD=auto
-@@ -2704,11 +2704,6 @@
+@@ -2704,11 +2704,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then
fi
done
@@ -21,7 +21,7 @@
ShadowMkspecs()
{
-@@ -3019,6 +3014,7 @@
+@@ -3019,6 +3014,7 @@ else
PLATFORMS=`find "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"`
fi
@@ -29,7 +29,7 @@
[ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM"
case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac
-@@ -4908,7 +4904,7 @@
+@@ -4915,7 +4911,7 @@ setBootstrapVariable()
}
# build qmake
@@ -38,7 +38,7 @@
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -6001,14 +5997,6 @@
+@@ -6041,14 +6037,6 @@ if [ "$PLATFORM_X11" = "yes" -a "$CFG_GU
X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
fi
Modified: trunk/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h
===================================================================
--- trunk/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,239 +1,36 @@
-commit bc620055c82a8ccae49144ad99bf9226d659f852
-Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
-Date: Sun Jul 13 23:15:00 2014 +0300
+clang: Only enable Q_COMPILER_INITIALIZER_LISTS with libc++.
- Move the C++11 support macros to a central place.
-
- The main objective of this commit is to make C++11 support work with
- clang: so far, the Q_COMPILER_* definitions related to C++11 were
- enabled based on __GNUC__ and __GNUC_MINOR__; while clang does define
- those two, __GNUC_MINOR__ is hardcoded at "2" and thus none of the
- macros end up being defined.
-
- We now make qglobal.h more similar to how qtbase's qcompilerdetection.h
- works by separating the detection of the C++11 features supported by a
- compiler from the detection of the compilers themselves.
-
- It is important to note the list of macros has not changed, the macros
- have only been moved.
-
- This commit either follows the spirit of or is a cherry-pick of the
- following qtbase ones:
- - 4131c323a36ee8680a3b4d66a2a03a00544751c2 (Update the C++11 support
- macros)
- - 8dd66f42e834320c4ba0a6f2e45855d591b3b6e7 (Avoid undefined macro
- warning for __GXX_EXPERIMENTAL_CXX0X__)
- - fe5d5fdaf1d9b7d108727d290e24a6b0f00139c6 (clang: Use __has_feature()
- to detect C++11 features)
- - 0ec953c93688ec0de74cda43b91f66f4cf879e5f (Remove extra Q_COMPILER_xxx
- defines from the MSVC section)
- - 163dcf2b71f34a12137f200e4af5640e42e5f5e2 (Fix build with older Clang
- versions without __has_extension)
- - 53262b9b5b9cb536916f6d6e086a944cb17bb8d8 (Only define the MSVC C++11
- feature macros in C++)
-
- Change-Id: I2ca35af1a23260a9373943f97a8a72db3fc670e4
- Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
+This is a workaround for the FreeBSD 9.x series: in Qt 4.8.7, C++11 features
+are detected by checking if the compiler supports them. However, initializer
+lists support also depends on the C++ standard library. 9.x's libstdc++ from
+base (GCC 4.2) does not, so ports with e.g. USES=compiler:c++0x or
+compiler:c++11-lang would break: they build with clang and base's libstdc++, so
+Qt considers the support is there (including the C++ header) while this is not
+the case.
-diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
-index 158ef78..4f1384b 100644
+Work around the problem by only enabling Q_COMPILER_INITIALIZER_LISTS if libc++
+is being used. Detecting libstdc++'s version is too cumbersome (we would at
+least need to include a non-lightweight header such as cstdio to have access to
+__GLIBCXX__) and not worth the effort.
--- src/corelib/global/qglobal.h
+++ src/corelib/global/qglobal.h
-@@ -463,17 +463,6 @@ namespace QT_NAMESPACE {}
- # undef QT_HAVE_3DNOW
- # endif
-
--#if defined(Q_CC_MSVC) && _MSC_VER >= 1600
--# define Q_COMPILER_RVALUE_REFS
--# define Q_COMPILER_AUTO_FUNCTION
--# define Q_COMPILER_AUTO_TYPE
--# define Q_COMPILER_LAMBDA
--# define Q_COMPILER_DECLTYPE
--// MSCV has std::initilizer_list, but do not support the braces initialization
--//# define Q_COMPILER_INITIALIZER_LISTS
--# endif
--
--
- #elif defined(__BORLANDC__) || defined(__TURBOC__)
- # define Q_CC_BOR
- # define Q_INLINE_TEMPLATE
-@@ -505,6 +494,7 @@ namespace QT_NAMESPACE {}
- /* work-around for missing compiler intrinsics */
- # define __is_empty(X) false
- # define __is_pod(X) false
-+
- #elif defined(__GNUC__)
- # define Q_CC_GNU
- # define Q_C_CALLBACKS
-@@ -518,6 +508,10 @@ namespace QT_NAMESPACE {}
- # if defined(__clang__)
- /* Clang also masquerades as GCC 4.2.1 */
- # define Q_CC_CLANG
-+# if !defined(__has_extension)
-+ /* Compatibility with older Clang versions */
-+# define __has_extension __has_feature
-+# endif
- # endif
- # ifdef __APPLE__
- # define Q_NO_DEPRECATED_CONSTRUCTORS
-@@ -558,33 +552,6 @@ namespace QT_NAMESPACE {}
- # define QT_NO_ARM_EABI
+@@ -854,7 +855,18 @@ namespace QT_NAMESPACE {}
+ # define Q_COMPILER_DEFAULT_DELETE_MEMBERS
# endif
- # endif
--# if defined(__GXX_EXPERIMENTAL_CXX0X__)
--# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 403
-- /* C++0x features supported in GCC 4.3: */
--# define Q_COMPILER_RVALUE_REFS
--# define Q_COMPILER_DECLTYPE
--# endif
--# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 404
-- /* C++0x features supported in GCC 4.4: */
--# define Q_COMPILER_VARIADIC_TEMPLATES
--# define Q_COMPILER_AUTO_FUNCTION
--# define Q_COMPILER_AUTO_TYPE
--# define Q_COMPILER_EXTERN_TEMPLATES
--# define Q_COMPILER_DEFAULT_DELETE_MEMBERS
--# define Q_COMPILER_CLASS_ENUM
+ # if __has_feature(cxx_generalized_initializers)
-# define Q_COMPILER_INITIALIZER_LISTS
--# endif
--# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405
-- /* C++0x features supported in GCC 4.5: */
--# define Q_COMPILER_LAMBDA
--# define Q_COMPILER_UNICODE_STRINGS
--# endif
--# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406
-- /* C++0x features supported in GCC 4.6: */
--# define Q_COMPILER_CONSTEXPR
--# endif
--
--# endif
-
- /* IBM compiler versions are a bit messy. There are actually two products:
- the C product, and the C++ product. The C++ compiler is always packaged
-@@ -829,12 +796,33 @@ namespace QT_NAMESPACE {}
- # error "Qt has not been tested with this compiler - talk to qt-bugs at trolltech.com"
- #endif
-
+/*
-+ * C++11 support
-+ *
-+ * Paper Macro SD-6 macro
-+ * N2541 Q_COMPILER_AUTO_FUNCTION
-+ * N1984 N2546 Q_COMPILER_AUTO_TYPE
-+ * N2437 Q_COMPILER_CLASS_ENUM
-+ * N2235 Q_COMPILER_CONSTEXPR __cpp_constexpr = 200704
-+ * N2343 N3276 Q_COMPILER_DECLTYPE __cpp_decltype = 200707
-+ * N2346 Q_COMPILER_DEFAULT_DELETE_MEMBERS
-+ * N1987 Q_COMPILER_EXTERN_TEMPLATES
-+ * N2672 Q_COMPILER_INITIALIZER_LISTS
-+ * N2658 N2927 Q_COMPILER_LAMBDA __cpp_lambdas = 200907
-+ * N2118 N2844 N3053 Q_COMPILER_RVALUE_REFS __cpp_rvalue_references = 200610
-+ * N2442 Q_COMPILER_UNICODE_STRINGS __cpp_unicode_literals = 200710
-+ * N2242 N2555 Q_COMPILER_VARIADIC_TEMPLATES __cpp_variadic_templates = 200704
-+ *
-+ * For any future version of the C++ standard, we use only the SD-6 macro.
-+ * For full listing, see
-+ * http://isocpp.org/std/standing-documents/sd-6-sg10-feature-test-recommendations
++ * Workaround for FreeBSD 9.x, where we can end up building a port with clang
++ * and base's libstdc++ from GCC 4.2 (which does not support initializer
++ * lists). Since detecting libstdc++'s version is not trivial, only enable the
++ * macro with libc++.
+ */
-
- #ifdef Q_CC_INTEL
- # if __INTEL_COMPILER < 1200
- # define Q_NO_TEMPLATE_FRIENDS
- # endif
--# if defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__)
-+# if __cplusplus >= 201103L
- # if __INTEL_COMPILER >= 1100
- # define Q_COMPILER_RVALUE_REFS
- # define Q_COMPILER_EXTERN_TEMPLATES
-@@ -849,6 +837,91 @@ namespace QT_NAMESPACE {}
- # endif
- #endif
-
-+#if defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
-+# if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
-+ /* Detect C++ features using __has_feature(), see http://clang.llvm.org/docs/LanguageExtensions.html#cxx11 */
-+# if __has_feature(cxx_auto_type)
-+# define Q_COMPILER_AUTO_FUNCTION
-+# define Q_COMPILER_AUTO_TYPE
-+# endif
-+# if __has_feature(cxx_constexpr)
-+# define Q_COMPILER_CONSTEXPR
-+# endif
-+# if __has_feature(cxx_decltype) /* && __has_feature(cxx_decltype_incomplete_return_types) */
-+# define Q_COMPILER_DECLTYPE
-+# endif
-+# if __has_feature(cxx_defaulted_functions) && __has_feature(cxx_deleted_functions)
-+# define Q_COMPILER_DEFAULT_DELETE_MEMBERS
-+# endif
-+# if __has_feature(cxx_generalized_initializers)
-+# define Q_COMPILER_INITIALIZER_LISTS
-+# endif
-+# if __has_feature(cxx_lambdas)
-+# define Q_COMPILER_LAMBDA
-+# endif
-+# if __has_feature(cxx_rvalue_references)
-+# define Q_COMPILER_RVALUE_REFS
-+# endif
-+# if __has_feature(cxx_strong_enums)
-+# define Q_COMPILER_CLASS_ENUM
-+# endif
-+# if __has_feature(cxx_unicode_literals)
-+# define Q_COMPILER_UNICODE_STRINGS
-+# endif
-+# if __has_feature(cxx_variadic_templates)
-+# define Q_COMPILER_VARIADIC_TEMPLATES
-+# endif
-+ /* Features that have no __has_feature() check */
-+# if ((__clang_major__ * 100) + __clang_minor__) >= 209 /* since clang 2.9 */
-+# define Q_COMPILER_EXTERN_TEMPLATES
-+# endif
-+# endif
-+#endif
-+
-+#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG)
-+# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
-+# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 403
-+ /* C++0x features supported in GCC 4.3: */
-+# define Q_COMPILER_RVALUE_REFS
-+# define Q_COMPILER_DECLTYPE
-+# endif
-+# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 404
-+ /* C++0x features supported in GCC 4.4: */
-+# define Q_COMPILER_VARIADIC_TEMPLATES
-+# define Q_COMPILER_AUTO_FUNCTION
-+# define Q_COMPILER_AUTO_TYPE
-+# define Q_COMPILER_EXTERN_TEMPLATES
-+# define Q_COMPILER_DEFAULT_DELETE_MEMBERS
-+# define Q_COMPILER_CLASS_ENUM
-+# define Q_COMPILER_INITIALIZER_LISTS
-+# endif
-+# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405
-+ /* C++0x features supported in GCC 4.5: */
-+# define Q_COMPILER_LAMBDA
-+# define Q_COMPILER_UNICODE_STRINGS
-+# endif
-+# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406
-+ /* C++0x features supported in GCC 4.6: */
-+# define Q_COMPILER_CONSTEXPR
-+# endif
-+# endif
-+#endif
-+
-+#if defined(Q_CC_MSVC) && !defined(Q_CC_INTEL)
-+# if defined(__cplusplus)
-+# if _MSC_VER >= 1600
-+ /* C++11 features supported in VC10 = VC2010: */
-+# define Q_COMPILER_AUTO_FUNCTION
-+# define Q_COMPILER_AUTO_TYPE
-+# define Q_COMPILER_DECLTYPE
-+# define Q_COMPILER_LAMBDA
-+# define Q_COMPILER_RVALUE_REFS
-+// MSVC's library has std::initializer_list, but the compiler does not support the braces initialization
-+//# define Q_COMPILER_INITIALIZER_LISTS
-+# endif
-+# endif
-+#endif
-+
- #ifndef Q_PACKED
- # define Q_PACKED
- # undef Q_NO_PACKED_REFERENCE
++# if defined(__cplusplus) /* Only C++ has ciso646. */
++# include <ciso646>
++# if defined(_LIBCPP_VERSION)
++# define Q_COMPILER_INITIALIZER_LISTS
++# endif
++# endif
+ # endif
+ # if __has_feature(cxx_lambdas)
+ # define Q_COMPILER_LAMBDA
Modified: trunk/devel/qt4-assistant-adp/distinfo
===================================================================
--- trunk/devel/qt4-assistant-adp/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-assistant-adp/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz) = e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d
-SIZE (KDE/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz) = 329896
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-corelib/distinfo
===================================================================
--- trunk/devel/qt4-corelib/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-corelib/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
-SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Added: trunk/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp
===================================================================
--- trunk/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp (rev 0)
+++ trunk/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp 2018-05-05 18:35:02 UTC (rev 23358)
@@ -0,0 +1,11 @@
+--- config.tests/unix/gnu-libiconv/gnu-libiconv.cpp.orig 2014-04-10 18:37:08 UTC
++++ config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
+@@ -48,7 +48,7 @@ int main(int, char **)
+ {
+ iconv_t x = iconv_open("", "");
+
+- const char *inp;
++ char *inp;
+ char *outp;
+ size_t inbytes, outbytes;
+ iconv(x, &inp, &inbytes, &outp, &outbytes);
Property changes on: trunk/devel/qt4-corelib/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp
===================================================================
--- trunk/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp (rev 0)
+++ trunk/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp 2018-05-05 18:35:02 UTC (rev 23358)
@@ -0,0 +1,39 @@
+--- src/corelib/codecs/qiconvcodec.cpp.orig 2014-04-10 18:37:11 UTC
++++ src/corelib/codecs/qiconvcodec.cpp
+@@ -219,12 +219,7 @@ QString QIconvCodec::convertToUnicode(co
+ IconvState *state = *pstate;
+ size_t inBytesLeft = len;
+ // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
+-#ifdef GNU_LIBICONV
+- // GNU doesn't disagree with POSIX :/
+- const char *inBytes = chars;
+-#else
+ char *inBytes = const_cast<char *>(chars);
+-#endif
+
+ QByteArray in;
+ if (remainingCount) {
+@@ -318,11 +313,7 @@ static bool setByteOrder(iconv_t cd)
+ size_t outBytesLeft = sizeof buf;
+ size_t inBytesLeft = sizeof bom;
+
+-#if defined(GNU_LIBICONV)
+- const char **inBytesPtr = const_cast<const char **>(&inBytes);
+-#else
+ char **inBytesPtr = &inBytes;
+-#endif
+
+ if (iconv(cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) {
+ return false;
+@@ -338,11 +329,7 @@ QByteArray QIconvCodec::convertFromUnico
+ char *outBytes;
+ size_t inBytesLeft;
+
+-#if defined(GNU_LIBICONV)
+- const char **inBytesPtr = const_cast<const char **>(&inBytes);
+-#else
+ char **inBytesPtr = &inBytes;
+-#endif
+
+ IconvState *temporaryState = 0;
+ QThreadStorage<QIconvCodec::IconvState *> *ts = fromUnicodeState();
Property changes on: trunk/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/qt4-help/distinfo
===================================================================
--- trunk/devel/qt4-help/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-help/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-libqtassistantclient/distinfo
===================================================================
--- trunk/devel/qt4-libqtassistantclient/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-libqtassistantclient/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz) = e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d
-SIZE (KDE/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz) = 329896
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-moc/Makefile
===================================================================
--- trunk/devel/qt4-moc/Makefile 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-moc/Makefile 2018-05-05 18:35:02 UTC (rev 23358)
@@ -6,7 +6,7 @@
PKGNAMEPREFIX= qt4-
MAINTAINER= ports at MidnightBSD.org
-COMMENT= Qt meta object compiler
+COMMENT= Qt Meta-Object Compiler
LICENSE= gpl3
Modified: trunk/devel/qt4-moc/distinfo
===================================================================
--- trunk/devel/qt4-moc/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-moc/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
-SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-moc/files/patch-src__tools__moc__main.cpp
===================================================================
--- trunk/devel/qt4-moc/files/patch-src__tools__moc__main.cpp 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-moc/files/patch-src__tools__moc__main.cpp 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,21 +1,30 @@
-Work around additional moc + Boost bugs that showed up after the Boost
-upgrade from 1.52 to 1.55. This should make science/avogadro buildable
-again.
+Workaround for Boost: Qt4's moc cannot parse macros in namespace declarations,
+leading to errors such as:
-See the discussion in QTBUG-22829.
+ Parse error at "BOOST_JOIN"
-Obtained from: Fedora Project
-http://pkgs.fedoraproject.org/cgit/qt.git/tree/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
---- src/tools/moc/main.cpp 2013-06-09 17:04:02.762459323 -0500
-+++ src/tools/moc/main.cpp 2013-06-09 17:08:20.409680813 -0500
-@@ -188,8 +188,9 @@ int runMoc(int _argc, char **_argv)
- pp.macros["Q_MOC_RUN"];
- pp.macros["__cplusplus"];
+This is fixed in Qt5 (the upstream bug is QTBUG-22829), but fixing it in Qt4
+requires substantial changes that upstream has decided not to backport.
+
+What we do to work around the issue is define some Boost include guards so that
+they end up being skipped by moc when it is preprocessing a file.
+--- src/tools/moc/main.cpp.orig 2015-05-07 14:14:44 UTC
++++ src/tools/moc/main.cpp
+@@ -190,6 +190,17 @@ int runMoc(int _argc, char **_argv)
-- // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
-+ // Workaround bugs while parsing some boost headers. See QTBUG-22829
+ // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++ // Additional workarounds for newer Boost versions. The version numbers
++ // below are the first versions in the ports tree to require them, not
++ // the first versions upstream to require them (ie. we might have skipped
++ // some Boost versions in the ports tree).
++ //
++ // For Boost >= 1.55.
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++ // For Boost >= 1.60.
++ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++ pp.macros["BOOST_TYPE_TRAITS_HPP"];
++ pp.macros["BOOST_TT_HAS_PRE_INCREMENT_HPP_INCLUDED"];
QByteArray filename;
QByteArray output;
Modified: trunk/devel/qt4-qdbusviewer/distinfo
===================================================================
--- trunk/devel/qt4-qdbusviewer/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-qdbusviewer/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
-SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-qdoc3/distinfo
===================================================================
--- trunk/devel/qt4-qdoc3/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-qdoc3/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-qt3support/distinfo
===================================================================
--- trunk/devel/qt4-qt3support/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-qt3support/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-qtsolutions-singleapplication/distinfo
===================================================================
--- trunk/devel/qt4-qtsolutions-singleapplication/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-qtsolutions-singleapplication/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (qt4-qtsolutions-singleinstance-20110722.tar.gz) = 0ba3c986034c5884fbece58a353c85627aa7dd734709e0eb6a2d97b671ffa1d3
-SIZE (qt4-qtsolutions-singleinstance-20110722.tar.gz) = 1468445
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-qvfb/distinfo
===================================================================
--- trunk/devel/qt4-qvfb/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-qvfb/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-rcc/distinfo
===================================================================
--- trunk/devel/qt4-rcc/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-rcc/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138
-SIZE (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-script/distinfo
===================================================================
--- trunk/devel/qt4-script/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-script/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-scripttools/distinfo
===================================================================
--- trunk/devel/qt4-scripttools/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-scripttools/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-uic/distinfo
===================================================================
--- trunk/devel/qt4-uic/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-uic/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138
-SIZE (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt4-uic3/distinfo
===================================================================
--- trunk/devel/qt4-uic3/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt4-uic3/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/devel/qt5/distinfo
===================================================================
--- trunk/devel/qt5/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt5/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,50 +1,45 @@
-SHA256 (KDE/Qt/5.5.1/qt3d-opensource-src-5.5.1.tar.xz) = e380906e2bcbd825dab45043bf063dd88b793c0d5fb050ee915bf4e2b58b1bf7
-SIZE (KDE/Qt/5.5.1/qt3d-opensource-src-5.5.1.tar.xz) = 18061948
-SHA256 (KDE/Qt/5.5.1/qtbase-opensource-src-5.5.1.tar.xz) = dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916
-SIZE (KDE/Qt/5.5.1/qtbase-opensource-src-5.5.1.tar.xz) = 46389212
-SHA256 (KDE/Qt/5.5.1/qtcanvas3d-opensource-src-5.5.1.tar.xz) = 759b171030d7110751943643885c1484c7900fed7737424d202e36bdeba0b080
-SIZE (KDE/Qt/5.5.1/qtcanvas3d-opensource-src-5.5.1.tar.xz) = 10409580
-SHA256 (KDE/Qt/5.5.1/qtconnectivity-opensource-src-5.5.1.tar.xz) = 3637e6def8582fc0fb3684179b93650720ba2da1311a560d358296153f245023
-SIZE (KDE/Qt/5.5.1/qtconnectivity-opensource-src-5.5.1.tar.xz) = 2660592
-SHA256 (KDE/Qt/5.5.1/qtdeclarative-opensource-src-5.5.1.tar.xz) = 5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791
-SIZE (KDE/Qt/5.5.1/qtdeclarative-opensource-src-5.5.1.tar.xz) = 18627840
-SHA256 (KDE/Qt/5.5.1/qtdoc-opensource-src-5.5.1.tar.xz) = 9f0daf55a1765f637b5d8096a195842281a49adc5a82e7ddc75e541c62e00f86
-SIZE (KDE/Qt/5.5.1/qtdoc-opensource-src-5.5.1.tar.xz) = 2669772
-SHA256 (KDE/Qt/5.5.1/qtenginio-opensource-src-5.5.1.tar.xz) = a79936bd5b6a35aba28dd282291b28c8fa869b8d86652c62efe5e268d94defe2
-SIZE (KDE/Qt/5.5.1/qtenginio-opensource-src-5.5.1.tar.xz) = 523788
-SHA256 (KDE/Qt/5.5.1/qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 9bca0f8db3a4289eceebfa9504915440fe3fa6301d90b65705e4ece528c12d47
-SIZE (KDE/Qt/5.5.1/qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 14329444
-SHA256 (KDE/Qt/5.5.1/qtimageformats-opensource-src-5.5.1.tar.xz) = c97fee00c602f9f089fea480546d6e9d61a2b2297c2f163bfd9f8aba92b754a5
-SIZE (KDE/Qt/5.5.1/qtimageformats-opensource-src-5.5.1.tar.xz) = 1892820
-SHA256 (KDE/Qt/5.5.1/qtlocation-opensource-src-5.5.1.tar.xz) = 1fe948cb87649f4450be921cf3cdefc311595a80ef6a7a7b7484901baa0d6316
-SIZE (KDE/Qt/5.5.1/qtlocation-opensource-src-5.5.1.tar.xz) = 3108096
-SHA256 (KDE/Qt/5.5.1/qtmultimedia-opensource-src-5.5.1.tar.xz) = 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f
-SIZE (KDE/Qt/5.5.1/qtmultimedia-opensource-src-5.5.1.tar.xz) = 3464340
-SHA256 (KDE/Qt/5.5.1/qtquick1-opensource-src-5.5.1.tar.xz) = c812a7e59a8b9f0a87693181059933e15fef04bc875b6486cd653be1b9b51f2c
-SIZE (KDE/Qt/5.5.1/qtquick1-opensource-src-5.5.1.tar.xz) = 16028732
-SHA256 (KDE/Qt/5.5.1/qtquickcontrols-opensource-src-5.5.1.tar.xz) = 1b7a8389d656066c629bd2cb520b39a7eb041d184b567dd1b9639b88d841fcf0
-SIZE (KDE/Qt/5.5.1/qtquickcontrols-opensource-src-5.5.1.tar.xz) = 5976316
-SHA256 (KDE/Qt/5.5.1/qtscript-opensource-src-5.5.1.tar.xz) = cd46dddd998f22bcb06447e0407fef81f7052f25bc770b1c27625654cee828fd
-SIZE (KDE/Qt/5.5.1/qtscript-opensource-src-5.5.1.tar.xz) = 2604884
-SHA256 (KDE/Qt/5.5.1/qtsensors-opensource-src-5.5.1.tar.xz) = 5d264fc0729a5d7679bd4eb8d7a0a9b142ed38d09fa68fc7dfe57f64afc8eeea
-SIZE (KDE/Qt/5.5.1/qtsensors-opensource-src-5.5.1.tar.xz) = 1989556
-SHA256 (KDE/Qt/5.5.1/qtserialport-opensource-src-5.5.1.tar.xz) = a034dbfb023db1b9b9de54390f7e76a48c1d1eb12533b0ffd574505c99968f7a
-SIZE (KDE/Qt/5.5.1/qtserialport-opensource-src-5.5.1.tar.xz) = 260984
-SHA256 (KDE/Qt/5.5.1/qtsvg-opensource-src-5.5.1.tar.xz) = f7f588be48befd9ccab5a6086832551b8899e8bed9e603ddea979581e05a91c7
-SIZE (KDE/Qt/5.5.1/qtsvg-opensource-src-5.5.1.tar.xz) = 1802880
-SHA256 (KDE/Qt/5.5.1/qttools-opensource-src-5.5.1.tar.xz) = 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd
-SIZE (KDE/Qt/5.5.1/qttools-opensource-src-5.5.1.tar.xz) = 9327100
-SHA256 (KDE/Qt/5.5.1/qttranslations-opensource-src-5.5.1.tar.xz) = 41f800710f0bc6ca263f1e54f1fa22be7043962999304e73ce9887ebefc7a4c6
-SIZE (KDE/Qt/5.5.1/qttranslations-opensource-src-5.5.1.tar.xz) = 1153132
-SHA256 (KDE/Qt/5.5.1/qtwebchannel-opensource-src-5.5.1.tar.xz) = 7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0
-SIZE (KDE/Qt/5.5.1/qtwebchannel-opensource-src-5.5.1.tar.xz) = 96684
-SHA256 (KDE/Qt/5.5.1/qtwebkit-opensource-src-5.5.1.tar.xz) = 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69
-SIZE (KDE/Qt/5.5.1/qtwebkit-opensource-src-5.5.1.tar.xz) = 33489924
-SHA256 (KDE/Qt/5.5.1/qtwebkit-examples-opensource-src-5.5.1.tar.xz) = 098935b42d6d249027d1a635e4e70edc3d2969dd860f825b36aec06fc72e46c6
-SIZE (KDE/Qt/5.5.1/qtwebkit-examples-opensource-src-5.5.1.tar.xz) = 3428204
-SHA256 (KDE/Qt/5.5.1/qtwebsockets-opensource-src-5.5.1.tar.xz) = cf4e834a867b90337188be504ef20184c52666370f721e704952988f8cb12deb
-SIZE (KDE/Qt/5.5.1/qtwebsockets-opensource-src-5.5.1.tar.xz) = 170440
-SHA256 (KDE/Qt/5.5.1/qtx11extras-opensource-src-5.5.1.tar.xz) = 6387a01d972b62e1ad39e5a25e07d0492200f62fc87cf4366122085aeeebeb65
-SIZE (KDE/Qt/5.5.1/qtx11extras-opensource-src-5.5.1.tar.xz) = 33416
-SHA256 (KDE/Qt/5.5.1/qtxmlpatterns-opensource-src-5.5.1.tar.xz) = b537eb0252988e3805a32a16c65038973371d647baf246fdf703bde725d0e8ec
-SIZE (KDE/Qt/5.5.1/qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 1323560
+TIMESTAMP = 1476003740
+SHA256 (KDE/Qt/5.6.2/qt3d-opensource-src-5.6.2.tar.xz) = a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941
+SIZE (KDE/Qt/5.6.2/qt3d-opensource-src-5.6.2.tar.xz) = 19763124
+SHA256 (KDE/Qt/5.6.2/qtbase-opensource-src-5.6.2.tar.xz) = 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787
+SIZE (KDE/Qt/5.6.2/qtbase-opensource-src-5.6.2.tar.xz) = 46825164
+SHA256 (KDE/Qt/5.6.2/qtcanvas3d-opensource-src-5.6.2.tar.xz) = d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad
+SIZE (KDE/Qt/5.6.2/qtcanvas3d-opensource-src-5.6.2.tar.xz) = 10836672
+SHA256 (KDE/Qt/5.6.2/qtconnectivity-opensource-src-5.6.2.tar.xz) = 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9
+SIZE (KDE/Qt/5.6.2/qtconnectivity-opensource-src-5.6.2.tar.xz) = 2639772
+SHA256 (KDE/Qt/5.6.2/qtdeclarative-opensource-src-5.6.2.tar.xz) = 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da
+SIZE (KDE/Qt/5.6.2/qtdeclarative-opensource-src-5.6.2.tar.xz) = 18813016
+SHA256 (KDE/Qt/5.6.2/qtgraphicaleffects-opensource-src-5.6.2.tar.xz) = 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e
+SIZE (KDE/Qt/5.6.2/qtgraphicaleffects-opensource-src-5.6.2.tar.xz) = 14751100
+SHA256 (KDE/Qt/5.6.2/qtimageformats-opensource-src-5.6.2.tar.xz) = 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4
+SIZE (KDE/Qt/5.6.2/qtimageformats-opensource-src-5.6.2.tar.xz) = 1909556
+SHA256 (KDE/Qt/5.6.2/qtlocation-opensource-src-5.6.2.tar.xz) = 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a
+SIZE (KDE/Qt/5.6.2/qtlocation-opensource-src-5.6.2.tar.xz) = 3148448
+SHA256 (KDE/Qt/5.6.2/qtmultimedia-opensource-src-5.6.2.tar.xz) = cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf
+SIZE (KDE/Qt/5.6.2/qtmultimedia-opensource-src-5.6.2.tar.xz) = 3492628
+SHA256 (KDE/Qt/5.6.2/qtquickcontrols-opensource-src-5.6.2.tar.xz) = 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c
+SIZE (KDE/Qt/5.6.2/qtquickcontrols-opensource-src-5.6.2.tar.xz) = 5952696
+SHA256 (KDE/Qt/5.6.2/qtquickcontrols2-opensource-src-5.6.2.tar.xz) = 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1
+SIZE (KDE/Qt/5.6.2/qtquickcontrols2-opensource-src-5.6.2.tar.xz) = 882160
+SHA256 (KDE/Qt/5.6.2/qtscript-opensource-src-5.6.2.tar.xz) = e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e
+SIZE (KDE/Qt/5.6.2/qtscript-opensource-src-5.6.2.tar.xz) = 2587484
+SHA256 (KDE/Qt/5.6.2/qtsensors-opensource-src-5.6.2.tar.xz) = a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427
+SIZE (KDE/Qt/5.6.2/qtsensors-opensource-src-5.6.2.tar.xz) = 1973888
+SHA256 (KDE/Qt/5.6.2/qtserialbus-opensource-src-5.6.2.tar.xz) = b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826
+SIZE (KDE/Qt/5.6.2/qtserialbus-opensource-src-5.6.2.tar.xz) = 234612
+SHA256 (KDE/Qt/5.6.2/qtserialport-opensource-src-5.6.2.tar.xz) = af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376
+SIZE (KDE/Qt/5.6.2/qtserialport-opensource-src-5.6.2.tar.xz) = 256852
+SHA256 (KDE/Qt/5.6.2/qtsvg-opensource-src-5.6.2.tar.xz) = f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e
+SIZE (KDE/Qt/5.6.2/qtsvg-opensource-src-5.6.2.tar.xz) = 1723056
+SHA256 (KDE/Qt/5.6.2/qttools-opensource-src-5.6.2.tar.xz) = db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7
+SIZE (KDE/Qt/5.6.2/qttools-opensource-src-5.6.2.tar.xz) = 9794512
+SHA256 (KDE/Qt/5.6.2/qttranslations-opensource-src-5.6.2.tar.xz) = 7d793b447c1673206e0c5512883ad1435554dbaebf2152475b6d4a7ba6efa421
+SIZE (KDE/Qt/5.6.2/qttranslations-opensource-src-5.6.2.tar.xz) = 1204148
+SHA256 (KDE/Qt/5.6.2/qtwebchannel-opensource-src-5.6.2.tar.xz) = 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52
+SIZE (KDE/Qt/5.6.2/qtwebchannel-opensource-src-5.6.2.tar.xz) = 119792
+SHA256 (KDE/Qt/5.6.2/qtwebsockets-opensource-src-5.6.2.tar.xz) = 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35
+SIZE (KDE/Qt/5.6.2/qtwebsockets-opensource-src-5.6.2.tar.xz) = 171004
+SHA256 (KDE/Qt/5.6.2/qtx11extras-opensource-src-5.6.2.tar.xz) = 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced
+SIZE (KDE/Qt/5.6.2/qtx11extras-opensource-src-5.6.2.tar.xz) = 33640
+SHA256 (KDE/Qt/5.6.2/qtxmlpatterns-opensource-src-5.6.2.tar.xz) = 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc
+SIZE (KDE/Qt/5.6.2/qtxmlpatterns-opensource-src-5.6.2.tar.xz) = 1323576
Modified: trunk/devel/qt5/files/extrapatch-config.tests-unix-compile.test
===================================================================
--- trunk/devel/qt5/files/extrapatch-config.tests-unix-compile.test 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt5/files/extrapatch-config.tests-unix-compile.test 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,9 +1,9 @@
---- config.tests/unix/compile.test.orig
-+++ config.tests/unix/compile.test
-@@ -13,7 +13,7 @@
- shift 7
+--- config.tests/unix/compile.test.orig 2016-05-12 13:16:04.782542000 +0200
++++ config.tests/unix/compile.test 2016-05-12 13:16:17.510837000 +0200
+@@ -14,7 +14,7 @@
LFLAGS="$SYSROOT_FLAG"
INCLUDEPATH=""
+ CFLAGS="$SYSROOT_FLAG"
-CXXFLAGS="$SYSROOT_FLAG"
+CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
MAC_ARCH_CXXFLAGS=""
Added: trunk/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro
===================================================================
--- trunk/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro (rev 0)
+++ trunk/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro 2018-05-05 18:35:02 UTC (rev 23358)
@@ -0,0 +1,9 @@
+FreeBSD does not have -ldl.
+This has been fixed differently upstream in https://codereview.qt-project.org/#/c/159318/
+--- config.tests/unix/libdl/libdl.pro.orig 2016-04-23 14:20:03.489678000 +0200
++++ config.tests/unix/libdl/libdl.pro 2016-04-23 14:20:14.836383000 +0200
+@@ -1,3 +1,3 @@
+ SOURCES = libdl.cpp
+ CONFIG -= qt dylib
+-!qnx: LIBS += -ldl
++!qnx:!freebsd: LIBS += -ldl
Property changes on: trunk/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/qt5/files/extrapatch-libtool
===================================================================
--- trunk/devel/qt5/files/extrapatch-libtool 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/devel/qt5/files/extrapatch-libtool 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,11 +1,10 @@
---- mkspecs/features/qt_module.prf.orig 2015-03-16 17:16:43.000000000 +0100
-+++ mkspecs/features/qt_module.prf 2015-05-01 09:47:31.767105000 +0200
-@@ -200,7 +200,7 @@
+--- mkspecs/features/qt_module.prf.orig 2016-02-24 21:20:22.414067000 +0100
++++ mkspecs/features/qt_module.prf 2016-02-24 21:20:35.884538000 +0100
+@@ -267,7 +267,6 @@
QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
-
- unix {
-- CONFIG += create_libtool explicitlib
-+ CONFIG += explicitlib
- host_build: \
- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
- else: \
+ }
+ !lib_bundle:unix {
+- CONFIG += create_libtool
+ host_build: \
+ QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
+ else: \
Modified: trunk/graphics/qt4-iconengines/distinfo
===================================================================
--- trunk/graphics/qt4-iconengines/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/graphics/qt4-iconengines/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/graphics/qt4-imageformats/distinfo
===================================================================
--- trunk/graphics/qt4-imageformats/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/graphics/qt4-imageformats/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/graphics/qt4-svg/distinfo
===================================================================
--- trunk/graphics/qt4-svg/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/graphics/qt4-svg/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/textproc/qt4-xml/distinfo
===================================================================
--- trunk/textproc/qt4-xml/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/textproc/qt4-xml/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
Modified: trunk/www/Makefile
===================================================================
--- trunk/www/Makefile 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/www/Makefile 2018-05-05 18:35:02 UTC (rev 23358)
@@ -108,8 +108,6 @@
SUBDIR += py-html5lib
SUBDIR += py-httplib2
SUBDIR += py-requests
-SUBDIR += qt4-webkit
-SUBDIR += qt5-webkit
SUBDIR += qt5-webchannel
SUBDIR += qt5-websockets
SUBDIR += seamonkey
@@ -131,6 +129,8 @@
SUBDIR += webkit-gtk2
SUBDIR += webkit-gtk3
SUBDIR += webkit2-gtk3
+SUBDIR += webkit-qt4
+SUBDIR += webkit-qt5
SUBDIR += weblint
SUBDIR += xsp
SUBDIR += youtube_dl
Modified: trunk/x11-toolkits/qt4-gui/distinfo
===================================================================
--- trunk/x11-toolkits/qt4-gui/distinfo 2018-05-03 21:44:02 UTC (rev 23357)
+++ trunk/x11-toolkits/qt4-gui/distinfo 2018-05-05 18:35:02 UTC (rev 23358)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
-SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+SIZE (KDE/qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567
More information about the Midnightbsd-cvs
mailing list