Can't apply a patch

[Berillions]

Hello,

When i want to patch wine 1.1.39 with this patch : bugs.winehq.org/attachment.cgi?id=26538
but it's impossible because i have those error message :
pastebin.com/yGis88BE

I don't understand because i rename this file patch -> war.patch and i apply it in wine source thanks to this command : patch -p0 < war.patch

Thanks you for your help.

Berillions

[Frédéric Delanoy]

On Sun, Apr 18, 2010 at 19:14, Berillions <[email protected]> wrote:

Hello,

When i want to patch wine 1.1.39 with this patch : bugs.winehq.org/attachment.cgi?id=26538
but it's impossible because i have those error message :
pastebin.com/yGis88BE

I don't understand because i rename this file patch -> war.patch and i apply it in wine source thanks to this command : patch -p0 < war.patch

Thanks you for your help.

Berillions

The patch was probably generated by "git format-patch" or similar.
If you want to use the "patch" command, first remove the "a/" and "b/"
prefixes. Alternatively, you might use "git apply".

Frédéric

[Frédéric Delanoy]

Even simpler... "patch -p1 < war.patch" should work as well.

2010/4/19 Frédéric Delanoy <[email protected]>:

On Sun, Apr 18, 2010 at 19:14, Berillions <[email protected]> wrote:

Hello,

When i want to patch wine 1.1.39 with this patch : bugs.winehq.org/attachment.cgi?id=26538
but it's impossible because i have those error message :
pastebin.com/yGis88BE

I don't understand because i rename this file patch -> war.patch and i apply it in wine source thanks to this command : patch -p0 < war.patch

Thanks you for your help.

Berillions

The patch was probably generated by "git format-patch" or similar.
If you want to use the "patch" command, first remove the "a/" and "b/"
prefixes. Alternatively, you might use "git apply".

Frédéric

[Berillions]

Hello Frederic Delanoy,

And thanks you for your answer.
It's work now but i have a question.

This patch is for wine 1.1.39 source. How to modify this file patch so that it works with wine 1.1.43 source?

Thanks

[hellork]

...This patch is for wine 1.1.39 source. How to modify this file patch so that it works with wine 1.1.43 source?...

• try to apply the patch
• find the .rej file
• open it up
• find the file it was trying to patch
• open it, save a backup copy
• apply the changes manually
• export a new patch (git diff > new.patch)