On 07/06/2010 10:58 PM, Paul Vriens wrote:
On 07/06/2010 08:40 PM, Ken Sharp wrote:
Could someone take a look at this for me?
http://source.winehq.org/patches/data/63232
It applies fine here but http://source.winehq.org/patches/ says it fails. I can't see what's wrong. :(
Thanks.
It's the changes to Makefile.in that are the issue. If I apply this patch I get a warning:
Hunk #1 succeeded at 20 with fuzz 1 (offset 1 line).
If I then do a git diff for the Makefile.in I get:
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 120f4bd..40c8687 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -20,6 +20,7 @@ RC_SRCS = \ En.rc \ Es.rc \ Fr.rc \
- Ga.rc \
Hu.rc \ It.rc \ Ja.rc \
This differs from you Makefile.in patch.
It still looks like your local Git tree is not up-to-date. Did you create the Gaelic patch on top of your Welsh one?
Oops, checked against the wrong patch. The above was actually against the Gaelic mapi32 patch (try3) but I guess you already figured that out.