SVN commit 10442 by rakuco: Merge ^/branches/qt-5.3 back into trunk.
Qt 5.3.2 should be ready for use after 44 commits in the work branch. Note that things are not fully working until r10438. Use `svn log -g' to see the commits made in the branch when looking at the commit history. Most relevant changes: * mkspecs/freebsd-clang is now based on mkspecs/unsupported/freebsd-clang from upstream. * devel/qt5-qmldevtools has been merged into lang/qt5-qml. * -I${LOCALBASE}/include and -L${LOCALBASE}/lib are now passed implicitly to the compiler and linker via the CPATH and LIBRARY_PATH environment variables, otherwise upgrading Qt fails because the existing libraries are used instead of the ones being built (ports/194088). * qmake is called from the root of the Qt5 ports. Calling it from a subdirectory of the tree does not work anymore, and it also allows us to simplify the qmake invocation code in Mk/bsd.qt.mk. * qt5-imageformats now supports the JPEG2000, WEBP, Direct Draw Surface and ICNS formats. M svn:mergeinfo _M . (directory) MM +1 -0 MOVED-area51 _M QT (directory) MM +13 -0 QT/Mk/Uses/qmake.mk M +31 -21 QT/Mk/bsd.qt.mk M +8 -12 QT/devel/qmake5/Makefile D QT/devel/qmake5/files/patch-mkspecs__common__clang-unix.conf M +1 -9 QT/devel/qmake5/files/patch-mkspecs__common__freebsd.conf M +6 -6 QT/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf M +4 -9 QT/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf A QT/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf branches/qt-5.3/QT/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf#10441 M +41 -3 QT/devel/qmake5/pkg-plist M +2 -4 QT/devel/qt5-assistant/Makefile A QT/devel/qt5-assistant/files (directory) M +0 -1 QT/devel/qt5-core/Makefile D QT/devel/qt5-core/files (directory) M +11 -9 QT/devel/qt5-core/pkg-plist M +4 -3 QT/devel/qt5-designer/Makefile A QT/devel/qt5-designer/files (directory) M +4 -0 QT/devel/qt5-designer/pkg-plist M +2 -5 QT/devel/qt5-help/Makefile A QT/devel/qt5-help/files (directory) M +1 -0 QT/devel/qt5-help/pkg-plist M +3 -6 QT/devel/qt5-linguist/Makefile A QT/devel/qt5-linguist/files (directory) M +5 -11 QT/devel/qt5-linguisttools/Makefile M +2 -1 QT/devel/qt5-qdbus/Makefile M +3 -2 QT/devel/qt5-qdbusviewer/Makefile A QT/devel/qt5-qdbusviewer/files (directory) D QT/devel/qt5-qmldevtools (directory) M +2 -1 QT/devel/qt5-scripttools/Makefile M +1 -0 QT/devel/qt5-testlib/pkg-plist M +2 -1 QT/devel/qt5-uitools/Makefile A QT/devel/qt5-uitools/files (directory) M +34 -34 QT/devel/qt5/distinfo M +181 -2 QT/devel/qt5/files/extrapatch-configure M +8 -8 QT/devel/qt5/files/extrapatch-libtool M +4 -2 QT/graphics/qt5-imageformats/Makefile M +12 -0 QT/graphics/qt5-imageformats/pkg-plist M +1 -0 QT/graphics/qt5-opengl/pkg-plist M +2 -5 QT/graphics/qt5-pixeltool/Makefile A QT/graphics/qt5-pixeltool/files (directory) M +2 -1 QT/graphics/qt5-svg/pkg-plist M +8 -2 QT/lang/qt5-qml/Makefile D QT/lang/qt5-qml/files/patch-jsruntime__qv4alloca_p.h D QT/lang/qt5-qml/files/patch-jsruntime__qv4engine.cpp D QT/lang/qt5-qml/files/patch-jsruntime__qv4mm.cpp A QT/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp branches/qt-5.3/QT/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp#10441 A QT/lang/qt5-qml/files/patch-src__src.pro branches/qt-5.3/QT/lang/qt5-qml/files/patch-src__src.pro#10441 M +22 -7 QT/lang/qt5-qml/pkg-plist M +0 -7 QT/multimedia/qt5-multimedia/Makefile M +28 -6 QT/multimedia/qt5-multimedia/pkg-plist M +4 -0 QT/net/qt5-network/pkg-plist M +4 -0 QT/print/qt5-printsupport/pkg-plist M +2 -2 QT/textproc/clucene-qt5/Makefile M +2 -2 QT/textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp A QT/textproc/clucene-qt5/files/patch-src__assistant__assistant.pro branches/qt-5.3/QT/textproc/clucene-qt5/files/patch-src__assistant__assistant.pro#10441 A QT/textproc/clucene-qt5/files/patch-src__src.pro branches/qt-5.3/QT/textproc/clucene-qt5/files/patch-src__src.pro#10441 M +1 -0 QT/textproc/qt5-xml/pkg-plist M +1 -0 QT/www/webkit-qt5/pkg-plist M +3 -0 QT/x11-toolkits/qt5-declarative/pkg-plist M +0 -11 QT/x11-toolkits/qt5-gui/Makefile D QT/x11-toolkits/qt5-gui/files (directory) M +18 -0 QT/x11-toolkits/qt5-gui/pkg-plist M +1 -15 QT/x11-toolkits/qt5-quick/Makefile A QT/x11-toolkits/qt5-quick/files (directory) M +22 -40 QT/x11-toolkits/qt5-quick/pkg-plist M +48 -1 QT/x11-toolkits/qt5-quickcontrols/pkg-plist M +0 -6 QT/x11-toolkits/qt5-widgets/Makefile M +3 -1 QT/x11-toolkits/qt5-widgets/pkg-plist M +7 -0 QT/x11/qt5-qev/Makefile _______________________________________________ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information