4c67812e01
This is the latest stable release at time of writing. Release announcement: http://blog.qt.io/blog/2015/07/01/qt-5-5-released/ New features in Qt 5.5: https://wiki.qt.io/New_Features_in_Qt_5.5 As usual, huge thanks to Tobias Berner (tcberner@gmail.com) for all his work on these ports in kde@'s experimental area51 repository. He's the one who started the update and did a lot of the initial work on Qt 5.5. Ralf Nolden (nolden@kde.org) has contributed the initial version of most of our new Qt5 ports. Also thanks to Yuri Victorovich (yuri@rawbw.com) for contributing PR 205805 with his own patch for the 5.5.1 update. Some of his changes there prompted additional fixes and changes present in the final patch generated from our experimental repository. New ports: - comms/qt5-connectivity, comms/qt5-sensors, devel/qt5-location, graphics/qt5-3d, net/qt5-enginio, x11-toolkits/qt5-canvas3d, x11-toolkits/qt5-uiplugin. General changes in all Qt5 ports: - All Qt5 ports are now built with -Wl,--as-needed to avoid overlinking, which is a problem with qmake-based because the libraries passed to the linker come from the modules .pri files and many are not necessary. - With this change, several ports had their USE_QT5 lines adjusted to explicitly include some libraries that were pulled in implicitly, and to exclude libraries no longer required with -Wl,--as-needed. Changes in specific ports: - devel/qt5: Drop the SQL_PLUGINS and TOOLS options and depend on all Qt5 ports by default. It makes the Makefile much simpler, and those options were already on by default. - devel/qt5-core: The clang+base libstdc++ workaround has been expanded and more C++11 features have been disabled when that combination is used by a port (basically, FreeBSD 9 with USES=compiler:c++11-lang). The disabled features have explanations for why they were disabled in the patched header itself. - devel/qt5-designer: uiplugins has been split out following a similar change upstream. By depending on qt5-uiplugin, qt5-uitools avoids having to depend on the big qt5-designer port. - multimedia/qt5-multimedia: The port now uses GStreamer 1.0 instead of 0.10. - net/qt5-network: The port now depends on libproxy for proxy settings. Using libproxy allows proxy settings to be read from different sources, and also allows .pac files to work with Qt. - www/qt5-webkit: The port now uses GStreamer 1.0 instead of 0.10. PR: 205805 PR: 206435
43 lines
1.5 KiB
Text
43 lines
1.5 KiB
Text
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"
|
|
|