From 69351bc15bbb610561353731f63e62e20b2e567c Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 5 Jan 2016 07:46:19 -0500 Subject: [PATCH] subversion: Remove patch applied upstream --- ...ile_merge_c_winsize_defined_in_termios_h.patch | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 packages/subversion/file_merge_c_winsize_defined_in_termios_h.patch diff --git a/packages/subversion/file_merge_c_winsize_defined_in_termios_h.patch b/packages/subversion/file_merge_c_winsize_defined_in_termios_h.patch deleted file mode 100644 index 8e7461919..000000000 --- a/packages/subversion/file_merge_c_winsize_defined_in_termios_h.patch +++ /dev/null @@ -1,15 +0,0 @@ -When building with the Android NDK, termios.h is needed to get struct winsize defined. - -Has been accepted upstream, http://svn.haxx.se/dev/archive-2014-06/0007.shtml - -diff -u -r ../subversion-1.8.5/subversion/svn/file-merge.c ./subversion/svn/file-merge.c ---- ../subversion-1.8.5/subversion/svn/file-merge.c 2013-07-09 06:00:06.000000000 +0200 -+++ ./subversion/svn/file-merge.c 2014-02-12 09:05:48.000000000 +0100 -@@ -50,6 +50,7 @@ - - #include - #include -+#include - - /* Baton for functions in this file which implement svn_diff_output_fns_t. */ - struct file_merge_baton {