[Buildroot] [PATCH v1 1/3] package/libsoil: allow build using patch v2.5.9 or any later

[Buildroot] [PATCH v1 1/3] package/libsoil: allow build using patch v2.5.9 or any later

[Ricardo Martincoski]

Well-formed patch fails to apply
- patch v2.6:
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 23.
- patch v2.6.1:
can't find file to patch at input line 11
Perhaps you used the wrong -p or --strip option?
[snap]
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
Patch failed!  Please fix 0001-fix-makefile.patch!

The mandatory build tool "patch" versions v2.5.9, v2.6 and v2.6.1
cannot handle diff v3.3 output when there are spaces in filenames.
The same does not occur using "patch" v2.7 or any later.

Workaround: patch with spaces in filename must be hand-edited to
remove the double quotes from the filename to support old versions
of the tool "patch" on the host system.

Fixes:
http://autobuild.buildroot.net/results/8ff/8ff91ab8e52000eb34dd8f662520cf1b31490cf5/
http://autobuild.buildroot.net/results/ea7/ea77d6b23aca0cb1cf527e6c16ddf5eba957a69c/

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
I hand-edited the patch, but it could also be generated using old diff v3.2
---
 package/libsoil/0001-fix-makefile.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libsoil/0001-fix-makefile.patch b/package/libsoil/0001-fix-makefile.patch
index 3b80048..b728d04 100644
--- a/package/libsoil/0001-fix-makefile.patch
+++ b/package/libsoil/0001-fix-makefile.patch
@@ -6,8 +6,8 @@ http://anonscm.debian.org/cgit/pkg-games/libsoil.git/tree/debian/patches/linking
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 
 diff -uNr "soil.org/projects/makefile/alternate Makefile.txt" "soil/projects/makefile/alternate Makefile.txt"
---- "soil.org/projects/makefile/alternate Makefile.txt"	2008-07-07 18:13:28.000000000 +0200
-+++ "soil/projects/makefile/alternate Makefile.txt"	2015-11-07 11:15:04.140106336 +0100
+--- soil.org/projects/makefile/alternate Makefile.txt	2008-07-07 18:13:28.000000000 +0200
++++ soil/projects/makefile/alternate Makefile.txt	2015-11-07 11:15:04.140106336 +0100
 @@ -1,8 +1,8 @@
  MAKE = make
 -CC = gcc
-- 
1.9.1

[Buildroot] [PATCH v1 2/3] docs/manual: patches that change files with spaces in the name

[Ricardo Martincoski]

Patches generated by diff version 3.3 or any later must be edited
to allow the use of patch versions 2.5.9, 2.6 and 2.6.1 on the host
system.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Probably this patch will need some rewording.
It's my first patch to the manual.
I tested using 'make manual-html'

I used the real example. Should I change to a generic one?
e.g. path/to/filename with spaces	date an time
---
 docs/manual/patch-policy.txt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
index 0b4604e..f0c89d1 100644
--- a/docs/manual/patch-policy.txt
+++ b/docs/manual/patch-policy.txt
@@ -134,6 +134,22 @@ AC_PROG_MAKE_SET
 +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
 ---------------
 
+==== Patches that change files with spaces in the name
+
+When a patch changes one or more files with space in the name and it
+was generated using +diff+ version 3.3 or any later, the patch must be
+edited to ensure it can applied using old versions of +patch+ (2.5.9,
+2.6 and 2.6.1).
+
+Remove the double quotes that +diff+ added around the filename.
+
+At the end, the edited patch should look like:
+
+---------------
+--- soil.org/projects/makefile/alternate Makefile.txt	2008-07-07 18:13:28.000000000 +0200
++++ soil/projects/makefile/alternate Makefile.txt	2015-11-07 11:15:04.140106336 +0100
+---------------
+
 === Integrating patches found on the Web
 
 When integrating a patch of which you are not the author, you have to
-- 
1.9.1

[Buildroot] [PATCH v1 3/3] docs/manual: add version number to patch in prerequisites

[Ricardo Martincoski]

patch version 2.5.9 or later is required to apply patches that change
a file with space in the name

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
In the current master branch the only package that patches a filename with
spaces is libsoil.
---
 docs/manual/prerequisite.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index 7edad1f..a9d69b6 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -26,7 +26,7 @@ between distributions).
 ** +gcc+ (version 2.95 or any later)
 ** `g++` (version 2.95 or any later)
 ** +bash+
-** +patch+
+** +patch+ (version 2.5.9 or any later)
 ** +gzip+
 ** +bzip2+
 ** +perl+ (version 5.8.7 or any later)
-- 
1.9.1