Help "Patching Your Git Tree"

Open forum for end-user questions about Wine. Before asking questions, check out the Wiki as a first step.
Forum Rules
Locked
]{ings_Pwn
Newbie
Newbie
Posts: 2
Joined: Fri Feb 27, 2009 12:53 pm

Help "Patching Your Git Tree"

Post by ]{ings_Pwn »

Hi, I'm running 32-bit Kubuntu 8.04 and wanted to run a few games. I can run most games using wine, but Dawn of War has a text bug(http://bugs.winehq.org/show_bug.cgi?id=14174). I downloaded the patch and after messing with it for a while decided I need to install wine git(?).

Having installed git, I found this, http://wiki.winehq.org/Patching, but it doesn't work(or I don't). For one, the patch's extension is not diff, and no matter what extension I gave the file it would give me some error involving the letter "l". The farthest I got was using p0 instead of p1, but it asked me what files I wanted patching, which I don't know.

Any help would be appreciated, thanks. ]{ings_Pwn.
User avatar
dimesio
Moderator
Moderator
Posts: 13367
Joined: Tue Mar 25, 2008 10:30 pm

Re: Help "Patching Your Git Tree"

Post by dimesio »

]{ings_Pwn wrote:Hi, I'm running 32-bit Kubuntu 8.04 and wanted to run a few games. I can run most games using wine, but Dawn of War has a text bug(http://bugs.winehq.org/show_bug.cgi?id=14174). I downloaded the patch and after messing with it for a while decided I need to install wine git(?).

Having installed git, I found this, http://wiki.winehq.org/Patching, but it doesn't work(or I don't). For one, the patch's extension is not diff, and no matter what extension I gave the file it would give me some error involving the letter "l". The farthest I got was using p0 instead of p1, but it asked me what files I wanted patching, which I don't know.

Any help would be appreciated, thanks. ]{ings_Pwn.
The error is because the command option is -p1, not -pl. (I made exactly the same mistake the first time I tried to patch Wine.) If -p0 is what works with the patch you have, that's fine. If you want a more detailed explanation of what -p does, man patch will tell you.

The name of the file it wants is the name of the patch you downloaded. It doesn't really matter whether you give it the extension patch or diff.
]{ings_Pwn
Newbie
Newbie
Posts: 2
Joined: Fri Feb 27, 2009 12:53 pm

Re: Help "Patching Your Git Tree"

Post by ]{ings_Pwn »

dimesio wrote: The error is because the command option is -p1, not -pl. (I made exactly the same mistake the first time I tried to patch Wine.) If -p0 is what works with the patch you have, that's fine. If you want a more detailed explanation of what -p does, man patch will tell you.

The name of the file it wants is the name of the patch you downloaded. It doesn't really matter whether you give it the extension patch or diff.
Thanks. I got it to patch now, but it gives me an error: "Hunk #1 failed at 8". The other two hunks seemed to work, but I guess they weren't the ones that fix the bug. Maybe I should be posting this in the bug's thread but I figured someone here might know how to fix this and I already opened the thread.

Thanks, ]{ings_Pwn.
User avatar
Daemon
Level 4
Level 4
Posts: 101
Joined: Wed Nov 12, 2008 2:24 pm

Re: Help "Patching Your Git Tree"

Post by Daemon »

]{ings_Pwn wrote:
dimesio wrote: Thanks. I got it to patch now, but it gives me an error: "Hunk #1 failed at 8". The other two hunks seemed to work
Don't ignore the errors if a patch fails. It means you'll probably have to do it by hand.
On the other hand , line 8 makes no sense so you can ignore it. :)
- * Copyright 2006-2008 Stefan D�singer for CodeWeavers
+* Copyright 2006-2008 Stefan D�singer for CodeWeavers
?
Locked