Tremulous Forum

Community => Servers => Topic started by: durand on May 14, 2007, 06:50:27 pm

Title: Applying a lot of patches together to make a custom qvm
Post by: durand on May 14, 2007, 06:50:27 pm

Im trying to apply quite a few patches to make a custom qvm. These are the patches im trying to apply:

Code: [Select]


backport901.patch
chat_bubble.patch
death.patch
deconfix.patch
radar.patch
risujin-svn892-teamoverlay.patch
svn909-creditoverflow.patch
patches/svn912.patch
tremulous-svn885-layouts.patch


I think the problem here is that they contradict each other and are for different svn revisions but whatever the case, they dont all seem to patch correctly. A lot of them give a similar error to this:

Code: [Select]

1 out of 1 hunk FAILED -- saving rejects to file src/game/g_cmds.c.rej
or this:

Code: [Select]

6 out of 52 hunks FAILED -- saving rejects to file src/game/g_cmds.c.rej

Im using this command to apply the patches individually

Code: [Select]

patch -p0 < /location/to/some.patch


Is there anything Im doing wrong or will these patches just not work together?

Title: Re: Applying a lot of patches together to make a custom qvm
Post by: kevlarman on May 14, 2007, 08:04:49 pm

Quote from: "durand"

Is there anything Im doing wrong or will these patches just not work together?

most patches that modify the same section of code won't apply cleanly if you apply more than one of them. you need to apply them by hand if you want it working.

Title: Applying a lot of patches together to make a custom qvm
Post by: benmachine on May 14, 2007, 08:10:36 pm

If you go and read the *.rej file, it will show you which bits in particular failed to get into the code. You'll then most likely need to poke in yourself and find the appropriate context. Note the line numbers, too, although they may be inaccurate by now, of course.
Oh, by the way, are you sure all those patches are appropriate for a game.qvm compilation? Some of them, like risujin's team overlay, sound like you might need a clientside download, too.

Title: Applying a lot of patches together to make a custom qvm
Post by: durand on May 14, 2007, 08:11:31 pm

O_o. I might give that a pass. Its for SexyGhost's server. Do you know any patches that will go well together?

EDIT for benmachine: I thought it would be something like that, seems like a lot of work though. I might try to understand it later.

Title: Applying a lot of patches together to make a custom qvm
Post by: next_ghost on May 14, 2007, 08:24:22 pm

Learn C and apply the failed hunks manually. Patches may break each other even if there's no direct conflict.  Also run patch with -F0 unless you want to risk broken code. Clean fail is better than wrong fuzz match (yes, it HAS happened to me while patching Tremulous).

Title: Applying a lot of patches together to make a custom qvm
Post by: durand on May 14, 2007, 08:25:51 pm

O.o, ill try those tips later. Thanks all of you