[libvirt] [PATCH] build: work around gcc 6.0 warnings

[Peter Krempa]

On Thu, Feb 25, 2016 at 09:52:12 +0100, Andrea Bolognani wrote:
> On Thu, 2016-02-25 at 09:22 +0100, Michal Privoznik wrote:
> > I'm having some difficulties applying this:
> > 
> > 
> > Applying: build: work around gcc 6.0 warnings
> > Using index info to reconstruct a base tree...
> > error: patch failed: src/fdstream.c:1
> > error: src/fdstream.c: patch does not apply
> > Did you hand edit your patch?
> > It does not apply to blobs recorded in its index.
> > Cannot fall back to three-way merge.
> > Patch failed at 0001 build: work around gcc 6.0 warnings
> > 
> > Could it be that my git is 'only' 2.4.10 while yours is 2.5.0?
> 
> That's probably not it, I have 2.5.0 and I get the same
> error when trying to apply it with 'git am'.

Well, simply the patch context is broken in the first hunk:

The first hunk in the mail:

diff --git a/src/fdstream.c b/src/fdstream.c
index a85cf9d..1c34321 100644
--- a/src/fdstream.c
+++ b/src/fdstream.c
@@ -1,7 +1,7 @@
 /*
  * fdstream.c: generic streams impl for file descriptors
  *
- * Copyright (C) 2009-2012, 2014, 2016 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014, 2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public


While the top of src/fdstream.c:

/*
 * fdstream.c: generic streams impl for file descriptors
 *
 * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *

So the first hunk in the patch either changes a whitespace that is not
visible or was edited manually and is wrong. Additionally it does not
match the context in the file.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20160225/16dfc0d1/attachment-0001.sig>