[vlc-commits] gnutls patch: remove "//" as it confuses BSD patch

Rafaël Carré git at videolan.org
Fri Jan 27 18:16:02 CET 2012


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jan 27 06:30:26 2012 -0500| [4ea478686cf73916974b61e03431af7309423d41] | committer: Rafaël Carré

gnutls patch: remove "//" as it confuses BSD patch

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

 contrib/src/gnutls/gnutls-no-egd.patch |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/src/gnutls/gnutls-no-egd.patch b/contrib/src/gnutls/gnutls-no-egd.patch
index 5a83f92..f4537e1 100644
--- a/contrib/src/gnutls/gnutls-no-egd.patch
+++ b/contrib/src/gnutls/gnutls-no-egd.patch
@@ -1,6 +1,6 @@
-diff -ru gnutls.orig//lib/nettle/Makefile.am gnutls//lib/nettle/Makefile.am
---- gnutls.orig//lib/nettle/Makefile.am	2011-07-19 20:25:09.000000000 +0300
-+++ gnutls//lib/nettle/Makefile.am	2011-07-19 20:25:39.000000000 +0300
+diff -ru gnutls.orig/lib/nettle/Makefile.am gnutls/lib/nettle/Makefile.am
+--- gnutls.orig/lib/nettle/Makefile.am	2011-07-19 20:25:09.000000000 +0300
++++ gnutls/lib/nettle/Makefile.am	2011-07-19 20:25:39.000000000 +0300
 @@ -35,4 +35,4 @@
  
  noinst_LTLIBRARIES = libcrypto.la
@@ -36,9 +36,9 @@ diff -ru gnutls.orig//lib/nettle/Makefile.am gnutls//lib/nettle/Makefile.am
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/init.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mac.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpi.Plo at am__quote@
-diff -ru gnutls.orig//lib/nettle/rnd.c gnutls//lib/nettle/rnd.c
---- gnutls.orig//lib/nettle/rnd.c	2011-07-19 20:25:09.000000000 +0300
-+++ gnutls//lib/nettle/rnd.c	2011-07-19 20:26:47.000000000 +0300
+diff -ru gnutls.orig/lib/nettle/rnd.c gnutls/lib/nettle/rnd.c
+--- gnutls.orig/lib/nettle/rnd.c	2011-07-19 20:25:09.000000000 +0300
++++ gnutls/lib/nettle/rnd.c	2011-07-19 20:26:47.000000000 +0300
 @@ -159,7 +159,7 @@
  #ifdef HAVE_GETRUSAGE
  #include <sys/resource.h>



More information about the vlc-commits mailing list