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 /devel/qmake5/files/patch-configure | |
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 'devel/qmake5/files/patch-configure')
-rw-r--r-- | devel/qmake5/files/patch-configure | 14 |
1 files changed, 7 insertions, 7 deletions
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;} |