Bug 388047 – media-libs/harfbuzz-9999 patch is out of date

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description James Cloos 2011-10-21 21:34:45 UTC]

harfbuzz-automagicness.patch not longer applies to harfbuzz master.

The -p1 output (the only -p with any success, of course) is:

patching file .gitignore
patching file Makefile.am
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej
patching file configure.ac
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 57.
Hunk #3 succeeded at 91 (offset -96 lines).
2 out of 3 hunks FAILED -- saving rejects to file configure.ac.rej
patching file src/Makefile.am
Hunk #1 FAILED at 30.
Hunk #2 succeeded at 49 with fuzz 1 (offset -12 lines).
Hunk #3 FAILED at 73.
2 out of 3 hunks FAILED -- saving rejects to file src/Makefile.am.rej
patching file src/hb-shape.cc
Hunk #1 FAILED at 36.
Hunk #2 FAILED at 59.
2 out of 2 hunks FAILED -- saving rejects to file src/hb-shape.cc.rej
can't find file to patch at input line 445
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/test/Makefile.am b/test/Makefile.am
|index b3c8cc2..8e90483 100644
|--- a/test/Makefile.am
|+++ b/test/Makefile.am
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 484
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/test/test-c.c b/test/test-c.c
|index 7e7c502..0120744 100644
|--- a/test/test-c.c
|+++ b/test/test-c.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 498
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/util/Makefile.am b/util/Makefile.am
|index 223a59a..110d8ff 100644
|--- a/util/Makefile.am
|+++ b/util/Makefile.am
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored

patch program exited with status 1

[Comment 1 Ian Stakenvicius (RETIRED) 2011-10-23 01:49:55 UTC]

..works for me as of 5 minutes ago; must have been a temporary breakage??

[Comment 2 James Cloos 2011-10-23 18:39:38 UTC]

It still fails here.  That patch does not apply to harfbuzz master.

I just checked rsync://rsync11.us.gentoo.org/gentoo-portage/media-libs/harfbuzz;
the version there hasn’t changed since I last synced.

I don’t see how it possibly could have worked?

[Comment 3 Tomáš Chvátal (RETIRED) 2011-11-10 21:25:58 UTC]

The patch applies again.