diff options
Diffstat (limited to 'devel')
41 files changed, 449 insertions, 318 deletions
diff --git a/devel/Makefile b/devel/Makefile index ee38d25aad82..8161a42e514b 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4756,6 +4756,7 @@ SUBDIR += qt5-qdbus SUBDIR += qt5-qdbusviewer SUBDIR += qt5-qdoc + SUBDIR += qt5-qdoc-data SUBDIR += qt5-script SUBDIR += qt5-scripttools SUBDIR += qt5-testlib diff --git a/devel/qbs/Makefile b/devel/qbs/Makefile index 3ce44c55db26..03e75d6faac0 100644 --- a/devel/qbs/Makefile +++ b/devel/qbs/Makefile @@ -3,6 +3,7 @@ PORTNAME= qbs PORTVERSION= 1.6.0 DISTVERSIONPREFIX= src- +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= QT/official_releases/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/Qt/qbs diff --git a/devel/qbs/pkg-plist b/devel/qbs/pkg-plist index 5d062d4a3ec2..3113faca9748 100644 --- a/devel/qbs/pkg-plist +++ b/devel/qbs/pkg-plist @@ -126,6 +126,7 @@ lib/qbs/plugins/libqbs_qt_scanner.so %%PORTDOCS%%%%DOCSDIR%%/html/shell.html %%PORTDOCS%%%%DOCSDIR%%/html/staticlibrary-item.html %%PORTDOCS%%%%DOCSDIR%%/html/style/offline.css +%%PORTDOCS%%%%DOCSDIR%%/html/style/offline-simple.css %%PORTDOCS%%%%DOCSDIR%%/html/subproject-item.html %%PORTDOCS%%%%DOCSDIR%%/html/system-requirements.html %%PORTDOCS%%%%DOCSDIR%%/html/typescript-module.html @@ -290,5 +291,3 @@ lib/qbs/plugins/libqbs_qt_scanner.so %%DATADIR%%/modules/wix/WiXModule.qbs %%DATADIR%%/modules/xcode/xcode.js %%DATADIR%%/modules/xcode/xcode.qbs -%%PORTDOCS%%@dir %%DOCSDIR%%/html/images/used-in-examples -%%PORTDOCS%%@dir %%DOCSDIR%%/html/scripts diff --git a/devel/qmake5/Makefile b/devel/qmake5/Makefile index ec2acd9fbc71..af17a0b38256 100644 --- a/devel/qmake5/Makefile +++ b/devel/qmake5/Makefile @@ -2,7 +2,6 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -11,7 +10,9 @@ COMMENT= Qt Makefile generator USE_QT5= # empty USES= pkgconfig shebangfix -SHEBANG_FILES= mkspecs/macx-ios-clang/rename_main.sh +SHEBANG_FILES= util/harfbuzz/update-harfbuzz \ + util/unicode/x11/makeencodings \ + src/3rdparty/freetype/src/tools/afblue.pl QT_DIST= base REINPLACE_ARGS= -i "" HAS_CONFIGURE= yes @@ -34,23 +35,22 @@ post-patch: # Prevent qconfig.pri from being module dependent. @${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \ ${WRKSRC}/configure - - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ +# Write the file location paths into mkspecs/common/freebsd.conf + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mkspecs/common/freebsd.conf @${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \ ${WRKSRC}/mkspecs/freebsd-icc/qmake.conf - -# Add mkspec for Clang. For now, this means adjusting the existing -# unsupported/freebsd-clang mkspec while we get it into shape upstream. - @${MV} ${WRKSRC}/mkspecs/unsupported/freebsd-clang \ - ${WRKSRC}/mkspecs/freebsd-clang +# Add mkspec for g++. The clang is now the officially supported compiler for +# Qt>=5.6.0 on FreeBSD. + @${MV} ${WRKSRC}/mkspecs/unsupported/freebsd-g++ \ + ${WRKSRC}/mkspecs/freebsd-g++ @${REINPLACE_CMD} -e 's|(../|(|g' \ - ${WRKSRC}/mkspecs/freebsd-clang/qmake.conf + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf @${REINPLACE_CMD} -e 's|"../|"|g' \ - ${WRKSRC}/mkspecs/freebsd-clang/qplatformdefs.h - + ${WRKSRC}/mkspecs/freebsd-g++/qplatformdefs.h +# Clean up files created by patching @${RM} ${WRKSRC}/mkspecs/*/*.orig - @${RM} -Rf ${WRKSRC}/mkspecs/freebsd-g++46 + @${RM} -Rf ${WRKSRC}/mkspecs/unsupported/freebsd-g++46 post-build: # Complete configure stage to generate *.pri files. diff --git a/devel/qmake5/files/patch-configure b/devel/qmake5/files/patch-configure index cddfbd368bc9..223965f6f308 100644 --- a/devel/qmake5/files/patch-configure +++ b/devel/qmake5/files/patch-configure @@ -19,12 +19,12 @@ Date: Tue Aug 23 20:25:14 2016 +0200 Change-Id: I5f38f8480f4b1156ca7147e32c1157a009557035 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- configure.orig 2015-10-13 04:35:07 UTC +--- configure.orig 2016-08-24 08:18:37 UTC +++ configure -@@ -4038,11 +4038,11 @@ if true; then ###[ '!' -f "$outpath/bin/ - fi - echo "QMAKESPEC = $adjqmakespec" >> "$mkfile" - echo "QT_VERSION = $QT_VERSION" >> "$mkfile" +@@ -4115,11 +4115,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then + echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile" + echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile" + echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile" - echo "EXTRA_CFLAGS = $EXTRA_CFLAGS" >> "$mkfile" - echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile" + echo "EXTRA_CFLAGS = $EXTRA_CFLAGS $CFLAGS" >> "$mkfile" @@ -36,7 +36,7 @@ Date: Tue Aug 23 20:25:14 2016 +0200 echo "EXEEXT = $EXEEXT" >> "$mkfile" echo "RM_F = rm -f" >> "$mkfile" echo "RM_RF = rm -rf" >> "$mkfile" -@@ -4061,6 +4061,7 @@ if true; then ###[ '!' -f "$outpath/bin/ +@@ -4138,6 +4138,7 @@ if [ '!' -e "$outpath/bin/qmake" ]; then fi fi done @@ -44,7 +44,7 @@ Date: Tue Aug 23 20:25:14 2016 +0200 if [ "$OPT_VERBOSE" = yes ]; then # Show the output of make -@@ -6474,7 +6472,7 @@ case "$QMAKE_CONF_COMPILER" in +@@ -6691,7 +6689,7 @@ case "$QMAKE_CONF_COMPILER" in # Clang COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -v 2>&1 | sed -n -E ' /^Apple (clang|LLVM) version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_APPLE_CLANG_MAJOR_VERSION=\1; QT_APPLE_CLANG_MINOR_VERSION=\2/;p;q;} diff --git a/devel/qmake5/files/patch-mkspecs__common__freebsd.conf b/devel/qmake5/files/patch-mkspecs__common__freebsd.conf index 547b1da7ac0f..f3dee42ec3f5 100644 --- a/devel/qmake5/files/patch-mkspecs__common__freebsd.conf +++ b/devel/qmake5/files/patch-mkspecs__common__freebsd.conf @@ -13,12 +13,12 @@ +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + +# Addon software goes into /usr/local on the BSDs, by default we will look there -+QMAKE_INCDIR = /usr/local/include -+QMAKE_LIBDIR = /usr/local/lib ++QMAKE_INCDIR = %%LOCALBASE%%/include ++QMAKE_LIBDIR = %%LOCALBASE%%/lib + +# Required at least by Qt5ConfigExtras.cmake so ports can include GL/gl.h. -+QMAKE_INCDIR_OPENGL = /usr/local/include -+QMAKE_LIBDIR_OPENGL = /usr/local/lib ++QMAKE_INCDIR_OPENGL = %%LOCALBASE%%/include ++QMAKE_LIBDIR_OPENGL = %%LOCALBASE%%/lib + +QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined +QMAKE_LFLAGS_THREAD = -pthread diff --git a/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf b/devel/qmake5/files/patch-mkspecs_freebsd-clang_qmake.conf index c6c041299eb6..ac5be7a7f763 100644 --- a/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf +++ b/devel/qmake5/files/patch-mkspecs_freebsd-clang_qmake.conf @@ -1,12 +1,14 @@ ---- mkspecs/freebsd-g++/qmake.conf.orig -+++ mkspecs/freebsd-g++/qmake.conf -@@ -2,32 +2,7 @@ - # qmake configuration for freebsd-g++ +--- mkspecs/freebsd-clang/qmake.conf.orig 2016-04-13 18:43:04 UTC ++++ mkspecs/freebsd-clang/qmake.conf +@@ -2,34 +2,7 @@ + # qmake configuration for freebsd-clang # -MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = freebsd bsd - +-include(../common/unix.conf) +- -QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD @@ -15,6 +17,7 @@ -QMAKE_INCDIR = /usr/local/include -QMAKE_LIBDIR = /usr/local/lib - +-QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined -QMAKE_LFLAGS_THREAD = -pthread - -QMAKE_LIBS = @@ -29,8 +32,7 @@ -QMAKE_NM = nm -P -QMAKE_RANLIB = - --include(../common/unix.conf) +include(../common/freebsd.conf) include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) - load(qt_config) + include(../common/clang.conf) + diff --git a/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf b/devel/qmake5/files/patch-mkspecs_unsupported_freebsd-g++_qmake.conf index c2b082c06cfc..ec6788808322 100644 --- a/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf +++ b/devel/qmake5/files/patch-mkspecs_unsupported_freebsd-g++_qmake.conf @@ -1,12 +1,14 @@ ---- mkspecs/unsupported/freebsd-clang/qmake.conf -+++ mkspecs/unsupported/freebsd-clang/qmake.conf -@@ -2,32 +2,6 @@ - # qmake configuration for freebsd-clang +--- mkspecs/unsupported/freebsd-g++/qmake.conf.orig 2016-04-13 18:41:57 UTC ++++ mkspecs/unsupported/freebsd-g++/qmake.conf +@@ -2,33 +2,7 @@ + # qmake configuration for freebsd-g++ # -MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = freebsd bsd - +-include(../../common/unix.conf) +- -QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD @@ -15,7 +17,6 @@ -QMAKE_INCDIR = /usr/local/include -QMAKE_LIBDIR = /usr/local/lib - --QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined -QMAKE_LFLAGS_THREAD = -pthread - -QMAKE_LIBS = @@ -30,9 +31,7 @@ -QMAKE_NM = nm -P -QMAKE_RANLIB = - --include(../../common/unix.conf) --include(../../common/gcc-base-unix.conf) --include(../../common/clang.conf) +include(../../common/freebsd.conf) -+include(../../common/gcc-base-unix.conf) -+include(../../common/clang.conf) + include(../../common/gcc-base-unix.conf) + include(../../common/g++-unix.conf) + load(qt_config) diff --git a/devel/qmake5/pkg-plist b/devel/qmake5/pkg-plist index e1a6aff6c215..1c5a2df7615c 100644 --- a/devel/qmake5/pkg-plist +++ b/devel/qmake5/pkg-plist @@ -15,7 +15,7 @@ %%QT_MKSPECDIR%%/blackberry-x86-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/common/aix/qplatformdefs.h %%QT_MKSPECDIR%%/common/android/qplatformdefs.h -%%QT_MKSPECDIR%%/common/armcc.conf +%%QT_MKSPECDIR%%/common/angle.conf %%QT_MKSPECDIR%%/common/c89/qplatformdefs.h %%QT_MKSPECDIR%%/common/clang-mac.conf %%QT_MKSPECDIR%%/common/clang.conf @@ -37,6 +37,7 @@ %%QT_MKSPECDIR%%/common/mac.conf %%QT_MKSPECDIR%%/common/mac/qplatformdefs.h %%QT_MKSPECDIR%%/common/macx.conf +%%QT_MKSPECDIR%%/common/msvc-base.conf %%QT_MKSPECDIR%%/common/msvc-desktop.conf %%QT_MKSPECDIR%%/common/nacl/g++-nacl32.conf %%QT_MKSPECDIR%%/common/nacl/g++-nacl64.conf @@ -81,6 +82,8 @@ %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-arm-generic-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-arm-generic-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qmake.conf @@ -91,15 +94,21 @@ %%QT_MKSPECDIR%%/devices/linux-imx53qsb-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-nuc-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-nuc-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-odroid-xu3-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-odroid-xu3-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-rasp-pi2-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-rasp-pi2-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-rpi3-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-rpi3-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf @@ -110,9 +119,8 @@ %%QT_MKSPECDIR%%/devices/linux-tegra2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/features/android/android.prf %%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf +%%QT_MKSPECDIR%%/features/benchmark.prf %%QT_MKSPECDIR%%/features/build_pass.prf -%%QT_MKSPECDIR%%/features/c++11.prf -%%QT_MKSPECDIR%%/features/c++14.prf %%QT_MKSPECDIR%%/features/cmake_functions.prf %%QT_MKSPECDIR%%/features/configure.prf %%QT_MKSPECDIR%%/features/create_cmake.prf @@ -125,6 +133,8 @@ %%QT_MKSPECDIR%%/features/data/cmake/Qt5ConfigVersion.cmake.in %%QT_MKSPECDIR%%/features/data/cmake/Qt5PluginTarget.cmake.in %%QT_MKSPECDIR%%/features/data/dummy.cpp +%%QT_MKSPECDIR%%/features/data/mac/objc_namespace.sh +%%QT_MKSPECDIR%%/features/data/unix/findclasslist.pl %%QT_MKSPECDIR%%/features/dbusadaptors.prf %%QT_MKSPECDIR%%/features/dbuscommon.pri %%QT_MKSPECDIR%%/features/dbusinterfaces.prf @@ -138,6 +148,7 @@ %%QT_MKSPECDIR%%/features/exceptions_off.prf %%QT_MKSPECDIR%%/features/exclusive_builds.prf %%QT_MKSPECDIR%%/features/exclusive_builds_post.prf +%%QT_MKSPECDIR%%/features/file_copies.prf %%QT_MKSPECDIR%%/features/gcov.prf %%QT_MKSPECDIR%%/features/include_source_dir.prf %%QT_MKSPECDIR%%/features/incredibuild_xge.prf @@ -151,10 +162,13 @@ %%QT_MKSPECDIR%%/features/mac/objective_c.prf %%QT_MKSPECDIR%%/features/mac/rez.prf %%QT_MKSPECDIR%%/features/mac/sdk.prf +%%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf %%QT_MKSPECDIR%%/features/moc.prf %%QT_MKSPECDIR%%/features/no_debug_info.prf +%%QT_MKSPECDIR%%/features/plugin_bundle.prf %%QT_MKSPECDIR%%/features/precompile_header.prf %%QT_MKSPECDIR%%/features/qfeatures.prf +%%QT_MKSPECDIR%%/features/qgltf.prf %%QT_MKSPECDIR%%/features/qlalr.prf %%QT_MKSPECDIR%%/features/qml1_module.prf %%QT_MKSPECDIR%%/features/qml1_plugin.prf @@ -168,7 +182,9 @@ %%QT_MKSPECDIR%%/features/qt_android_deps.prf %%QT_MKSPECDIR%%/features/qt_app.prf %%QT_MKSPECDIR%%/features/qt_build_config.prf +%%QT_MKSPECDIR%%/features/qt_build_extra.prf %%QT_MKSPECDIR%%/features/qt_build_paths.prf +%%QT_MKSPECDIR%%/features/qt_clear_installs.prf %%QT_MKSPECDIR%%/features/qt_common.prf %%QT_MKSPECDIR%%/features/qt_config.prf %%QT_MKSPECDIR%%/features/qt_docs.prf @@ -199,7 +215,6 @@ %%QT_MKSPECDIR%%/features/testlib_defines.prf %%QT_MKSPECDIR%%/features/uic.prf %%QT_MKSPECDIR%%/features/unix/bsymbolic_functions.prf -%%QT_MKSPECDIR%%/features/unix/dylib.prf %%QT_MKSPECDIR%%/features/unix/hide_symbols.prf %%QT_MKSPECDIR%%/features/unix/largefile.prf %%QT_MKSPECDIR%%/features/unix/opengl.prf @@ -232,7 +247,6 @@ %%QT_MKSPECDIR%%/features/win32/windows.prf %%QT_MKSPECDIR%%/features/winrt/console.prf %%QT_MKSPECDIR%%/features/winrt/default_pre.prf -%%QT_MKSPECDIR%%/features/winrt/font_deployment.prf %%QT_MKSPECDIR%%/features/winrt/package_manifest.prf %%QT_MKSPECDIR%%/features/xctest.prf %%QT_MKSPECDIR%%/features/yacc.prf @@ -301,47 +315,62 @@ %%QT_MKSPECDIR%%/lynxos-g++/qmake.conf %%QT_MKSPECDIR%%/lynxos-g++/qplatformdefs.h %%QT_MKSPECDIR%%/macx-clang-32/Info.plist.app +%%QT_MKSPECDIR%%/macx-clang-32/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-clang-32/Info.plist.lib %%QT_MKSPECDIR%%/macx-clang-32/qmake.conf %%QT_MKSPECDIR%%/macx-clang-32/qplatformdefs.h %%QT_MKSPECDIR%%/macx-clang/Info.plist.app +%%QT_MKSPECDIR%%/macx-clang/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-clang/Info.plist.lib %%QT_MKSPECDIR%%/macx-clang/qmake.conf %%QT_MKSPECDIR%%/macx-clang/qplatformdefs.h %%QT_MKSPECDIR%%/macx-g++-32/Info.plist.app +%%QT_MKSPECDIR%%/macx-g++-32/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-g++-32/Info.plist.lib %%QT_MKSPECDIR%%/macx-g++-32/qmake.conf %%QT_MKSPECDIR%%/macx-g++-32/qplatformdefs.h %%QT_MKSPECDIR%%/macx-g++/Info.plist.app +%%QT_MKSPECDIR%%/macx-g++/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-g++/Info.plist.lib %%QT_MKSPECDIR%%/macx-g++/qmake.conf %%QT_MKSPECDIR%%/macx-g++/qplatformdefs.h %%QT_MKSPECDIR%%/macx-g++40/Info.plist.app +%%QT_MKSPECDIR%%/macx-g++40/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-g++40/Info.plist.lib %%QT_MKSPECDIR%%/macx-g++40/qmake.conf %%QT_MKSPECDIR%%/macx-g++40/qplatformdefs.h %%QT_MKSPECDIR%%/macx-g++42/Info.plist.app +%%QT_MKSPECDIR%%/macx-g++42/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-g++42/Info.plist.lib %%QT_MKSPECDIR%%/macx-g++42/qmake.conf %%QT_MKSPECDIR%%/macx-g++42/qplatformdefs.h %%QT_MKSPECDIR%%/macx-icc/Info.plist.app +%%QT_MKSPECDIR%%/macx-icc/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-icc/Info.plist.lib %%QT_MKSPECDIR%%/macx-icc/qmake.conf %%QT_MKSPECDIR%%/macx-icc/qplatformdefs.h %%QT_MKSPECDIR%%/macx-ios-clang/Default-568h@2x.png %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.app +%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib %%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.xib %%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/default_pre.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/exclusive_builds_post.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt_config.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt_parts.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/resolve_config.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/sdk.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/testcase.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/testcase_targets.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/xcodebuild.prf +%%QT_MKSPECDIR%%/macx-ios-clang/ios_destinations.sh %%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf %%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h -%%QT_MKSPECDIR%%/macx-ios-clang/rename_main.sh +%%QT_MKSPECDIR%%/macx-ios-clang/xcodebuild.mk %%QT_MKSPECDIR%%/macx-llvm/Info.plist.app +%%QT_MKSPECDIR%%/macx-llvm/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-llvm/Info.plist.lib %%QT_MKSPECDIR%%/macx-llvm/qmake.conf %%QT_MKSPECDIR%%/macx-llvm/qplatformdefs.h @@ -389,8 +418,6 @@ %%QT_MKSPECDIR%%/unsupported/android-g++/qeglfshooks_surfaceflinger.cpp %%QT_MKSPECDIR%%/unsupported/android-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/android-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/unsupported/linux-armcc/qmake.conf -%%QT_MKSPECDIR%%/unsupported/linux-armcc/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-scratchbox2-g++/qmake.conf diff --git a/devel/qt5-assistant/files/patch-src__src.pro b/devel/qt5-assistant/files/patch-src__src.pro index cb146d87d743..006794982b31 100644 --- a/devel/qt5-assistant/files/patch-src__src.pro +++ b/devel/qt5-assistant/files/patch-src__src.pro @@ -1,11 +1,11 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro +--- src/src.pro.orig 2016-02-25 20:14:01 UTC +++ src/src.pro -@@ -1,37 +1,2 @@ +@@ -1,38 +1,3 @@ TEMPLATE = subdirs -- + -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") @@ -20,6 +20,7 @@ missing dependencies. -} - -SUBDIRS += linguist \ +- qdoc \ - qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - diff --git a/devel/qt5-buildtools/pkg-plist b/devel/qt5-buildtools/pkg-plist index 80b27b876163..ab7d1f24b4b4 100644 --- a/devel/qt5-buildtools/pkg-plist +++ b/devel/qt5-buildtools/pkg-plist @@ -4,4 +4,3 @@ %%QT_BINDIR%%/rcc %%QT_BINDIR%%/syncqt.pl %%QT_MKSPECDIR%%/modules/qt_lib_bootstrap_private.pri -libdata/pkgconfig/Qt5Bootstrap.pc diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index f67851db4caa..d46aee2f0515 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -2,7 +2,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -39,7 +38,8 @@ QT_CONFIG= glib icu post-install: # Allow qconfig.h to be customized by single ports. - ${REINPLACE_CMD} -i "" '1 s|.*|#include <QtCore/qconfig-modules.h>|' \ - ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h + ${AWK} 'BEGIN{print "#include <QtCore/qconfig-modules.h>"}{print}' \ + ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h > ${WRKDIR}/qconfig.h + ${MV} ${WRKDIR}/qconfig.h ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h .include <bsd.port.post.mk> diff --git a/devel/qt5-core/files/patch-git_08be8691 b/devel/qt5-core/files/patch-git_08be8691 deleted file mode 100644 index e76184024579..000000000000 --- a/devel/qt5-core/files/patch-git_08be8691 +++ /dev/null @@ -1,45 +0,0 @@ -commit 08be8691f7ba5e522cbc000b1880941128ad5f8c -Author: Dmitry Shachnev <mitya57@gmail.com> -Date: Fri Oct 23 21:21:38 2015 +0300 - - Fix QStorageInfo on BSD4 systems - - - On NetBSD, the defines were not properly defined; - - On all other BSD systems, we use statfs which does not have f_frsize - member, revert to using f_bsize there. - - Task-number: QTBUG-48267 - Change-Id: Ia1ed484ac61a615fcbb5b45affb516b5e86a64b0 - Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> - Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> - ---- src/corelib/io/qstorageinfo_unix.cpp -+++ src/corelib/io/qstorageinfo_unix.cpp -@@ -68,8 +68,8 @@ - - #if defined(Q_OS_BSD4) - # if defined(Q_OS_NETBSD) -- define QT_STATFSBUF struct statvfs -- define QT_STATFS ::statvfs -+# define QT_STATFSBUF struct statvfs -+# define QT_STATFS ::statvfs - # else - # define QT_STATFSBUF struct statfs - # define QT_STATFS ::statfs -@@ -506,9 +506,15 @@ void QStorageInfoPrivate::retrieveVolumeInfo() - valid = true; - ready = true; - -+#if defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD) -+ bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize; -+ bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize; -+ bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize; -+#else - bytesTotal = statfs_buf.f_blocks * statfs_buf.f_frsize; - bytesFree = statfs_buf.f_bfree * statfs_buf.f_frsize; - bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize; -+#endif - #if defined(Q_OS_ANDROID) || defined (Q_OS_BSD4) - #if defined(_STATFS_F_FLAGS) - readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0; diff --git a/devel/qt5-core/files/patch-git_090bf50 b/devel/qt5-core/files/patch-git_090bf50 deleted file mode 100644 index ec11c942c6dc..000000000000 --- a/devel/qt5-core/files/patch-git_090bf50 +++ /dev/null @@ -1,25 +0,0 @@ -commit 090bf50771ec1e5d089b0ae0488059a5643883b2 -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Sun Dec 27 01:24:34 2015 +0100 - - forkfd: Only enable pipe2 on FreeBSD >= 10.0. - - The system call is not present on earlier releases, and since the 9.x - series will be supported until the end of 2016, add a check for the - __FreeBSD_version macro and only enable pipe2 support if the value is - high enough. - - Change-Id: I5633531cec7e95d42ff5f4b14afe772ae8d7d66d - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> - ---- src/3rdparty/forkfd/forkfd.c -+++ src/3rdparty/forkfd/forkfd.c -@@ -62,7 +62,7 @@ - # undef HAVE_WAITID - #endif - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1000032 - # define HAVE_PIPE2 1 - #endif - diff --git a/devel/qt5-core/files/patch-git_6552469 b/devel/qt5-core/files/patch-git_6552469 deleted file mode 100644 index f68df09f7bdf..000000000000 --- a/devel/qt5-core/files/patch-git_6552469 +++ /dev/null @@ -1,43 +0,0 @@ -commit 655246969eaa916fbc098a7315dc24830f5b8b5d -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Mon Dec 28 11:43:36 2015 +0100 - - forkfd: Also define BSD visibility macros in forkfd_qt.cpp. - - This is a follow-up to c8c4ad0 ("forkfd: Define __BSD_VISIBLE and - _NETBSD_SOURCE"). - - Defining those macros in forkfd.c is not enough: forkfd_qt.cpp also sets - _POSIX_C_SOURCE, and sys/cdefs.h can be included implicitly via Qt's - headers (<algorithm> ends up pulling unistd.h that leads to sys/cdefs.h - and sys/types.h with both libstdc++ and older libc++ versions). In this - case, __BSD_VISIBLE/_NETBSD_SOURCE are not defined, _POSIX_C_SOURCE is, - several type definitions are omitted and by the time we include - sys/time.h in forkfd.c the build fails. On FreeBSD < 11, the error looks - like this: - - In file included from io/../../3rdparty/forkfd/forkfd.c:36, - from io/forkfd_qt.cpp:80: - /usr/include/sys/time.h:94: error: 'u_int' has not been declared - - Change-Id: I01fa2f5861027d99936d3026faeee9f0db3ecabd - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> - ---- src/corelib/io/forkfd_qt.cpp -+++ src/corelib/io/forkfd_qt.cpp -@@ -39,6 +39,15 @@ - # define _XOPEN_SOURCE 700 - #endif - -+// Define BSD visibility macros. These are also defined in forkfd.c, but the -+// headers using them may be included before forkfd.c itself. -+#ifndef _NETBSD_SOURCE -+# define _NETBSD_SOURCE 1 -+#endif -+#ifndef __BSD_VISIBLE -+# define __BSD_VISIBLE 1 -+#endif -+ - #include <QtCore/qatomic.h> - #include "qprocess_p.h" - diff --git a/devel/qt5-core/files/patch-git_680ec54a b/devel/qt5-core/files/patch-git_680ec54a new file mode 100644 index 000000000000..e9e90f70b988 --- /dev/null +++ b/devel/qt5-core/files/patch-git_680ec54a @@ -0,0 +1,68 @@ +commit 680ec54a76eaf63375f648819ac9f98c915e5c43 +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Mon Aug 22 19:55:10 2016 +0200 + + QMutex: Make freelist() return a real global static + + Since Qt 5.6.0, some applications such as Kate (built with clang, libc++ + and libcxxrt) on FreeBSD occasionally crash with the following error + message on exit: + + QMutex::lock(): sem_wait failure: Invalid argument + [or pthread_cond_wait in the 5.6 branch] + + Investigation by Gleb Popov, Thiago Macieira and Olivier Goffart has + shown that this is caused by the fact that QDBusConnectionManager is a + Q_GLOBAL_STATIC (so it will be destroyed with all the other + Q_GLOBAL_STATICs in the reverse order of construction). In the + Q_COMPILER_THREADSAFE_STATICS case, freelist() also returns a + function-level static that is constructed on first use, so it may be + destroyed earlier than the QDBusConnectionManager object, making it + impossible to lock a contended mutex. + + We now make freelist() return a global static, so that it is always + destroyed after QDBusConnectionManager and other function-static + variables. + + Change-Id: I210fa7c18dbdf2345863da49141b9a85cffdef52 + Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> + +--- src/corelib/thread/qmutex.cpp ++++ src/corelib/thread/qmutex.cpp +@@ -571,34 +571,11 @@ const int FreeListConstants::Sizes[FreeListConstants::BlockCount] = { + + typedef QFreeList<QMutexPrivate, FreeListConstants> FreeList; + // We cannot use Q_GLOBAL_STATIC because it uses QMutex +-#if defined(Q_COMPILER_THREADSAFE_STATICS) ++static FreeList freeList_; + FreeList *freelist() + { +- static FreeList list; +- return &list; ++ return &freeList_; + } +-#else +-static QBasicAtomicPointer<FreeList> freeListPtr; +- +-FreeList *freelist() +-{ +- FreeList *local = freeListPtr.loadAcquire(); +- if (!local) { +- local = new FreeList; +- if (!freeListPtr.testAndSetRelease(0, local)) { +- delete local; +- local = freeListPtr.loadAcquire(); +- } +- } +- return local; +-} +- +-static void qFreeListDeleter() +-{ +- delete freeListPtr.load(); +-} +-Q_DESTRUCTOR_FUNCTION(qFreeListDeleter) +-#endif + } + + QMutexPrivate *QMutexPrivate::allocate() diff --git a/devel/qt5-core/files/patch-git_bfa53e1c6 b/devel/qt5-core/files/patch-git_bfa53e1c6 new file mode 100644 index 000000000000..20567e7303f8 --- /dev/null +++ b/devel/qt5-core/files/patch-git_bfa53e1c6 @@ -0,0 +1,25 @@ +From bfa53e1c67eddb14887cda37d7c89c76f4cce378 Mon Sep 17 00:00:00 2001 +From: Ralf Nolden <nolden@kde.org> +Date: Tue, 10 May 2016 16:34:37 +0200 +Subject: [PATCH] Compile fix: remove _POSIX_C_SOURCE usage + +Remove _POSIX_C_SOURCE usage as the reason why it was added is not +clear anymore and it causes compile errors on BSD systems if not +circumvented by adding further defines to re-enable function calls +hidden by the _POSIX_C_SOURCE define. (__BSD_VISIBLE on FreeBSD/OpenBSD +and _NETBSD_SOURCE on NetBSD) + +Change-Id: Ic6b49ddcd6c481b0f2acd598cea5470604e00507 +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +--- src/corelib/tools/qelapsedtimer_unix.cpp.orig 2016-02-24 20:16:34 UTC ++++ src/corelib/tools/qelapsedtimer_unix.cpp +@@ -31,9 +31,6 @@ + ** + ****************************************************************************/ + +-// ask for the latest POSIX, just in case +-#define _POSIX_C_SOURCE 200809L +- + #include "qelapsedtimer.h" + #if defined(Q_OS_VXWORKS) + #include "qfunctions_vxworks.h" diff --git a/devel/qt5-core/files/patch-git_c8c4ad0 b/devel/qt5-core/files/patch-git_c8c4ad0 deleted file mode 100644 index 134b19423b88..000000000000 --- a/devel/qt5-core/files/patch-git_c8c4ad0 +++ /dev/null @@ -1,31 +0,0 @@ -commit c8c4ad0c62cacec749b6c42e0a58339446093bba -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Sat Dec 26 02:30:58 2015 +0100 - - forkfd: Define __BSD_VISIBLE and _NETBSD_SOURCE. - - pipe2's availability on BSD operating systems depends on the - __BSD_VISIBLE macro on FreeBSD and OpenBSD and _NETBSD_SOURCE on - NetBSD (DragonFly BSD appears to define it unconditionally). - - Those two macros are generally set by default, except when - _POSIX_C_SOURCE is set. Since we consciously set _POSIX_C_SOURCE but - need pipe2, explicitly define the visibility macros. - - This fixes the -no-pch build on FreeBSD at least. - - Change-Id: Icc77f6b5d1f9a5bf7bd8048cabbb01f8f89397cc - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- src/3rdparty/forkfd/forkfd.c -+++ src/3rdparty/forkfd/forkfd.c -@@ -25,8 +25,10 @@ - - #ifndef _GNU_SOURCE - # define _GNU_SOURCE -+# define _NETBSD_SOURCE 1 - # define _POSIX_C_SOURCE 200809L - # define _XOPEN_SOURCE 700 -+# define __BSD_VISIBLE 1 - #endif - #include "forkfd.h" - diff --git a/devel/qt5-core/files/patch-git_c9998b8a b/devel/qt5-core/files/patch-git_c9998b8a new file mode 100644 index 000000000000..d9d1388b9d9b --- /dev/null +++ b/devel/qt5-core/files/patch-git_c9998b8a @@ -0,0 +1,26 @@ +From c9998b8af39bcf990f4ef9a0ff87b65574a86bfd Mon Sep 17 00:00:00 2001 +From: Thiago Macieira <thiago.macieira@intel.com> +Date: Mon, 9 May 2016 11:19:27 -0700 +Subject: [PATCH] Fix build with GCC <= 4.2 (FreeBSD 9.x) + +15b42af11123f9d1eb4bbd79870185585103ea8d changed the qt_cpu_features +variable to be an array and never fixed this #if branch of the code. + +Change-Id: Id69569111e7d4e619e22ffff144cf930f86f478e +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> +Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> +--- src/corelib/tools/qsimd.cpp.orig 2016-04-13 20:53:43 UTC ++++ src/corelib/tools/qsimd.cpp +@@ -666,7 +666,11 @@ void qDetectCpuFeatures() + // contains all the features that the code required. Qt 4 ran for years + // like that, so it shouldn't be a problem. + +- qt_cpu_features.store(minFeature | quint32(QSimdInitialized)); ++ qt_cpu_features[0].store(minFeature | quint32(QSimdInitialized)); ++#ifndef Q_ATOMIC_INT64_IS_SUPPORTED ++ qt_cpu_features[1].store(minFeature >> 32); ++#endif ++ + return; + # endif + #endif diff --git a/devel/qt5-core/pkg-plist b/devel/qt5-core/pkg-plist index e02466214e85..05a52488a67a 100644 --- a/devel/qt5-core/pkg-plist +++ b/devel/qt5-core/pkg-plist @@ -8,7 +8,9 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstracttransition_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbig5codec_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_mac_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_unix_p.h @@ -26,6 +28,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeuckrcodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_blackberry_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_cf_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_glib_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_unix_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_win_p.h @@ -47,9 +50,11 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_polling_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_win_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfinalstate_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfreelist_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_iterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfunctions_fake_env_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfunctions_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutureinterface_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h @@ -146,7 +151,6 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qutfcodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qversionnumber_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowscodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h @@ -241,6 +245,7 @@ %%QT_INCDIR%%/QtCore/QHash %%QT_INCDIR%%/QtCore/QHashData %%QT_INCDIR%%/QtCore/QHashDummyValue +%%QT_INCDIR%%/QtCore/QHashFunctions %%QT_INCDIR%%/QtCore/QHashIterator %%QT_INCDIR%%/QtCore/QHashNode %%QT_INCDIR%%/QtCore/QHistoryState @@ -295,9 +300,6 @@ %%QT_INCDIR%%/QtCore/QMetaObject %%QT_INCDIR%%/QtCore/QMetaProperty %%QT_INCDIR%%/QtCore/QMetaType -%%QT_INCDIR%%/QtCore/QMetaTypeId -%%QT_INCDIR%%/QtCore/QMetaTypeId2 -%%QT_INCDIR%%/QtCore/QMetaTypeIdQObject %%QT_INCDIR%%/QtCore/QMimeData %%QT_INCDIR%%/QtCore/QMimeDatabase %%QT_INCDIR%%/QtCore/QMimeType @@ -413,6 +415,7 @@ %%QT_INCDIR%%/QtCore/QTranslator %%QT_INCDIR%%/QtCore/QTypeInfo %%QT_INCDIR%%/QtCore/QTypeInfoMerger +%%QT_INCDIR%%/QtCore/QTypeInfoQuery %%QT_INCDIR%%/QtCore/QUnhandledException %%QT_INCDIR%%/QtCore/QUrl %%QT_INCDIR%%/QtCore/QUrlQuery @@ -427,6 +430,7 @@ %%QT_INCDIR%%/QtCore/QVariantMap %%QT_INCDIR%%/QtCore/QVector %%QT_INCDIR%%/QtCore/QVectorIterator +%%QT_INCDIR%%/QtCore/QVersionNumber %%QT_INCDIR%%/QtCore/QWaitCondition %%QT_INCDIR%%/QtCore/QWeakPointer %%QT_INCDIR%%/QtCore/QWinEventNotifier @@ -482,7 +486,6 @@ %%QT_INCDIR%%/QtCore/qatomic_cxx11.h %%QT_INCDIR%%/QtCore/qatomic_gcc.h %%QT_INCDIR%%/QtCore/qatomic_ia64.h -%%QT_INCDIR%%/QtCore/qatomic_mips.h %%QT_INCDIR%%/QtCore/qatomic_msvc.h %%QT_INCDIR%%/QtCore/qatomic_unix.h %%QT_INCDIR%%/QtCore/qatomic_x86.h @@ -543,6 +546,7 @@ %%QT_INCDIR%%/QtCore/qglobal.h %%QT_INCDIR%%/QtCore/qglobalstatic.h %%QT_INCDIR%%/QtCore/qhash.h +%%QT_INCDIR%%/QtCore/qhashfunctions.h %%QT_INCDIR%%/QtCore/qhistorystate.h %%QT_INCDIR%%/QtCore/qidentityproxymodel.h %%QT_INCDIR%%/QtCore/qiodevice.h @@ -651,6 +655,8 @@ %%QT_INCDIR%%/QtCore/qvariantanimation.h %%QT_INCDIR%%/QtCore/qvarlengtharray.h %%QT_INCDIR%%/QtCore/qvector.h +%%QT_INCDIR%%/QtCore/qversionnumber.h +%%QT_INCDIR%%/QtCore/qversiontagging.h %%QT_INCDIR%%/QtCore/qwaitcondition.h %%QT_INCDIR%%/QtCore/qwineventnotifier.h %%QT_INCDIR%%/QtCore/qxmlstream.h diff --git a/devel/qt5-designer/files/patch-src__src.pro b/devel/qt5-designer/files/patch-src__src.pro index 42398d73a6f4..5437aa947ab1 100644 --- a/devel/qt5-designer/files/patch-src__src.pro +++ b/devel/qt5-designer/files/patch-src__src.pro @@ -1,11 +1,11 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro +--- src/src.pro.orig 2016-02-25 20:24:46 UTC +++ src/src.pro -@@ -1,37 +1,2 @@ +@@ -1,38 +1,3 @@ TEMPLATE = subdirs -- + -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") @@ -20,6 +20,7 @@ missing dependencies. -} - -SUBDIRS += linguist \ +- qdoc \ - qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - diff --git a/devel/qt5-designer/pkg-plist b/devel/qt5-designer/pkg-plist index 19e16ee8940b..82bcaa412f84 100644 --- a/devel/qt5-designer/pkg-plist +++ b/devel/qt5-designer/pkg-plist @@ -199,5 +199,4 @@ %%QT_PLUGINDIR%%/designer/libqwebview.so %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug libdata/pkgconfig/Qt5Designer.pc -libdata/pkgconfig/Qt5DesignerComponents.pc share/pixmaps/designer-qt5.png diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile index 261774515ff2..94aba6838f02 100644 --- a/devel/qt5-help/Makefile +++ b/devel/qt5-help/Makefile @@ -2,7 +2,6 @@ PORTNAME= help DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-help/files/patch-src__src.pro b/devel/qt5-help/files/patch-src__src.pro index cb146d87d743..1fe22afc0443 100644 --- a/devel/qt5-help/files/patch-src__src.pro +++ b/devel/qt5-help/files/patch-src__src.pro @@ -1,11 +1,11 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro +--- src/src.pro.orig 2016-02-25 17:34:05 UTC +++ src/src.pro -@@ -1,37 +1,2 @@ +@@ -1,38 +1,3 @@ TEMPLATE = subdirs -- + -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") @@ -20,6 +20,7 @@ missing dependencies. -} - -SUBDIRS += linguist \ +- qdoc \ - qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - diff --git a/devel/qt5-linguist/files/patch-src__src.pro b/devel/qt5-linguist/files/patch-src__src.pro index 8739f1fd7d96..24011e5c9339 100644 --- a/devel/qt5-linguist/files/patch-src__src.pro +++ b/devel/qt5-linguist/files/patch-src__src.pro @@ -1,11 +1,11 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro +--- src/src.pro.orig 2016-02-25 20:36:57 UTC +++ src/src.pro -@@ -1,37 +1,2 @@ +@@ -1,38 +1,3 @@ TEMPLATE = subdirs -- + -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") @@ -20,6 +20,7 @@ missing dependencies. -} - -SUBDIRS += linguist \ +- qdoc \ - qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - diff --git a/devel/qt5-linguisttools/files/patch-src__src.pro b/devel/qt5-linguisttools/files/patch-src__src.pro index 8739f1fd7d96..976ab9f60dfe 100644 --- a/devel/qt5-linguisttools/files/patch-src__src.pro +++ b/devel/qt5-linguisttools/files/patch-src__src.pro @@ -1,11 +1,11 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro +--- src/src.pro.orig 2016-02-25 17:37:24 UTC +++ src/src.pro -@@ -1,37 +1,2 @@ +@@ -1,38 +1,3 @@ TEMPLATE = subdirs -- + -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") @@ -20,6 +20,7 @@ missing dependencies. -} - -SUBDIRS += linguist \ +- qdoc \ - qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - diff --git a/devel/qt5-location/files/patch-qtlocation.pro b/devel/qt5-location/files/patch-qtlocation.pro deleted file mode 100644 index 71fd09e7f60b..000000000000 --- a/devel/qt5-location/files/patch-qtlocation.pro +++ /dev/null @@ -1,12 +0,0 @@ -Do not look for Geoclue, it brings some additional glib-related dependencies -that are not worth it, given that in Qt 5.6 it is no longer a dependency. - ---- qtlocation.pro.orig 2016-01-20 16:52:51 UTC -+++ qtlocation.pro -@@ -1,6 +1,4 @@ - load(configure) --qtCompileTest(geoclue) --qtCompileTest(geoclue-satellite) - qtCompileTest(gypsy) - - load(qt_parts) diff --git a/devel/qt5-location/pkg-plist b/devel/qt5-location/pkg-plist index 1756d5ff2106..bf3d0272f104 100644 --- a/devel/qt5-location/pkg-plist +++ b/devel/qt5-location/pkg-plist @@ -1,3 +1,4 @@ +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qabstractgeotilecache_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qcache3q_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameracapabilities_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameradata_p.h @@ -5,6 +6,7 @@ %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodereply_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodingmanager_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodingmanagerengine_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeofiletilecache_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaneuver_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomap_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomap_p_p.h @@ -23,7 +25,6 @@ %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanager_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanagerengine_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoserviceprovider_p.h -%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilecache_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmappingmanagerengine_p.h @@ -152,8 +153,10 @@ %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoprojection_p.h %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoshape_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationdata_simulator_p.h %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationutils_p.h %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qnmeapositioninfosource_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qpositioningglobal_p.h %%QT_INCDIR%%/QtPositioning/QGeoAddress %%QT_INCDIR%%/QtPositioning/QGeoAreaMonitorInfo %%QT_INCDIR%%/QtPositioning/QGeoAreaMonitorSource @@ -194,6 +197,7 @@ %%QT_LIBDIR%%/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake %%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5PositioningConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5PositioningConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake %%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake %%QT_LIBDIR%%/libQt5Location.prl %%QT_LIBDIR%%/libQt5Location.so @@ -217,6 +221,8 @@ %%DEBUG%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_nokia.so.debug %%QT_PLUGINDIR%%/geoservices/libqtgeoservices_osm.so %%DEBUG%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_osm.so.debug +%%QT_PLUGINDIR%%/position/libqtposition_geoclue.so +%%DEBUG%%%%QT_PLUGINDIR%%/position/libqtposition_geoclue.so.debug %%QT_PLUGINDIR%%/position/libqtposition_positionpoll.so %%DEBUG%%%%QT_PLUGINDIR%%/position/libqtposition_positionpoll.so.debug %%QT_QMLDIR%%/QtLocation/libdeclarative_location.so diff --git a/devel/qt5-qdbus/files/patch-src_src.pro b/devel/qt5-qdbus/files/patch-src_src.pro new file mode 100644 index 000000000000..4c0f1824b7bf --- /dev/null +++ b/devel/qt5-qdbus/files/patch-src_src.pro @@ -0,0 +1,42 @@ +--- src/src.pro.orig 2016-02-25 18:49:47 UTC ++++ src/src.pro +@@ -1,38 +1,3 @@ + TEMPLATE = subdirs + +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist \ +- qdoc \ +- qtplugininfo +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- macdeployqt \ +-) ++SUBDIRS = qdbus diff --git a/devel/qt5-qdbusviewer/files/patch-src__src.pro b/devel/qt5-qdbusviewer/files/patch-src__src.pro index 94111058c4af..5bbefecce376 100644 --- a/devel/qt5-qdbusviewer/files/patch-src__src.pro +++ b/devel/qt5-qdbusviewer/files/patch-src__src.pro @@ -1,11 +1,11 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro +--- src/src.pro.orig 2016-02-24 21:41:26 UTC +++ src/src.pro -@@ -1,37 +1,2 @@ +@@ -1,38 +1,3 @@ TEMPLATE = subdirs -- + -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") @@ -20,6 +20,7 @@ missing dependencies. -} - -SUBDIRS += linguist \ +- qdoc \ - qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - diff --git a/devel/qt5-qdoc-data/Makefile b/devel/qt5-qdoc-data/Makefile new file mode 100644 index 000000000000..b885e7edb8b2 --- /dev/null +++ b/devel/qt5-qdoc-data/Makefile @@ -0,0 +1,38 @@ +# $FreeBSD$ + +# While this port is part of the Qt distribution itself, we do not set +# QT_DIST=yes because it brings in several patches and targets that are not +# needed; this port only installs some static files. + +PORTNAME= qdoc-data +DISTVERSION= ${QT5_VERSION} +CATEGORIES= devel textproc +MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/submodules/ +PKGNAMEPREFIX= qt5- +DISTNAME= qtbase-opensource-src-${QT5_VERSION} +DIST_SUBDIR= KDE/Qt/${QT5_VERSION} + +MAINTAINER= kde@FreeBSD.org +COMMENT= QDoc configuration files + +LICENSE= GFDL +LICENSE_FILE= ${WRKSRC}/LICENSE.FDL + +USES= tar:xz +USE_QT5= # empty + +EXTRACT_AFTER_ARGS= --include ${DISTNAME}/LICENSE.FDL \ + --include ${DISTNAME}/doc + +NO_ARCH= yes +NO_BUILD= yes + +DESCR= ${.CURDIR:H:H}/devel/qt5/pkg-descr +DISTINFO_FILE= ${.CURDIR:H:H}/devel/qt5/distinfo + +do-install: + ${MKDIR} ${STAGEDIR}${QT_DOCDIR} && \ + cd ${WRKSRC}/doc/global && \ + ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/${QT_DOCDIR_REL}/global + +.include <bsd.port.mk> diff --git a/devel/qt5-qdoc/pkg-plist b/devel/qt5-qdoc-data/pkg-plist index bc2ca3dfe575..c43b1b2f3186 100644 --- a/devel/qt5-qdoc/pkg-plist +++ b/devel/qt5-qdoc-data/pkg-plist @@ -1,4 +1,3 @@ -%%QT_BINDIR%%/qdoc %%QT_DOCDIR%%/global/compat.qdocconf %%QT_DOCDIR%%/global/config.qdocconf %%QT_DOCDIR%%/global/externalsites.qdocconf @@ -17,6 +16,7 @@ %%QT_DOCDIR%%/global/macros.qdocconf %%QT_DOCDIR%%/global/manifest-meta.qdocconf %%QT_DOCDIR%%/global/qt-cpp-defines.qdocconf +%%QT_DOCDIR%%/global/qt-html-templates-offline-simple.qdocconf %%QT_DOCDIR%%/global/qt-html-templates-offline.qdocconf %%QT_DOCDIR%%/global/qt-html-templates-online.qdocconf %%QT_DOCDIR%%/global/qt-module-defaults-offline.qdocconf @@ -69,6 +69,8 @@ %%QT_DOCDIR%%/global/template/style/icomoon.ttf %%QT_DOCDIR%%/global/template/style/icomoon.woff %%QT_DOCDIR%%/global/template/style/list_arrow.png +%%QT_DOCDIR%%/global/template/style/list_expand.png +%%QT_DOCDIR%%/global/template/style/offline-simple.css %%QT_DOCDIR%%/global/template/style/offline.css %%QT_DOCDIR%%/global/template/style/online.css %%QT_DOCDIR%%/global/template/style/theqtcompany.png diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile index 5dade08a58d8..eee3e4e3c0fe 100644 --- a/devel/qt5-qdoc/Makefile +++ b/devel/qt5-qdoc/Makefile @@ -2,26 +2,19 @@ PORTNAME= qdoc DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel textproc PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation generator -USE_QT5= core xml buildtools_build qmake_build -QT_DIST= base -HAS_CONFIGURE= yes -CONFIGURE_ARGS= -no-dbus -no-gui -no-xcb +USE_QT5= core qml buildtools_build qdoc-data_run +QT_DIST= tools +USES= qmake -BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -QT_DOCDIR= ${PREFIX}/share/doc/qt5 - -post-install: - ${MKDIR} ${STAGEDIR}${QT_DOCDIR} && \ - cd ${WRKSRC}/doc/global && \ - ${COPYTREE_SHARE} \* ${STAGEDIR}${QT_DOCDIR}/global +PLIST_FILES= ${QT_BINDIR}/qdoc .include <bsd.port.mk> diff --git a/devel/qt5-qdoc/files/patch-src_src.pro b/devel/qt5-qdoc/files/patch-src_src.pro new file mode 100644 index 000000000000..243c967ab844 --- /dev/null +++ b/devel/qt5-qdoc/files/patch-src_src.pro @@ -0,0 +1,45 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro.orig 2016-07-23 14:50:14 UTC ++++ src/src.pro +@@ -1,38 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist \ +- qdoc \ +- qtplugininfo +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- macdeployqt \ +-) ++SUBDIRS = qdoc diff --git a/devel/qt5-testlib/pkg-plist b/devel/qt5-testlib/pkg-plist index bd9027f6f1f5..e56f4ccf03f0 100644 --- a/devel/qt5-testlib/pkg-plist +++ b/devel/qt5-testlib/pkg-plist @@ -62,6 +62,7 @@ %%QT_INCDIR%%/QtTest/qtesttouch.h %%QT_INCDIR%%/QtTest/qttestversion.h %%QT_LIBDIR%%/cmake/Qt5Test/Qt5TestConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5Test/Qt5TestConfigExtras.cmake %%QT_LIBDIR%%/cmake/Qt5Test/Qt5TestConfigVersion.cmake %%QT_LIBDIR%%/libQt5Test.prl %%QT_LIBDIR%%/libQt5Test.so diff --git a/devel/qt5-uitools/files/patch-src__src.pro b/devel/qt5-uitools/files/patch-src__src.pro index 42398d73a6f4..fa932b913ebd 100644 --- a/devel/qt5-uitools/files/patch-src__src.pro +++ b/devel/qt5-uitools/files/patch-src__src.pro @@ -1,11 +1,11 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro +--- src/src.pro.orig 2016-02-24 21:32:05 UTC +++ src/src.pro -@@ -1,37 +1,2 @@ +@@ -1,38 +1,3 @@ TEMPLATE = subdirs -- + -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") @@ -20,6 +20,7 @@ missing dependencies. -} - -SUBDIRS += linguist \ +- qdoc \ - qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - diff --git a/devel/qt5/Makefile b/devel/qt5/Makefile index dcb91f44bb76..380858bf84c0 100644 --- a/devel/qt5/Makefile +++ b/devel/qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= qt5 DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org diff --git a/devel/qt5/distinfo b/devel/qt5/distinfo index 30eb243e820d..a64153c03af9 100644 --- a/devel/qt5/distinfo +++ b/devel/qt5/distinfo @@ -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 = 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 diff --git a/devel/qt5/files/extrapatch-config.tests-unix-compile.test b/devel/qt5/files/extrapatch-config.tests-unix-compile.test index 2046425ad53c..42917502119d 100644 --- a/devel/qt5/files/extrapatch-config.tests-unix-compile.test +++ b/devel/qt5/files/extrapatch-config.tests-unix-compile.test @@ -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="" diff --git a/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro b/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro new file mode 100644 index 000000000000..2995cf3fef3d --- /dev/null +++ b/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro @@ -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 diff --git a/devel/qt5/files/extrapatch-libtool b/devel/qt5/files/extrapatch-libtool index fccea74b0530..8a9328edd73b 100644 --- a/devel/qt5/files/extrapatch-libtool +++ b/devel/qt5/files/extrapatch-libtool @@ -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: \ |