diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-10-28 13:43:14 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-10-28 13:43:14 +0000 |
| commit | ea7ceba707457f4713e302755dddec60ea73d011 (patch) | |
| tree | 7cfcdd85e2e9fd3db96642ae81d9f1a7b8b8cb04 /net/qt5-network | |
| parent | 102a98361437cd6ce8055d80c514878000e25685 (diff) | |
| download | ports-ea7ceba707457f4713e302755dddec60ea73d011.tar.gz ports-ea7ceba707457f4713e302755dddec60ea73d011.zip | |
Update Qt to 5.6.2 [1,2]
Thanks to the upstream work of Marie Loise Nolden, we could get rid of a handful
of patches, as they have been properly upstreamed. The rest of the work is just
some minor plist changes.
I would like to thank Loise <nolden@kde.org> for the upstream work, and Adriaan
<groot@kde.org> for getting the update into shape.
[1] http://blog.qt.io/blog/2016/10/12/qt-5-6-2-released/
[2] http://wiki.qt.io/Qt_5.6.2_Change_Files
PR: 213530
Exp-run by: antoine
Submitted by: Adriaan de Groot <groot@kde.org>
Reviewed by: rakuco, mat, tcberner
Approved by: rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D8228
Notes
Notes:
svn path=/head/; revision=424842
Diffstat (limited to 'net/qt5-network')
| -rw-r--r-- | net/qt5-network/files/patch-src_network_socket_qnativesocketengine__unix.cpp | 16 | ||||
| -rw-r--r-- | net/qt5-network/pkg-plist | 1 |
2 files changed, 0 insertions, 17 deletions
diff --git a/net/qt5-network/files/patch-src_network_socket_qnativesocketengine__unix.cpp b/net/qt5-network/files/patch-src_network_socket_qnativesocketengine__unix.cpp deleted file mode 100644 index ae44eed43500..000000000000 --- a/net/qt5-network/files/patch-src_network_socket_qnativesocketengine__unix.cpp +++ /dev/null @@ -1,16 +0,0 @@ -Fix the build on FreeBSD 9, which does not have LLINDEX. ---- src/network/socket/qnativesocketengine_unix.cpp.orig 2016-04-13 21:57:35 UTC -+++ src/network/socket/qnativesocketengine_unix.cpp -@@ -904,8 +904,11 @@ qint64 QNativeSocketEnginePrivate::nativ - if (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_RECVIF - && cmsgptr->cmsg_len >= CMSG_LEN(sizeof(sockaddr_dl))) { - sockaddr_dl *sdl = reinterpret_cast<sockaddr_dl *>(CMSG_DATA(cmsgptr)); -- -+# if !defined(LLINDEX) -+ header->ifindex = sdl->sdl_index; -+# else - header->ifindex = LLINDEX(sdl); -+# endif - } - # endif - #endif diff --git a/net/qt5-network/pkg-plist b/net/qt5-network/pkg-plist index b937358696af..01ffd0a0011c 100644 --- a/net/qt5-network/pkg-plist +++ b/net/qt5-network/pkg-plist @@ -44,7 +44,6 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyfileimpl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyhttpimpl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyimpl_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplynsurlconnectionimpl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequest_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworksession_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsharednetworksession_p.h |