5 нояб. 2016 г. 15:11 пользователь "Rafael Sadowski" <raf...@sizeofvoid.org>
написал:
>
> Hi ports@,
>
> I'm working with x11/qt5 port and I realized outdated patches.
Yes, I've skipped those nonfunctional updates to lower the noise level of
qt5 update.
REVISION bumps are not needed, as it was already mentioned.
> Kind regards,
>
> Rafael
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/qt5/Makefile,v
> retrieving revision 1.54
> diff -u -p -u -p -r1.54 Makefile
> --- Makefile 23 Sep 2016 15:22:49 -0000 1.54
> +++ Makefile 5 Nov 2016 12:09:28 -0000
> @@ -19,19 +19,21 @@ COMMENT-sqlite2 = SQLite 2.x plugin for
> COMMENT-tds = TDS plugin for Qt5
>
> PKGNAME-main = qt5-${VERSION}
> -REVISION-main = 3
> +REVISION-main = 4
> PKGNAME-examples = qt5-examples-${VERSION}
> -REVISION-examples = 0
> +REVISION-examples = 1
> PKGNAME-html = qt5-html-${VERSION}
> PKGNAME-mysql = qt5-mysql-${VERSION}
> -REVISION-mysql = 0
> +REVISION-mysql = 1
> PKGNAME-psql = qt5-postgresql-${VERSION}
> -REVISION-psql = 0
> +REVISION-psql = 1
> PKGNAME-qch = qt5-qch-${VERSION}
> PKGNAME-sqlite2 = qt5-sqlite2-${VERSION}
> -REVISION-sqlite2 = 0
> +REVISION-sqlite2 = 1
> PKGNAME-tds = qt5-tds-${VERSION}
> -REVISION-tds = 0
> +REVISION-tds = 1
> +REVISION-html = 0
> +REVISION-qch = 0
>
> PKG_ARCH-html = *
> PKG_ARCH-qch = *
> Index:
patches/patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp
> ===================================================================
> RCS file:
/cvs/ports/x11/qt5/patches/patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3
patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp
> --- patches/patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp
22 Feb 2016 20:38:08 -0000 1.3
> +++ patches/patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp
5 Nov 2016 12:09:28 -0000
> @@ -1,9 +1,9 @@
> $OpenBSD: patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp,v
1.3 2016/02/22 20:38:08 zhuk Exp $
> 1. Fix for cases of >1024 open files:
https://bugreports.qt.io/browse/QTBUG-51274
> 2. Unbreak compilation (EPROTO).
> ---- qtbase/src/network/socket/qnativesocketengine_unix.cpp.ports.orig
Tue Feb 17 07:56:38 2015
> -+++ qtbase/src/network/socket/qnativesocketengine_unix.cpp Sun Feb
21 23:42:16 2016
> -@@ -42,6 +42,7 @@
> +--- qtbase/src/network/socket/qnativesocketengine_unix.cpp.ports.orig
Tue Oct 13 06:35:28 2015
> ++++ qtbase/src/network/socket/qnativesocketengine_unix.cpp Sat Nov
5 13:05:16 2016
> +@@ -43,6 +43,7 @@
> #include <time.h>
> #include <errno.h>
> #include <fcntl.h>
> @@ -11,7 +11,7 @@ $OpenBSD: patch-qtbase_src_network_socke
> #ifndef QT_NO_IPV6IFNAME
> #include <net/if.h>
> #endif
> -@@ -622,7 +623,9 @@ int QNativeSocketEnginePrivate::nativeAccept()
> +@@ -589,7 +590,9 @@ int QNativeSocketEnginePrivate::nativeAccept()
> setError(QAbstractSocket::SocketResourceError,
NotSocketErrorString);
> break;
> case EPROTONOSUPPORT:
> @@ -21,7 +21,7 @@ $OpenBSD: patch-qtbase_src_network_socke
> case EAFNOSUPPORT:
> case EINVAL:
> setError(QAbstractSocket::UnsupportedSocketOperationError,
ProtocolUnsupportedErrorString);
> -@@ -1192,48 +1195,31 @@ int QNativeSocketEnginePrivate::nativeSelect(int
timeo
> +@@ -1150,48 +1153,31 @@ int QNativeSocketEnginePrivate::nativeSelect(int
timeo
>
> int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool
selectForRead) const
> {
>
