diff options
author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-09-17 09:46:54 +0000 |
---|---|---|
committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-09-17 09:46:54 +0000 |
commit | 3346021972b58ae3975cf109e41beb4d895dd577 (patch) | |
tree | ff6682b425056cf66ba4ca415211efb1b19cc258 /graphics/qt5-3d/files | |
parent | Fix typo in the entry from 20160914. (diff) |
Update the Qt5 ports to 5.6.1.
This took longer than expected, but there are quite a few changes to the
existing ports and a few new ones.
General upstream changes:
- Starting with Qt 5.6.2, Qt will fail at configuration time if LibreSSL is
being used. According to the discussion here:
https://codereview.qt-project.org/#/c/154800/
The Qt project is not opposed to LibreSSL, but does not want to mix
support for it into the OpenSSL backend code, especially as they move
towards supporting OpenSSL 1.1.
People interested in LibreSSL support are welcome to submit a separate
backend upstream, but are expected to maintain it. We (kde@) are not
opposed to carrying some patches authored by others in the future, as long
as they are not huge and destabilizing.
- When Qt detects the compiler supports C++11, it will pass -std=gnu++11 by
default (this is an upstream change). You can add "CONFIG -= c++11" to
your .pro. Qt 5.7 will require C++11.
- www/webkit-qt5: The QtWebKit module is deprecated upstream, and is shipped
separately as a community release tarball. kde@ does not have an ETA for a
qt5-webengine port, as it requires a huge effort (and number of patches)
similar to maintaining www/chromium itself.
- x11-toolkits/qt5-declarative has been deprecated upstream. The last
release is 5.5.1.
Relevant changes:
- devel/qmake5: The freebsd-clang mkspec has become the default mkspec on
FreeBSD, replacing the outdated freebsd-g++ one that was moved to
unsupported/ (it still works though).
- devel/qt5-qdoc: qdoc was moved to qttools upstream, but its data files are
still in qtbase. The data files are now in the qt5-qdoc-data port.
- misc/qt5-doc: Clean up and stop requiring a compiler and fumbling with
mkspecs. Instead of running the `configure' script, which requires a
compiler and adjustments to the mkspecs files and also ends up building a
new qmake binary, we now leverage USES=qmake to generate all the Makefiles
from the top-level qt.pro. Getting this to work requires some tricks,
though, and qt.conf.in has a longer explanation of what's being done.
Switch to USES=gmake to be able to drop MAKE_JOBS_UNSAFE=yes.
New ports:
- comms/qt5-serialbus
- devel/qt5-qdoc-data
- x11-toolkits/qt5-quickcontrols2
Big thanks to Adriaan de Groot (groot@kde.org), tcberner@ and Loise Nolden
(nolden@kde.org) for the huge amount of work they put into this
patch. Loise in particular also sent quite a few changes upstream that were
essential for this update to work.
PR: 211916
Notes
Notes:
svn path=/head/; revision=422306
Diffstat (limited to 'graphics/qt5-3d/files')
-rw-r--r-- | graphics/qt5-3d/files/patch-git_d512090 | 150 | ||||
-rw-r--r-- | graphics/qt5-3d/files/patch-git_deffdaf9 | 34 |
2 files changed, 0 insertions, 184 deletions
diff --git a/graphics/qt5-3d/files/patch-git_d512090 b/graphics/qt5-3d/files/patch-git_d512090 deleted file mode 100644 index b5948439c32b..000000000000 --- a/graphics/qt5-3d/files/patch-git_d512090 +++ /dev/null @@ -1,150 +0,0 @@ -Patch reworked for Qt 5.5. -Sent upstream: https://codereview.qt-project.org/#/c/144744/ - -commit d5120908c74133d9fd249b920cff0dc76313f43f -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Mon Dec 28 00:46:31 2015 +0100 - - Stop using enum references that require C++11. - - Use Qt::Foo instead of Qt::Enum::Foo, which is a C++11 extension. When - building with clang without -std=c++11, this results in warnings. With - older GCC versions, the code simply does not build. - - This is similar to commit deffdaf9 ("GraphicsHelper: fix switch"). - - Change-Id: I28389b90bafb3df87187742ef55267ce2df1ba1a - Reviewed-by: Sean Harmer <sean.harmer@kdab.com> - ---- src/input/q3dmouseevent.cpp -+++ src/input/q3dmouseevent.cpp -@@ -114,16 +114,16 @@ Q3DMouseEvent::~Q3DMouseEvent() - Q3DMouseEvent::Buttons Q3DMouseEvent::button() const - { - switch (m_event.button()) { -- case Qt::MouseButton::LeftButton: -- return Q3DMouseEvent::Buttons::LeftButton; -- case Qt::MouseButton::RightButton: -- return Q3DMouseEvent::Buttons::RightButton; -- case Qt::MouseButton::MiddleButton: -- return Q3DMouseEvent::Buttons::MiddleButton; -- case Qt::MouseButton::BackButton: -- return Q3DMouseEvent::Buttons::BackButton; -+ case Qt::LeftButton: -+ return Q3DMouseEvent::LeftButton; -+ case Qt::RightButton: -+ return Q3DMouseEvent::RightButton; -+ case Qt::MiddleButton: -+ return Q3DMouseEvent::MiddleButton; -+ case Qt::BackButton: -+ return Q3DMouseEvent::BackButton; - default: -- return Q3DMouseEvent::Buttons::NoButton; -+ return Q3DMouseEvent::NoButton; - } - } - -@@ -143,17 +143,17 @@ Q3DMouseEvent::Modifiers Q3DMouseEvent::modifier() const - { - switch (m_event.modifiers()) { - case Qt::ShiftModifier: -- return Q3DMouseEvent::Modifiers::ShiftModifier; -+ return Q3DMouseEvent::ShiftModifier; - case Qt::ControlModifier: -- return Q3DMouseEvent::Modifiers::ControlModifier; -+ return Q3DMouseEvent::ControlModifier; - case Qt::AltModifier: -- return Q3DMouseEvent::Modifiers::AltModifier; -+ return Q3DMouseEvent::AltModifier; - case Qt::MetaModifier: -- return Q3DMouseEvent::Modifiers::MetaModifier; -+ return Q3DMouseEvent::MetaModifier; - case Qt::KeypadModifier: -- return Q3DMouseEvent::Modifiers::KeypadModifier; -+ return Q3DMouseEvent::KeypadModifier; - default: -- return Q3DMouseEvent::Modifiers::NoModifier; -+ return Q3DMouseEvent::NoModifier; - } - } - -@@ -242,17 +242,17 @@ Q3DWheelEvent::Modifiers Q3DWheelEvent::modifier() const - { - switch (m_event.modifiers()) { - case Qt::ShiftModifier: -- return Q3DWheelEvent::Modifiers::ShiftModifier; -+ return Q3DWheelEvent::ShiftModifier; - case Qt::ControlModifier: -- return Q3DWheelEvent::Modifiers::ControlModifier; -+ return Q3DWheelEvent::ControlModifier; - case Qt::AltModifier: -- return Q3DWheelEvent::Modifiers::AltModifier; -+ return Q3DWheelEvent::AltModifier; - case Qt::MetaModifier: -- return Q3DWheelEvent::Modifiers::MetaModifier; -+ return Q3DWheelEvent::MetaModifier; - case Qt::KeypadModifier: -- return Q3DWheelEvent::Modifiers::KeypadModifier; -+ return Q3DWheelEvent::KeypadModifier; - default: -- return Q3DWheelEvent::Modifiers::NoModifier; -+ return Q3DWheelEvent::NoModifier; - } - } - ---- src/input/q3dmouseevent.h -+++ src/input/q3dmouseevent.h -@@ -59,11 +59,11 @@ class QT3DINPUTSHARED_EXPORT QMouseEvent : public QObject - - public: - enum Buttons { -- LeftButton = Qt::MouseButton::LeftButton, -- RightButton = Qt::MouseButton::RightButton, -- MiddleButton = Qt::MouseButton::MiddleButton, -- BackButton = Qt::MouseButton::BackButton, -- NoButton = Qt::MouseButton::NoButton -+ LeftButton = Qt::LeftButton, -+ RightButton = Qt::RightButton, -+ MiddleButton = Qt::MiddleButton, -+ BackButton = Qt::BackButton, -+ NoButton = Qt::NoButton - }; - Q_ENUM(Buttons) - -@@ -109,11 +109,11 @@ class QT3DINPUTSHARED_EXPORT QWheelEvent : public QObject - - public: - enum Buttons { -- LeftButton = Qt::MouseButton::LeftButton, -- RightButton = Qt::MouseButton::RightButton, -- MiddleButton = Qt::MouseButton::MiddleButton, -- BackButton = Qt::MouseButton::BackButton, -- NoButton = Qt::MouseButton::NoButton -+ LeftButton = Qt::LeftButton, -+ RightButton = Qt::RightButton, -+ MiddleButton = Qt::MiddleButton, -+ BackButton = Qt::BackButton, -+ NoButton = Qt::NoButton - }; - Q_ENUM(Buttons) - ---- src/quick3d/quick3d/items/quick3dentityloader.cpp -+++ src/quick3d/quick3d/items/quick3dentityloader.cpp -@@ -64,7 +64,7 @@ protected: - Quick3DEntityLoaderPrivate *priv = Quick3DEntityLoaderPrivate::get(m_loader); - - switch (status) { -- case Status::Ready: { -+ case Ready: { - Q_ASSERT(priv->m_entity == Q_NULLPTR); - priv->m_entity = qobject_cast<QEntity *>(object()); - Q_ASSERT(priv->m_entity != Q_NULLPTR); -@@ -73,7 +73,7 @@ protected: - break; - } - -- case Status::Error: { -+ case Error: { - QQmlEnginePrivate::warning(qmlEngine(m_loader), errors()); - priv->clear(); - emit m_loader->entityChanged(); diff --git a/graphics/qt5-3d/files/patch-git_deffdaf9 b/graphics/qt5-3d/files/patch-git_deffdaf9 deleted file mode 100644 index 7adf87c0ea8d..000000000000 --- a/graphics/qt5-3d/files/patch-git_deffdaf9 +++ /dev/null @@ -1,34 +0,0 @@ -Paths reworked for Qt 5.5. - -commit deffdaf9b14c78535a1290757d54082a51dd518f -Author: Paul Lemire <paul.lemire@kdab.com> -Date: Thu Nov 19 12:18:02 2015 +0100 - - GraphicsHelper: fix switch - - Change-Id: I9bc47d84407d1ed6fc5efd7d2acfff094855939c - Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com> - ---- src/render/backend/qgraphicscontext.cpp -+++ src/render/backend/qgraphicscontext.cpp -@@ -1032,15 +1032,15 @@ GLuint QGraphicsContext::byteSizeFromTyp - GLint QGraphicsContext::glDataTypeFromAttributeDataType(QAttribute::DataType dataType) - { - switch (dataType) { -- case QAttribute::DataType::Byte: -+ case QAttribute::Byte: - return GL_BYTE; -- case QAttribute::DataType::UnsignedByte: -+ case QAttribute::UnsignedByte: - return GL_UNSIGNED_BYTE; -- case QAttribute::DataType::Short: -+ case QAttribute::Short: - return GL_SHORT; -- case QAttribute::DataType::UnsignedShort: -+ case QAttribute::UnsignedShort: - return GL_UNSIGNED_SHORT; -- case QAttribute::DataType::Int: -+ case QAttribute::Int: - return GL_INT; - case QAttribute::UnsignedInt: - return GL_UNSIGNED_INT; |