[vlc-devel] [vlc-commits] GnuTLS: update to 3.3.22

[Rafaël Carré]

On 03/10/2016 04:35 PM, Jean-Baptiste Kempf wrote:
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Mar 10 16:31:56 2016 +0100| [c8d93f1f5fc8f9c3d2ede50b6efc6f58f933144f] | committer: Jean-Baptiste Kempf
> 
> GnuTLS: update to 3.3.22
> 
> This is a move from 3.2 to 3.3.
> EGD is reactivated
> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c8d93f1f5fc8f9c3d2ede50b6efc6f58f933144f
> ---
> 
>  contrib/src/gnutls/SHA512SUMS                 |    2 +-
>  contrib/src/gnutls/gnutls-pkgconfig-osx.patch |   12 +++++++-----
>  contrib/src/gnutls/gnutls-win32.patch         |   25 ++++---------------------
>  contrib/src/gnutls/rules.mak                  |    5 ++---
>  4 files changed, 14 insertions(+), 30 deletions(-)

You forgot to git rm the patch

> @@ -25,7 +25,6 @@ endif
>  ifdef HAVE_ANDROID
>  	$(APPLY) $(SRC)/gnutls/no-create-time-h.patch
>  endif
> -	$(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
>  	$(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
>  	$(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch
>  ifdef HAVE_MACOSX