Index: Mk/bsd.qt.mk =================================================================== --- Mk/bsd.qt.mk (revision 424054) +++ Mk/bsd.qt.mk (working copy) @@ -27,7 +27,7 @@ # Qt versions currently supported by the framework. _QT_SUPPORTED?= 4 5 QT4_VERSION?= 4.8.7 -QT5_VERSION?= 5.6.1 +QT5_VERSION?= 5.6.2 QT_PREFIX?= ${LOCALBASE} @@ -181,8 +181,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-config.tests_unix_libdl_libdl.pro +_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 \ Index: devel/qmake5/Makefile =================================================================== --- devel/qmake5/Makefile (revision 424054) +++ devel/qmake5/Makefile (working copy) @@ -37,22 +37,7 @@ # Prevent qconfig.pri from being module dependent. @${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \ ${WRKSRC}/configure -# Write the file location paths into mkspecs/common/freebsd.conf - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/mkspecs/common/freebsd.conf - @${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \ - ${WRKSRC}/mkspecs/freebsd-icc/qmake.conf -# Add mkspec for g++. The clang is now the officially supported compiler for -# Qt>=5.6.0 on FreeBSD. - @${MV} ${WRKSRC}/mkspecs/unsupported/freebsd-g++ \ - ${WRKSRC}/mkspecs/freebsd-g++ - @${REINPLACE_CMD} -e 's|(../|(|g' \ - ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf - @${REINPLACE_CMD} -e 's|"../|"|g' \ - ${WRKSRC}/mkspecs/freebsd-g++/qplatformdefs.h -# Clean up files created by patching @${RM} ${WRKSRC}/mkspecs/*/*.orig - @${RM} -Rf ${WRKSRC}/mkspecs/unsupported/freebsd-g++46 post-build: # Complete configure stage to generate *.pri files. Index: devel/qmake5/files/patch-configure =================================================================== --- devel/qmake5/files/patch-configure (revision 424054) +++ devel/qmake5/files/patch-configure (working copy) @@ -1,24 +1,6 @@ -The first two hunks make sure only qmake is build, as the rest of Qt is built +Make sure only qmake is built, as the rest of Qt is built in other ports. -The last hunk is backported from upstream: - -commit a9474d1260a8c8cc9eae14f2984098919d9684e5 -Author: Raphael Kubo da Costa -Date: Tue Aug 23 20:25:14 2016 +0200 - - configure: Correctly detect clang's version on FreeBSD - - "clang -v" on FreeBSD reports something like "FreeBSD clang version - x.y.z [...]" instead of just "clang version x.y.z [...]", which fails to - match the sed pattern in the configure script, resulting in qconfig.pri - having no clang version defined. - - Augment the pattern so that both version strings match. - - Change-Id: I5f38f8480f4b1156ca7147e32c1157a009557035 - Reviewed-by: Thiago Macieira - --- configure.orig 2016-08-24 08:18:37 UTC +++ configure @@ -4115,11 +4115,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then @@ -44,12 +26,3 @@ if [ "$OPT_VERBOSE" = yes ]; then # Show the output of make -@@ -6691,7 +6689,7 @@ case "$QMAKE_CONF_COMPILER" in - # Clang - COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -v 2>&1 | sed -n -E ' - /^Apple (clang|LLVM) version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_APPLE_CLANG_MAJOR_VERSION=\1; QT_APPLE_CLANG_MINOR_VERSION=\2/;p;q;} --/^clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'` -+/^(FreeBSD )?clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'` - eval "$COMPILER_VERSION" - ;; - *icpc) Index: devel/qmake5/files/patch-mkspecs__common__freebsd.conf =================================================================== --- devel/qmake5/files/patch-mkspecs__common__freebsd.conf (revision 424054) +++ devel/qmake5/files/patch-mkspecs__common__freebsd.conf (nonexistent) @@ -1,43 +0,0 @@ ---- ./mkspecs/common/freebsd.conf.orig 2013-12-05 17:36:29.064198097 +0000 -+++ ./mkspecs/common/freebsd.conf 2013-12-05 17:38:34.413200492 +0000 -@@ -0,0 +1,40 @@ -+# -+# qmake configuration for FreeBSD -+# -+ -+MAKEFILE_GENERATOR = UNIX -+QMAKE_PLATFORM = freebsd bsd -+ -+QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE -+ -+QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -+ -+# Addon software goes into /usr/local on the BSDs, by default we will look there -+QMAKE_INCDIR = %%LOCALBASE%%/include -+QMAKE_LIBDIR = %%LOCALBASE%%/lib -+ -+# Required at least by Qt5ConfigExtras.cmake so ports can include GL/gl.h. -+QMAKE_INCDIR_OPENGL = %%LOCALBASE%%/include -+QMAKE_LIBDIR_OPENGL = %%LOCALBASE%%/lib -+ -+QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined -+QMAKE_LFLAGS_THREAD = -pthread -+ -+QMAKE_LIBS = -+QMAKE_LIBS_DYNLOAD = -+QMAKE_LIBS_EXECINFO = -lexecinfo -+QMAKE_LIBS_X11 = -lXext -lX11 -lm -+QMAKE_LIBS_OPENGL = -lGL -+QMAKE_LIBS_THREAD = -+ -+QMAKE_AR = ar cqs -+QMAKE_OBJCOPY = objcopy -+QMAKE_NM = nm -P -+QMAKE_RANLIB = -+ -+QMAKE_STRIP = strip -+QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_INSTALL_FILE = install -m 644 -p -+QMAKE_INSTALL_PROGRAM = install -m 755 -p -+ -+include(unix.conf) Property changes on: devel/qmake5/files/patch-mkspecs__common__freebsd.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/qmake5/files/patch-mkspecs_freebsd-clang_qmake.conf =================================================================== --- devel/qmake5/files/patch-mkspecs_freebsd-clang_qmake.conf (revision 424054) +++ devel/qmake5/files/patch-mkspecs_freebsd-clang_qmake.conf (nonexistent) @@ -1,38 +0,0 @@ ---- mkspecs/freebsd-clang/qmake.conf.orig 2016-04-13 18:43:04 UTC -+++ mkspecs/freebsd-clang/qmake.conf -@@ -2,34 +2,7 @@ - # qmake configuration for freebsd-clang - # - --MAKEFILE_GENERATOR = UNIX --QMAKE_PLATFORM = freebsd bsd -- --include(../common/unix.conf) -- --QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE -- --QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -- --# Addon software goes into /usr/local on the BSDs, by default we will look there --QMAKE_INCDIR = /usr/local/include --QMAKE_LIBDIR = /usr/local/lib -- --QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined --QMAKE_LFLAGS_THREAD = -pthread -- --QMAKE_LIBS = --QMAKE_LIBS_DYNLOAD = --QMAKE_LIBS_EXECINFO = -lexecinfo --QMAKE_LIBS_X11 = -lXext -lX11 -lm --QMAKE_LIBS_OPENGL = -lGL --QMAKE_LIBS_THREAD = -- --QMAKE_AR = ar cqs --QMAKE_OBJCOPY = objcopy --QMAKE_NM = nm -P --QMAKE_RANLIB = -- -+include(../common/freebsd.conf) - include(../common/gcc-base-unix.conf) - include(../common/clang.conf) - Property changes on: devel/qmake5/files/patch-mkspecs_freebsd-clang_qmake.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/qmake5/files/patch-mkspecs_unsupported_freebsd-g++_qmake.conf =================================================================== --- devel/qmake5/files/patch-mkspecs_unsupported_freebsd-g++_qmake.conf (revision 424054) +++ devel/qmake5/files/patch-mkspecs_unsupported_freebsd-g++_qmake.conf (nonexistent) @@ -1,37 +0,0 @@ ---- mkspecs/unsupported/freebsd-g++/qmake.conf.orig 2016-04-13 18:41:57 UTC -+++ mkspecs/unsupported/freebsd-g++/qmake.conf -@@ -2,33 +2,7 @@ - # qmake configuration for freebsd-g++ - # - --MAKEFILE_GENERATOR = UNIX --QMAKE_PLATFORM = freebsd bsd -- --include(../../common/unix.conf) -- --QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE -- --QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -- --# Addon software goes into /usr/local on the BSDs, by default we will look there --QMAKE_INCDIR = /usr/local/include --QMAKE_LIBDIR = /usr/local/lib -- --QMAKE_LFLAGS_THREAD = -pthread -- --QMAKE_LIBS = --QMAKE_LIBS_DYNLOAD = --QMAKE_LIBS_EXECINFO = -lexecinfo --QMAKE_LIBS_X11 = -lXext -lX11 -lm --QMAKE_LIBS_OPENGL = -lGL --QMAKE_LIBS_THREAD = -- --QMAKE_AR = ar cqs --QMAKE_OBJCOPY = objcopy --QMAKE_NM = nm -P --QMAKE_RANLIB = -- -+include(../../common/freebsd.conf) - include(../../common/gcc-base-unix.conf) - include(../../common/g++-unix.conf) - load(qt_config) Property changes on: devel/qmake5/files/patch-mkspecs_unsupported_freebsd-g++_qmake.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/qmake5/pkg-plist =================================================================== --- devel/qmake5/pkg-plist (revision 424054) +++ devel/qmake5/pkg-plist (working copy) @@ -7,6 +7,8 @@ %%QT_MKSPECDIR%%/aix-xlc-64/qplatformdefs.h %%QT_MKSPECDIR%%/aix-xlc/qmake.conf %%QT_MKSPECDIR%%/aix-xlc/qplatformdefs.h +%%QT_MKSPECDIR%%/android-clang/qmake.conf +%%QT_MKSPECDIR%%/android-clang/qplatformdefs.h %%QT_MKSPECDIR%%/android-g++/qmake.conf %%QT_MKSPECDIR%%/android-g++/qplatformdefs.h %%QT_MKSPECDIR%%/blackberry-armle-v7-qcc/qmake.conf @@ -14,12 +16,15 @@ %%QT_MKSPECDIR%%/blackberry-x86-qcc/qmake.conf %%QT_MKSPECDIR%%/blackberry-x86-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/common/aix/qplatformdefs.h +%%QT_MKSPECDIR%%/common/android-base-head.conf +%%QT_MKSPECDIR%%/common/android-base-tail.conf %%QT_MKSPECDIR%%/common/android/qplatformdefs.h %%QT_MKSPECDIR%%/common/angle.conf +%%QT_MKSPECDIR%%/common/bsd/bsd.conf +%%QT_MKSPECDIR%%/common/bsd/qplatformdefs.h %%QT_MKSPECDIR%%/common/c89/qplatformdefs.h %%QT_MKSPECDIR%%/common/clang-mac.conf %%QT_MKSPECDIR%%/common/clang.conf -%%QT_MKSPECDIR%%/common/freebsd.conf %%QT_MKSPECDIR%%/common/g++-base.conf %%QT_MKSPECDIR%%/common/g++-macx.conf %%QT_MKSPECDIR%%/common/g++-unix.conf @@ -44,7 +49,9 @@ %%QT_MKSPECDIR%%/common/nacl/nacl-base.conf %%QT_MKSPECDIR%%/common/nacl/qplatformdefs.h %%QT_MKSPECDIR%%/common/posix/qplatformdefs.h +%%QT_MKSPECDIR%%/common/qcc-base-qnx-aarch64le.conf %%QT_MKSPECDIR%%/common/qcc-base-qnx-armle-v7.conf +%%QT_MKSPECDIR%%/common/qcc-base-qnx-x86-64.conf %%QT_MKSPECDIR%%/common/qcc-base-qnx-x86.conf %%QT_MKSPECDIR%%/common/qcc-base-qnx.conf %%QT_MKSPECDIR%%/common/qcc-base.conf @@ -109,6 +116,8 @@ %%QT_MKSPECDIR%%/devices/linux-rasp-pi2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-rpi3-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-rpi3-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-rpi3-vc4-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-rpi3-vc4-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf @@ -241,6 +250,7 @@ %%QT_MKSPECDIR%%/features/win32/qt_dll.prf %%QT_MKSPECDIR%%/features/win32/rtti.prf %%QT_MKSPECDIR%%/features/win32/rtti_off.prf +%%QT_MKSPECDIR%%/features/win32/separate_debug_info.prf %%QT_MKSPECDIR%%/features/win32/stl.prf %%QT_MKSPECDIR%%/features/win32/stl_off.prf %%QT_MKSPECDIR%%/features/win32/windeployqt.prf @@ -254,8 +264,6 @@ %%QT_MKSPECDIR%%/freebsd-clang/qplatformdefs.h %%QT_MKSPECDIR%%/freebsd-g++/qmake.conf %%QT_MKSPECDIR%%/freebsd-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/freebsd-icc/qmake.conf -%%QT_MKSPECDIR%%/freebsd-icc/qplatformdefs.h %%QT_MKSPECDIR%%/haiku-g++/qmake.conf %%QT_MKSPECDIR%%/haiku-g++/qplatformdefs.h %%QT_MKSPECDIR%%/hpux-acc-64/qmake.conf @@ -366,6 +374,7 @@ %%QT_MKSPECDIR%%/macx-ios-clang/features/testcase_targets.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/xcodebuild.prf %%QT_MKSPECDIR%%/macx-ios-clang/ios_destinations.sh +%%QT_MKSPECDIR%%/macx-ios-clang/ios_devices.pl %%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf %%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h %%QT_MKSPECDIR%%/macx-ios-clang/xcodebuild.mk @@ -387,8 +396,12 @@ %%QT_MKSPECDIR%%/qdevice.pri %%QT_MKSPECDIR%%/qfeatures.pri %%QT_MKSPECDIR%%/qmodule.pri +%%QT_MKSPECDIR%%/qnx-aarch64le-qcc/qmake.conf +%%QT_MKSPECDIR%%/qnx-aarch64le-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qmake.conf %%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qplatformdefs.h +%%QT_MKSPECDIR%%/qnx-x86-64-qcc/qmake.conf +%%QT_MKSPECDIR%%/qnx-x86-64-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/qnx-x86-qcc/qmake.conf %%QT_MKSPECDIR%%/qnx-x86-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/sco-cc/qmake.conf Index: devel/qt5/distinfo =================================================================== --- devel/qt5/distinfo (revision 424054) +++ devel/qt5/distinfo (working copy) @@ -1,45 +1,45 @@ -TIMESTAMP = 1467701519 -SHA256 (KDE/Qt/5.6.1/qt3d-opensource-src-5.6.1.tar.xz) = ad93015165b1ab1a8b458e08503c8f4c8450c2b58024a3ac074281a1a90ea80d -SIZE (KDE/Qt/5.6.1/qt3d-opensource-src-5.6.1.tar.xz) = 19763900 -SHA256 (KDE/Qt/5.6.1/qtbase-opensource-src-5.6.1.tar.xz) = d01cc1ee2be9ecdb169be3aea9dc9fc019c1c6d0bb87e0c88bb95b5b3dce7264 -SIZE (KDE/Qt/5.6.1/qtbase-opensource-src-5.6.1.tar.xz) = 46791688 -SHA256 (KDE/Qt/5.6.1/qtcanvas3d-opensource-src-5.6.1.tar.xz) = 191e2cde0ac8b1ef6616263aac27f12f40335fed2bd60e29987724242b872760 -SIZE (KDE/Qt/5.6.1/qtcanvas3d-opensource-src-5.6.1.tar.xz) = 10836280 -SHA256 (KDE/Qt/5.6.1/qtconnectivity-opensource-src-5.6.1.tar.xz) = 5a35abf6b515091e4b181b78d0ed82249972bf93f227d52c70531417c448d919 -SIZE (KDE/Qt/5.6.1/qtconnectivity-opensource-src-5.6.1.tar.xz) = 2630248 -SHA256 (KDE/Qt/5.6.1/qtdeclarative-opensource-src-5.6.1.tar.xz) = 12fcfd4bc4bad469f07f8c5404d98646f88f61200b014d4fbcb3a0d9e70942b4 -SIZE (KDE/Qt/5.6.1/qtdeclarative-opensource-src-5.6.1.tar.xz) = 18803076 -SHA256 (KDE/Qt/5.6.1/qtgraphicaleffects-opensource-src-5.6.1.tar.xz) = 57e97155da33a8a4023d1b33bc6f7bdef68a64640d04f45ef3db9dec721311d8 -SIZE (KDE/Qt/5.6.1/qtgraphicaleffects-opensource-src-5.6.1.tar.xz) = 14751076 -SHA256 (KDE/Qt/5.6.1/qtimageformats-opensource-src-5.6.1.tar.xz) = 74f3bce4f9df0f1a94d41877a91405560ce79e4359fc831ee97f0c8248081b08 -SIZE (KDE/Qt/5.6.1/qtimageformats-opensource-src-5.6.1.tar.xz) = 1909092 -SHA256 (KDE/Qt/5.6.1/qtlocation-opensource-src-5.6.1.tar.xz) = d3b5768cf68945cd00c9df32fb87ca3bf85f5364dc2e441780840e2bd4d15061 -SIZE (KDE/Qt/5.6.1/qtlocation-opensource-src-5.6.1.tar.xz) = 3046500 -SHA256 (KDE/Qt/5.6.1/qtmultimedia-opensource-src-5.6.1.tar.xz) = d24b5b5fc9f296cc8446c27f1306a47ce5699b65cf1b821d6a43652cd8100515 -SIZE (KDE/Qt/5.6.1/qtmultimedia-opensource-src-5.6.1.tar.xz) = 3485964 -SHA256 (KDE/Qt/5.6.1/qtquickcontrols-opensource-src-5.6.1.tar.xz) = 012aa6c4a697f352a9dc1373d8c1f37e33a6d956b6d14be7d1f9e4637d46a691 -SIZE (KDE/Qt/5.6.1/qtquickcontrols-opensource-src-5.6.1.tar.xz) = 5952340 -SHA256 (KDE/Qt/5.6.1/qtquickcontrols2-opensource-src-5.6.1.tar.xz) = bba0ddcf1a66c8dec3faeb9c84119992bb1ead09a674aae475d19c35cc8eeb8f -SIZE (KDE/Qt/5.6.1/qtquickcontrols2-opensource-src-5.6.1.tar.xz) = 882000 -SHA256 (KDE/Qt/5.6.1/qtscript-opensource-src-5.6.1.tar.xz) = 1cb2ef87aeff3d8d05685279b521c332b752e4559f8e2138fd36d3eb682bf79f -SIZE (KDE/Qt/5.6.1/qtscript-opensource-src-5.6.1.tar.xz) = 2587832 -SHA256 (KDE/Qt/5.6.1/qtsensors-opensource-src-5.6.1.tar.xz) = c724cd14efc62d935ca822147bf9771e735995032c7b3b13e2e8156d283d942e -SIZE (KDE/Qt/5.6.1/qtsensors-opensource-src-5.6.1.tar.xz) = 1973308 -SHA256 (KDE/Qt/5.6.1/qtserialbus-opensource-src-5.6.1.tar.xz) = bf453fd114131ff64b7ff9a412ef13f6e158d1b5cbebf8fa6b5938bb671bc8c0 -SIZE (KDE/Qt/5.6.1/qtserialbus-opensource-src-5.6.1.tar.xz) = 233600 -SHA256 (KDE/Qt/5.6.1/qtserialport-opensource-src-5.6.1.tar.xz) = 0b74a2e85e34163c92b076a9af2bbb2c832516839f060266f0465f881f1be6c2 -SIZE (KDE/Qt/5.6.1/qtserialport-opensource-src-5.6.1.tar.xz) = 256724 -SHA256 (KDE/Qt/5.6.1/qtsvg-opensource-src-5.6.1.tar.xz) = f12e4fd4f169123f7648e45c593b2c5a4556a9b2db3a798467aa9c67c82b8a21 -SIZE (KDE/Qt/5.6.1/qtsvg-opensource-src-5.6.1.tar.xz) = 1723160 -SHA256 (KDE/Qt/5.6.1/qttools-opensource-src-5.6.1.tar.xz) = 77a38895ee2d3fe2d0df4a5e1bbef4d3f8870fe20cd3b2cea27bd2d380c17f71 -SIZE (KDE/Qt/5.6.1/qttools-opensource-src-5.6.1.tar.xz) = 9819124 -SHA256 (KDE/Qt/5.6.1/qttranslations-opensource-src-5.6.1.tar.xz) = 69d52da2691e4c2be7bd5d5a39bdd948bc9dd1c118d417af09e1e30ac0f41c01 -SIZE (KDE/Qt/5.6.1/qttranslations-opensource-src-5.6.1.tar.xz) = 1202688 -SHA256 (KDE/Qt/5.6.1/qtwebchannel-opensource-src-5.6.1.tar.xz) = f82cb5d1bc7af79453da8327464d800469dc40d92446051b4404047542020807 -SIZE (KDE/Qt/5.6.1/qtwebchannel-opensource-src-5.6.1.tar.xz) = 98196 -SHA256 (KDE/Qt/5.6.1/qtwebsockets-opensource-src-5.6.1.tar.xz) = 551e3a6b8d945a3b1d707755c3d4d5fd6a86808ced492709aecf444fa228723a -SIZE (KDE/Qt/5.6.1/qtwebsockets-opensource-src-5.6.1.tar.xz) = 170968 -SHA256 (KDE/Qt/5.6.1/qtx11extras-opensource-src-5.6.1.tar.xz) = e8eb1bd1b963576b1d360341903cb4065e4d361ce6f76304b4b929f42336e350 -SIZE (KDE/Qt/5.6.1/qtx11extras-opensource-src-5.6.1.tar.xz) = 33648 -SHA256 (KDE/Qt/5.6.1/qtxmlpatterns-opensource-src-5.6.1.tar.xz) = 64f46e22aa17f26fe0542069932efdef84ce5d846a5db40ad8e7ad3eb6148160 -SIZE (KDE/Qt/5.6.1/qtxmlpatterns-opensource-src-5.6.1.tar.xz) = 1324348 +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 Index: devel/qt5-core/Makefile =================================================================== --- devel/qt5-core/Makefile (revision 424054) +++ devel/qt5-core/Makefile (working copy) @@ -2,7 +2,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- Index: devel/qt5-core/files/patch-git_680ec54a =================================================================== --- devel/qt5-core/files/patch-git_680ec54a (revision 424054) +++ devel/qt5-core/files/patch-git_680ec54a (nonexistent) @@ -1,68 +0,0 @@ -commit 680ec54a76eaf63375f648819ac9f98c915e5c43 -Author: Raphael Kubo da Costa -Date: Mon Aug 22 19:55:10 2016 +0200 - - QMutex: Make freelist() return a real global static - - Since Qt 5.6.0, some applications such as Kate (built with clang, libc++ - and libcxxrt) on FreeBSD occasionally crash with the following error - message on exit: - - QMutex::lock(): sem_wait failure: Invalid argument - [or pthread_cond_wait in the 5.6 branch] - - Investigation by Gleb Popov, Thiago Macieira and Olivier Goffart has - shown that this is caused by the fact that QDBusConnectionManager is a - Q_GLOBAL_STATIC (so it will be destroyed with all the other - Q_GLOBAL_STATICs in the reverse order of construction). In the - Q_COMPILER_THREADSAFE_STATICS case, freelist() also returns a - function-level static that is constructed on first use, so it may be - destroyed earlier than the QDBusConnectionManager object, making it - impossible to lock a contended mutex. - - We now make freelist() return a global static, so that it is always - destroyed after QDBusConnectionManager and other function-static - variables. - - Change-Id: I210fa7c18dbdf2345863da49141b9a85cffdef52 - Reviewed-by: Olivier Goffart (Woboq GmbH) - ---- src/corelib/thread/qmutex.cpp -+++ src/corelib/thread/qmutex.cpp -@@ -571,34 +571,11 @@ const int FreeListConstants::Sizes[FreeListConstants::BlockCount] = { - - typedef QFreeList FreeList; - // We cannot use Q_GLOBAL_STATIC because it uses QMutex --#if defined(Q_COMPILER_THREADSAFE_STATICS) -+static FreeList freeList_; - FreeList *freelist() - { -- static FreeList list; -- return &list; -+ return &freeList_; - } --#else --static QBasicAtomicPointer freeListPtr; -- --FreeList *freelist() --{ -- FreeList *local = freeListPtr.loadAcquire(); -- if (!local) { -- local = new FreeList; -- if (!freeListPtr.testAndSetRelease(0, local)) { -- delete local; -- local = freeListPtr.loadAcquire(); -- } -- } -- return local; --} -- --static void qFreeListDeleter() --{ -- delete freeListPtr.load(); --} --Q_DESTRUCTOR_FUNCTION(qFreeListDeleter) --#endif - } - - QMutexPrivate *QMutexPrivate::allocate() Property changes on: devel/qt5-core/files/patch-git_680ec54a ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/qt5-core/files/patch-git_bfa53e1c6 =================================================================== --- devel/qt5-core/files/patch-git_bfa53e1c6 (revision 424054) +++ devel/qt5-core/files/patch-git_bfa53e1c6 (nonexistent) @@ -1,25 +0,0 @@ -From bfa53e1c67eddb14887cda37d7c89c76f4cce378 Mon Sep 17 00:00:00 2001 -From: Ralf Nolden -Date: Tue, 10 May 2016 16:34:37 +0200 -Subject: [PATCH] Compile fix: remove _POSIX_C_SOURCE usage - -Remove _POSIX_C_SOURCE usage as the reason why it was added is not -clear anymore and it causes compile errors on BSD systems if not -circumvented by adding further defines to re-enable function calls -hidden by the _POSIX_C_SOURCE define. (__BSD_VISIBLE on FreeBSD/OpenBSD -and _NETBSD_SOURCE on NetBSD) - -Change-Id: Ic6b49ddcd6c481b0f2acd598cea5470604e00507 -Reviewed-by: Thiago Macieira ---- src/corelib/tools/qelapsedtimer_unix.cpp.orig 2016-02-24 20:16:34 UTC -+++ src/corelib/tools/qelapsedtimer_unix.cpp -@@ -31,9 +31,6 @@ - ** - ****************************************************************************/ - --// ask for the latest POSIX, just in case --#define _POSIX_C_SOURCE 200809L -- - #include "qelapsedtimer.h" - #if defined(Q_OS_VXWORKS) - #include "qfunctions_vxworks.h" Property changes on: devel/qt5-core/files/patch-git_bfa53e1c6 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/qt5-core/files/patch-git_c9998b8a =================================================================== --- devel/qt5-core/files/patch-git_c9998b8a (revision 424054) +++ devel/qt5-core/files/patch-git_c9998b8a (nonexistent) @@ -1,26 +0,0 @@ -From c9998b8af39bcf990f4ef9a0ff87b65574a86bfd Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 9 May 2016 11:19:27 -0700 -Subject: [PATCH] Fix build with GCC <= 4.2 (FreeBSD 9.x) - -15b42af11123f9d1eb4bbd79870185585103ea8d changed the qt_cpu_features -variable to be an array and never fixed this #if branch of the code. - -Change-Id: Id69569111e7d4e619e22ffff144cf930f86f478e -Reviewed-by: Oswald Buddenhagen -Reviewed-by: Olivier Goffart (Woboq GmbH) ---- src/corelib/tools/qsimd.cpp.orig 2016-04-13 20:53:43 UTC -+++ src/corelib/tools/qsimd.cpp -@@ -666,7 +666,11 @@ void qDetectCpuFeatures() - // contains all the features that the code required. Qt 4 ran for years - // like that, so it shouldn't be a problem. - -- qt_cpu_features.store(minFeature | quint32(QSimdInitialized)); -+ qt_cpu_features[0].store(minFeature | quint32(QSimdInitialized)); -+#ifndef Q_ATOMIC_INT64_IS_SUPPORTED -+ qt_cpu_features[1].store(minFeature >> 32); -+#endif -+ - return; - # endif - #endif Property changes on: devel/qt5-core/files/patch-git_c9998b8a ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: devel/qt5-qdoc/Makefile =================================================================== --- devel/qt5-qdoc/Makefile (revision 424054) +++ devel/qt5-qdoc/Makefile (working copy) @@ -2,7 +2,6 @@ PORTNAME= qdoc DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel textproc PKGNAMEPREFIX= qt5- Index: devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp =================================================================== --- devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp (revision 424054) +++ devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp (working copy) @@ -8,14 +8,14 @@ [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59391 [2] https://bugreports.qt.io/browse/QTBUG-43057 ---- src/qdoc/qdocindexfiles.cpp.orig 2016-10-02 07:52:39 UTC -+++ src/qdoc/qdocindexfiles.cpp -@@ -1476,7 +1476,7 @@ void QDocIndexFiles::generateIndexSectio +--- src/qdoc/qdocindexfiles.cpp.orig 2016-10-09 21:13:42.831072000 +0200 ++++ src/qdoc/qdocindexfiles.cpp 2016-10-09 21:13:56.153968000 +0200 +@@ -1412,7 +1412,7 @@ const Aggregate* inner = static_cast(node); NodeList cnodes = inner->childNodes(); -- std::sort(cnodes.begin(), cnodes.end(), compareNodes); -+ qSort(cnodes.begin(), cnodes.end(), compareNodes); +- std::sort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan); ++ qSort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan); foreach (Node* child, cnodes) { generateIndexSections(writer, child, generateInternalNodes); Index: devel/qt5-testlib/pkg-plist =================================================================== --- devel/qt5-testlib/pkg-plist (revision 424054) +++ devel/qt5-testlib/pkg-plist (working copy) @@ -19,6 +19,7 @@ %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestlog_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h +%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestutil_macos_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestxunitstreamer_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxctestlogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h Index: lang/qt5-qml/files/patch-git_9b1231ca =================================================================== --- lang/qt5-qml/files/patch-git_9b1231ca (revision 424054) +++ lang/qt5-qml/files/patch-git_9b1231ca (nonexistent) @@ -1,34 +0,0 @@ -This patch is the only change between Qt 5.6.1 and 5.6.1-1. It is easier to -just ship the patch separately. - -[We left out the part concerning the tests/ subdirectory we do not care about] - -From 9b1231ca3d21ade574a8a7cf3f0805a8b520bcd5 Mon Sep 17 00:00:00 2001 -From: Ulf Hermann -Date: Wed, 8 Jun 2016 17:32:32 +0200 -Subject: [PATCH] QML: Only release types if they aren't referenced anymore - -Just checking for references on m_compiledData is not enough. The -actual component can also be referenced. Thus it won't be deleted -on release(), but cannot be found in the type cache anymore. - -Task-number: QTBUG-53761 -Change-Id: I8567af8e75a078598e4fed31e4717134e1332278 -Reviewed-by: Mitch Curtis -Reviewed-by: Simon Hausmann -(cherry picked from commit 2ac19881f92c94f4e9427bd9ff513210675f259e) ---- src/qml/qml/qqmltypeloader.cpp -+++ src/qml/qml/qqmltypeloader.cpp -@@ -1961,7 +1961,8 @@ void QQmlTypeLoader::trimCache() - QList unneededTypes; - for (TypeCache::Iterator iter = m_typeCache.begin(), end = m_typeCache.end(); iter != end; ++iter) { - QQmlTypeData *typeData = iter.value(); -- if (typeData->m_compiledData && typeData->m_compiledData->count() == 1) { -+ if (typeData->m_compiledData && typeData->count() == 1 -+ && typeData->m_compiledData->count() == 1) { - // There are no live objects of this type - unneededTypes.append(iter); - } --- -2.8.4 - Property changes on: lang/qt5-qml/files/patch-git_9b1231ca ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: misc/qt4-l10n/pkg-plist =================================================================== --- misc/qt4-l10n/pkg-plist (revision 424054) +++ misc/qt4-l10n/pkg-plist (working copy) @@ -87,6 +87,7 @@ %%QT_L10NDIR%%/qtconfig_uk.qm %%QT_L10NDIR%%/qtconfig_zh_CN.qm %%QT_L10NDIR%%/qtconfig_zh_TW.qm +%%QT_L10NDIR%%/qtquickcontrols2_en.qm %%QT_L10NDIR%%/qtscript_eu.qm %%QT_L10NDIR%%/qvfb_eu.qm %%QT_L10NDIR%%/qvfb_hu.qm Index: misc/qt5-doc/Makefile =================================================================== --- misc/qt5-doc/Makefile (revision 424054) +++ misc/qt5-doc/Makefile (working copy) @@ -4,7 +4,7 @@ PORTNAME= doc DISTVERSION= ${QT5_VERSION} CATEGORIES= misc -MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/${QT5_SUBDIR}/single +MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/single PKGNAMEPREFIX= qt5- DISTNAME= qt-everywhere-opensource-src-${QT5_VERSION} DIST_SUBDIR= KDE/Qt/${QT5_VERSION} Index: misc/qt5-doc/distinfo =================================================================== --- misc/qt5-doc/distinfo (revision 424054) +++ misc/qt5-doc/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1467055722 -SHA256 (KDE/Qt/5.6.1/qt-everywhere-opensource-src-5.6.1.tar.xz) = 0d3cc75d2368ad988c9ec6bcbed6362dbaa8e03fdfd04e679284f4b9af91e565 -SIZE (KDE/Qt/5.6.1/qt-everywhere-opensource-src-5.6.1.tar.xz) = 297805000 +TIMESTAMP = 1476004270 +SHA256 (KDE/Qt/5.6.2/qt-everywhere-opensource-src-5.6.2.tar.xz) = 83e61bfc78bba230770704e828fa4d23fe3bbfdcfa4a8f5db37ce149731d89b3 +SIZE (KDE/Qt/5.6.2/qt-everywhere-opensource-src-5.6.2.tar.xz) = 297863804 Index: misc/qt5-doc/pkg-plist =================================================================== --- misc/qt5-doc/pkg-plist (revision 424054) +++ misc/qt5-doc/pkg-plist (working copy) @@ -3598,7 +3598,6 @@ %%QT_DOCDIR%%/qtdoc/qmlapplications.html %%QT_DOCDIR%%/qtdoc/qmlbasictypes.html %%QT_DOCDIR%%/qtdoc/qmlfirststeps.html -%%QT_DOCDIR%%/qtdoc/qmlmodules.html %%QT_DOCDIR%%/qtdoc/qmltypes.html %%QT_DOCDIR%%/qtdoc/qpa.html %%QT_DOCDIR%%/qtdoc/qt-activex.html @@ -5311,7 +5310,6 @@ %%QT_DOCDIR%%/qtlinguist/style/offline.css %%QT_DOCDIR%%/qtlocation.qch %%QT_DOCDIR%%/qtlocation/examples-manifest.xml -%%QT_DOCDIR%%/qtlocation/images/api-map.png %%QT_DOCDIR%%/qtlocation/images/api-mapcircle.png %%QT_DOCDIR%%/qtlocation/images/api-mappolygon.png %%QT_DOCDIR%%/qtlocation/images/api-mappolyline.png @@ -5330,6 +5328,7 @@ %%QT_DOCDIR%%/qtlocation/images/ico_out.png %%QT_DOCDIR%%/qtlocation/images/logo.png %%QT_DOCDIR%%/qtlocation/images/mapviewer.png +%%QT_DOCDIR%%/qtlocation/images/minimal_map.png %%QT_DOCDIR%%/qtlocation/images/places.png %%QT_DOCDIR%%/qtlocation/images/places_list.png %%QT_DOCDIR%%/qtlocation/images/places_map.png @@ -5532,6 +5531,11 @@ %%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-menus-mainmenu-qml.html %%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-menus-mappopupmenu-qml.html %%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-menus-markerpopupmenu-qml.html +%%QT_DOCDIR%%/qtlocation/qtlocation-minimal-map-example.html +%%QT_DOCDIR%%/qtlocation/qtlocation-minimal-map-main-cpp.html +%%QT_DOCDIR%%/qtlocation/qtlocation-minimal-map-main-qml.html +%%QT_DOCDIR%%/qtlocation/qtlocation-minimal-map-minimal-map-pro.html +%%QT_DOCDIR%%/qtlocation/qtlocation-minimal-map-qml-qrc.html %%QT_DOCDIR%%/qtlocation/qtlocation-module.html %%QT_DOCDIR%%/qtlocation/qtlocation-places-example.html %%QT_DOCDIR%%/qtlocation/qtlocation-places-forms-message-qml.html @@ -10056,6 +10060,9 @@ %%QT_DOCDIR%%/qtwebchannel/images/btn_prev.png %%QT_DOCDIR%%/qtwebchannel/images/bullet_dn.png %%QT_DOCDIR%%/qtwebchannel/images/bullet_sq.png +%%QT_DOCDIR%%/qtwebchannel/images/chatclient-html.png +%%QT_DOCDIR%%/qtwebchannel/images/chatclient-qml.png +%%QT_DOCDIR%%/qtwebchannel/images/chatserver-cpp.png %%QT_DOCDIR%%/qtwebchannel/images/home.png %%QT_DOCDIR%%/qtwebchannel/images/ico_note.png %%QT_DOCDIR%%/qtwebchannel/images/ico_note_attention.png @@ -12512,7 +12519,6 @@ %%QT_DOCDIR%%/qtwinextras/images/taskbar-progress-stopped.png %%QT_DOCDIR%%/qtwinextras/images/taskbar-progress.png %%QT_DOCDIR%%/qtwinextras/images/thumbbar.png -%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/musicplayer/images/musicplayer.png %%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-pause-16.png %%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-pause-32.png %%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-play-16.png @@ -12520,7 +12526,6 @@ %%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-seek-backward-32.png %%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-seek-forward-32.png %%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-stop-32.png -%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/quickplayer.png %%QT_DOCDIR%%/qtwinextras/qml-qtwinextras-dwmfeatures-members.html %%QT_DOCDIR%%/qtwinextras/qml-qtwinextras-dwmfeatures.html %%QT_DOCDIR%%/qtwinextras/qml-qtwinextras-jumplist-members.html @@ -12550,7 +12555,6 @@ %%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-musicplayer-cpp.html %%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-musicplayer-h.html %%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-musicplayer-pro.html -%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-musicplayer-qrc.html %%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-volumebutton-cpp.html %%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-volumebutton-h.html %%QT_DOCDIR%%/qtwinextras/qtwinextras-overview.html Index: misc/qt5-examples/Makefile =================================================================== --- misc/qt5-examples/Makefile (revision 424054) +++ misc/qt5-examples/Makefile (working copy) @@ -4,13 +4,14 @@ PORTNAME= examples DISTVERSION= ${QT5_VERSION} CATEGORIES= misc -MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/${QT5_SUBDIR}/single/ +MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/single + PKGNAMEPREFIX= qt5- DISTNAME= qt-everywhere-opensource-src-${QT5_VERSION} DIST_SUBDIR= KDE/Qt/${QT5_VERSION} MAINTAINER= kde@FreeBSD.org -COMMENT= Qt 5 examples sourcecodes +COMMENT= Qt 5 examples sourcecode NO_ARCH= yes NO_BUILD= yes Index: misc/qt5-examples/pkg-plist =================================================================== --- misc/qt5-examples/pkg-plist (revision 424054) +++ misc/qt5-examples/pkg-plist (working copy) @@ -794,6 +794,12 @@ %%QT_EXAMPLEDIR%%/location/mapviewer/resources/marker.png %%QT_EXAMPLEDIR%%/location/mapviewer/resources/scale.png %%QT_EXAMPLEDIR%%/location/mapviewer/resources/scale_end.png +%%QT_EXAMPLEDIR%%/location/minimal_map/doc/images/minimal_map.png +%%QT_EXAMPLEDIR%%/location/minimal_map/doc/src/minimal_map.qdoc +%%QT_EXAMPLEDIR%%/location/minimal_map/main.cpp +%%QT_EXAMPLEDIR%%/location/minimal_map/main.qml +%%QT_EXAMPLEDIR%%/location/minimal_map/minimal_map.pro +%%QT_EXAMPLEDIR%%/location/minimal_map/qml.qrc %%QT_EXAMPLEDIR%%/location/places/doc/images/places.png %%QT_EXAMPLEDIR%%/location/places/doc/src/places.qdoc %%QT_EXAMPLEDIR%%/location/places/forms/Message.qml @@ -2763,7 +2769,6 @@ %%QT_EXAMPLEDIR%%/quick/demos/photoviewer/PhotoViewerCore/images/busy.png %%QT_EXAMPLEDIR%%/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png %%QT_EXAMPLEDIR%%/quick/demos/photoviewer/PhotoViewerCore/script/script.js -%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/deployment.pri %%QT_EXAMPLEDIR%%/quick/demos/photoviewer/doc/images/qtquick-demo-photoviewer-small.png %%QT_EXAMPLEDIR%%/quick/demos/photoviewer/doc/src/photoviewer.qdoc %%QT_EXAMPLEDIR%%/quick/demos/photoviewer/i18n/qml_de.qm @@ -3180,7 +3185,6 @@ %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/doc/src/quickwidget.qdoc %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/main.cpp -%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/qtquickwidgets-example.png %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/quickwidget.pro %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/quickwidget.qrc %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/rotatingsquare.qml @@ -4416,13 +4420,16 @@ %%QT_EXAMPLEDIR%%/uitools/uitools.pro %%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient-html.pro %%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient.html +%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/doc/images/chatclient-html.png %%QT_EXAMPLEDIR%%/webchannel/chatclient-html/doc/src/chatclient-html.qdoc %%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/chatclient-qml.pro +%%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/doc/images/chatclient-qml.png %%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/doc/src/chatclient-qml.qdoc %%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/qmlchatclient.qml %%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/chatserver-cpp.pro %%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/chatserver.cpp %%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/chatserver.h +%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/doc/images/chatserver-cpp.png %%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/doc/src/chatserver-cpp.qdoc %%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/main.cpp %%QT_EXAMPLEDIR%%/webchannel/exampleassets.pri Index: misc/qt5-l10n/pkg-plist =================================================================== --- misc/qt5-l10n/pkg-plist (revision 424054) +++ misc/qt5-l10n/pkg-plist (working copy) @@ -173,6 +173,7 @@ %%QT_L10NDIR%%/qtquick1_ru.qm %%QT_L10NDIR%%/qtquick1_sk.qm %%QT_L10NDIR%%/qtquick1_uk.qm +%%QT_L10NDIR%%/qtquickcontrols2_en.qm %%QT_L10NDIR%%/qtquickcontrols2_uk.qm %%QT_L10NDIR%%/qtquickcontrols_de.qm %%QT_L10NDIR%%/qtquickcontrols_en.qm Index: multimedia/qt5-multimedia/files/patch-git_1df147d5 =================================================================== --- multimedia/qt5-multimedia/files/patch-git_1df147d5 (revision 424054) +++ multimedia/qt5-multimedia/files/patch-git_1df147d5 (nonexistent) @@ -1,26 +0,0 @@ -From 1df147d5337622ea979eb1319c97d8278b70d864 Mon Sep 17 00:00:00 2001 -From: Ralf Nolden -Date: Tue, 17 May 2016 12:47:59 +0200 -Subject: [PATCH] Make qtmultimedia 5.6 branch compile without c++11:nullptr - usage - -5.6 should not require c++11 features, however, nullptr slipped in here. -Replace nullptr with Q_NULLPTR for initialization. - -Change-Id: Icf62618657b5bb725bd4c8f924853fa191f6e413 -Reviewed-by: Simon Hausmann - -URL: https://codereview.qt-project.org/#/c/159342/ ---- src/gsttools/qgstreamerbushelper.cpp -+++ src/gsttools/qgstreamerbushelper.cpp -@@ -52,7 +52,7 @@ public: - m_tag(0), - m_bus(bus), - m_helper(parent), -- m_intervalTimer(nullptr) -+ m_intervalTimer(Q_NULLPTR) - { - // glib event loop can be disabled either by env variable or QT_NO_GLIB define, so check the dispacher - QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher(); --- -2.8.1 Property changes on: multimedia/qt5-multimedia/files/patch-git_1df147d5 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/qt5-network/files/patch-src_network_socket_qnativesocketengine__unix.cpp =================================================================== --- net/qt5-network/files/patch-src_network_socket_qnativesocketengine__unix.cpp (revision 424054) +++ net/qt5-network/files/patch-src_network_socket_qnativesocketengine__unix.cpp (nonexistent) @@ -1,16 +0,0 @@ -Fix the build on FreeBSD 9, which does not have LLINDEX. ---- src/network/socket/qnativesocketengine_unix.cpp.orig 2016-04-13 21:57:35 UTC -+++ src/network/socket/qnativesocketengine_unix.cpp -@@ -904,8 +904,11 @@ qint64 QNativeSocketEnginePrivate::nativ - if (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_RECVIF - && cmsgptr->cmsg_len >= CMSG_LEN(sizeof(sockaddr_dl))) { - sockaddr_dl *sdl = reinterpret_cast(CMSG_DATA(cmsgptr)); -- -+# if !defined(LLINDEX) -+ header->ifindex = sdl->sdl_index; -+# else - header->ifindex = LLINDEX(sdl); -+# endif - } - # endif - #endif Property changes on: net/qt5-network/files/patch-src_network_socket_qnativesocketengine__unix.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/qt5-network/pkg-plist =================================================================== --- net/qt5-network/pkg-plist (revision 424054) +++ net/qt5-network/pkg-plist (working copy) @@ -44,7 +44,6 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyfileimpl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyhttpimpl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyimpl_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplynsurlconnectionimpl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequest_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworksession_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsharednetworksession_p.h Index: www/webkit-qt5/Makefile =================================================================== --- www/webkit-qt5/Makefile (revision 424054) +++ www/webkit-qt5/Makefile (working copy) @@ -2,7 +2,6 @@ PORTNAME= webkit DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= www MASTER_SITE_SUBDIR= community_releases/${QT5_VERSION:R}/${QT5_VERSION}/ PKGNAMEPREFIX= qt5- Index: www/webkit-qt5/distinfo =================================================================== --- www/webkit-qt5/distinfo (revision 424054) +++ www/webkit-qt5/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465382905 -SHA256 (KDE/Qt/5.6.1/qtwebkit-opensource-src-5.6.1.tar.xz) = f5cfbfa5fad2b65a9be907d426f99694b86a04c3bb5a8814b21bd0ade4c672aa -SIZE (KDE/Qt/5.6.1/qtwebkit-opensource-src-5.6.1.tar.xz) = 35306084 +TIMESTAMP = 1476277006 +SHA256 (KDE/Qt/5.6.2/qtwebkit-opensource-src-5.6.2.tar.xz) = 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 +SIZE (KDE/Qt/5.6.2/qtwebkit-opensource-src-5.6.2.tar.xz) = 35306252 Index: x11-toolkits/qt5-gui/Makefile =================================================================== --- x11-toolkits/qt5-gui/Makefile (revision 424054) +++ x11-toolkits/qt5-gui/Makefile (working copy) @@ -82,6 +82,10 @@ CXXFLAGS+= -flax-vector-conversions .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 +EXTRA_PATCHES+= ${FILESDIR}/extrapatch-src_gui_painting_qcolor.cpp +.endif + post-build: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ Index: x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp =================================================================== --- x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp (nonexistent) +++ x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp (working copy) @@ -0,0 +1,20 @@ +On FreeBSD 9.3 with gcc-4.2 we need to mark the constant as an unsigned long long. +Else the compiler will choke on it being too large: + +c++ -c -O2 -pipe [...] itemmodels/qstandarditemmodel.cpp +painting/qcolor.cpp:527: error: integer constant is too large for 'long' type +*** [.obj/qcolor.o] Error code 1 +1 error + + +--- src/gui/painting/qcolor.cpp.orig 2016-10-10 16:17:59 UTC ++++ src/gui/painting/qcolor.cpp +@@ -524,7 +524,7 @@ QString QColor::name(NameFormat format) + return QLatin1Char('#') + QString::number(rgba() | 0x1000000, 16).rightRef(6); + case HexArgb: + // it's called rgba() but it does return AARRGGBB +- return QLatin1Char('#') + QString::number(rgba() | 0x100000000, 16).rightRef(8); ++ return QLatin1Char('#') + QString::number(rgba() | 0x100000000ULL, 16).rightRef(8); + } + return QString(); + } Property changes on: x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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