Hi Werner,
I tried again to come on patching my new groff version.
Le mercredi 13 mai 2015 à 11:14 +0200, Werner LEMBERG a écrit :
> Note that you should be in groff's
> top-level directory while applying such patches so that all
> subdirectories can be correctly found if necessary.
OK, I came to groff-1.22.3 and opend there the terminal.
gregexp@greg-desktop:~/.local/share/Trash/files/groff-1.22.3$
> Play around with `-p0', `-p2', ...
gregexp@greg-desktop:~/.local/share/Trash/files/groff-1.22.3$ patch -p0
< /home/gregexp/Bureau/patch1glilypond
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
|index 7cf6476..e124b3d 100644
|--- a/contrib/glilypond/ChangeLog
|+++ b/contrib/glilypond/ChangeLog
--------------------------
File to patch: glilypond.pl
glilypond.pl: No such file or directory
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 19
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/contrib/glilypond/glilypond.pl
b/contrib/glilypond/glilypond.pl
|index 6f8dd83..48101be 100755
|--- a/contrib/glilypond/glilypond.pl
|+++ b/contrib/glilypond/glilypond.pl
--------------------------
File to
patch:
/home/gregexp/.local/share/Trash/files/groff-1.22.3/contrib/glilypond/glilypond.pl
patching
file
/home/gregexp/.local/share/Trash/files/groff-1.22.3/contrib/glilypond/glilypond.pl
patch unexpectedly ends in middle of line
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to
file
/home/gregexp/.local/share/Trash/files/groff-1.22.3/contrib/glilypond/glilypond.pl.rej
_____
gregexp@greg-desktop:~/.local/share/Trash/files/groff-1.22.3$ patch -p1
< /home/gregexp/Bureau/patch1glilypond
patching file contrib/glilypond/ChangeLog
Hunk #1 succeeded at 1 with fuzz 1.
patching file contrib/glilypond/glilypond.pl
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 546 with fuzz 2.
_____
gregexp@greg-desktop:~/.local/share/Trash/files/groff-1.22.3$ patch -p2
< /home/gregexp/Bureau/patch1glilypond
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
|index 7cf6476..e124b3d 100644
|--- a/contrib/glilypond/ChangeLog
|+++ b/contrib/glilypond/ChangeLog
____
-p3 gives the same result as -p1
I attached the file I use as a patch.
Thanks
Grégoire
diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index 7cf6476..e124b3d 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-20 Werner LEMBERG <w...@gnu.org>
+
+ * glilypond.pl <read files or stdin>: Fix typo.
+
+ Problem reported by Grégoire Babey <gi...@gmx.ch>.
+
2014-09-03 Bernd Warken <groff-bernd.warken...@web.de>
* glilypond.pl: New version 1.3.1
diff --git a/contrib/glilypond/glilypond.pl b/contrib/glilypond/glilypond.pl
index 6f8dd83..48101be 100755
--- a/contrib/glilypond/glilypond.pl
+++ b/contrib/glilypond/glilypond.pl
@@ -546,7 +546,7 @@ our $Read =
$ly = new FH_FILE($path_ly);
my $include = new FH_READ_FILE($file);
- my $res = $include->read-all(); # is a refernce to an array
+ my $res = $include->read_all(); # is a reference to an array
foreach ( @$res ) {
chomp;
$ly->print($_);
