[vlc-commits] contrib: gnutls: Drop connectx patch

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Feb 16 12:25:50 2019 +0100| [dae2fff630562c5838098cb13cb6227a5ce05508] | committer: David Fuhrmann

contrib: gnutls: Drop connectx patch

connectx is available since macOS 10.11 and iOS 9, so this is not
needed anymore.

Note, this cannot be backported to 3.0 branch.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dae2fff630562c5838098cb13cb6227a5ce05508
---

 contrib/src/gnutls/gnutls-disable-connectx-macos.patch | 12 ------------
 contrib/src/gnutls/rules.mak                           |  3 ---
 2 files changed, 15 deletions(-)

diff --git a/contrib/src/gnutls/gnutls-disable-connectx-macos.patch b/contrib/src/gnutls/gnutls-disable-connectx-macos.patch
deleted file mode 100644
index 47ca4226be..0000000000
--- a/contrib/src/gnutls/gnutls-disable-connectx-macos.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gnutls/lib/system/fastopen.c	2017-12-26 18:00:54.041282870 +0100
-+++ gnutls/lib/system/fastopen.c.new	2017-12-26 18:00:09.209281540 +0100
-@@ -36,7 +36,8 @@
- #endif
- 
- /* TCP Fast Open on OSX behaves differently from Linux, so define these helpers */
--#if defined __APPLE__ && defined __MACH__ && defined CONNECT_DATA_IDEMPOTENT && defined CONNECT_RESUME_ON_READ_WRITE
-+#if 0
-+// defined __APPLE__ && defined __MACH__ && defined CONNECT_DATA_IDEMPOTENT && defined CONNECT_RESUME_ON_READ_WRITE
- # define TCP_FASTOPEN_OSX
- #elif defined TCP_FASTOPEN && defined MSG_FASTOPEN
- # define TCP_FASTOPEN_LINUX
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index fb3f6901df..cc1a82d3ea 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -26,9 +26,6 @@ endif
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/gnutls/no-create-time-h.patch
 endif
-ifdef HAVE_MACOSX
-	$(APPLY) $(SRC)/gnutls/gnutls-disable-connectx-macos.patch
-endif
 	$(call pkg_static,"lib/gnutls.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)