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 /x11-toolkits/qt5-widgets/files/patch-cr-139066 | |
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 'x11-toolkits/qt5-widgets/files/patch-cr-139066')
-rw-r--r-- | x11-toolkits/qt5-widgets/files/patch-cr-139066 | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/x11-toolkits/qt5-widgets/files/patch-cr-139066 b/x11-toolkits/qt5-widgets/files/patch-cr-139066 deleted file mode 100644 index 5fe07c079254..000000000000 --- a/x11-toolkits/qt5-widgets/files/patch-cr-139066 +++ /dev/null @@ -1,40 +0,0 @@ -From 0f68f8920573cdce1729a285a92ac8582df32841 Mon Sep 17 00:00:00 2001 -From: Ulf Hermann <ulf.hermann@theqtcompany.com> -Date: Tue, 27 Oct 2015 15:25:42 +0100 -Subject: [PATCH] QtWidgets: Do hide/show via WA_OutsideWSRange for native - widgets -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If a native widget has a width or height of 0 we don't have to -invalidate its backing store as that is done by the window -system. Certain applications rely on ... interesting ... behavior -of certain window systems in this case. - -Task-number: QTBUG-48321 -Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c -Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> -Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru> -Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> -Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> ---- - src/widgets/kernel/qwidget.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp -index 7734715..4286130 100644 ---- src/widgets/kernel/qwidget.cpp -+++ src/widgets/kernel/qwidget.cpp -@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove) - - bool needsShow = false; - -- if (q->isWindow()) { -+ if (q->isWindow() || q->windowHandle()) { - if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) { - q->setAttribute(Qt::WA_OutsideWSRange, true); - if (q->isVisible() && q->testAttribute(Qt::WA_Mapped)) --- -2.8.1 - |