Howto apply a patch/diff file

LKRaider · Post by **LKRaider** » 20 Apr 2006 18:28

What version of GCC you have installed (gcc -v)?

Did you install the gcc-mingw package?

Check if "cc1.exe" exists in your cygwin installation: check the directory /usr/lib/gcc-lib/i686-pc-cygwin/(your gcc version).

Try running: export PATH=$PATH:/usr/lib/gcc-lib/i686-pc-cygwin/(your gcc version)

bruce89 · Post by **bruce89** » 29 Apr 2006 21:00

Just install Linux already, it'd make all this a lot easier. I mean, your avatar is a penguin anyway.

RSpeed tycoonfreak · Post by **RSpeed tycoonfreak** » 02 May 2006 08:12

I read about TotoiseSVN downloaded TortoiseSVN, Installed it, and now i dont know what to do.
At http://wiki.openttd.org/index.php/FAQ_d ... ource_code i read this:
Right-click on the folder with the OpenTTD source code, open the TortoiseSVN submenu and select 'Apply Patch...'. Browse to the patch file and select it. Then, right click on the 'File Patches' window and click on 'Patch All'. After you're done, close the TortoiseMerge window.
Retrieved from "http://wiki.openttd.org/index.php/FAQ_development"

but as you can see at the attachement i have not the abbillity to choose an "Apply Patch" button.
Does someone know what to do?

darkpella · Post by **darkpella** » 02 May 2006 08:33

1. Make a new folder
2. right-click on it and choose "SVN Checkout..." from the context menu (Maybe you need to reboot after installing Tortoise to get this)
3. Set "svn://svn.openttd.org/trunk" as URL of repository
4. Uncheck all flags but "HEAD revision" (radio button, it lets yoy dowload the latest code revision)
5. Click Ok and let it download the source code to the chosen folder (whci then become your repository)
6. Right click the patch of diff file, chose "apply patch" and then, on the dialog box that opens, browse to the folder you downloaded the source to thorugh steps 1-5, cick OK and let it analyze the differences.
7. Fix all of the conflicts Tortoise finds between the source you downloaded and the patch you ar trying to apply.

Conflicts happen since the patch you are applying is based on a certain revision of the code, that was modified in subsequent revisions, hence Tortoise doesn't know whether the changes to be used ar the ones form the patch or those form the subsequent revisions, or both, and, in this latter case, in which order. Sometimes it is easy to guess it, sometimes it isn't

fozer · Post by **fozer** » 03 May 2006 16:52

i did all that... but when i start openttd it's exactly the same....

what do i have to do to to link the "new folder" files.. (they appear with a check or uncheck symbol) with the "openttd" folder
that's my problem if anyone could help .... tkx

Brianetta · Post by **Brianetta** » 03 May 2006 17:02

We're assuming you are also doing step 8 - actually compiling the patched code to generate a new openttd.exe file. Is this the case?

gigajum · Post by **gigajum** » 03 May 2006 17:03

you have compiled a exe file with a compiler?

darkpella · Post by **darkpella** » 03 May 2006 17:09

Well, I guess you have to compile the source, though I must honestly say it looks strange to me that you had the ability to understand the code to such a point that you were able to fix the code conflicts when trying to apply the patch, and didn't realize that you hade a plain source code and not yet an executable.
Sorry for brutally asking

, but are you sure you understood what you're dealing with?
Anyway, if you didn't, I would suggest not trying any longer, since you're way too far from being able to make it right now

(gotta learn some c-coding before).
If you did

, just read again the web-page you mentioned; you can find directions on how to compile the source code at this point.

Hope it helped, and sorry for being assertive.

Bye

darkpella

klogg · Post by **klogg** » 10 May 2006 14:12

It seems this is the correct thread to complain about
problems when trying to get OpenTTD the hard way...

I did everything like discribed here:
http://wiki.openttd.org/index.php/Compiling_on_MinGW

But when I try to run the script (.sh thingi)
in the libpng-1.2.8/mingwPORT folder
after donwloading (I thing) this happens:

gcc -c -O3 -s -mms-bitfields -march=i686 -o png.o png.c
In file included from png.c:13:
png.h:359:18: zlib.h: No such file or directory
In file included from png.h:363,
from png.c:13:
pngconf.h error: syntax error before '*' token
pngconf.h warning: data definition has no type or storage class

The list goes on and later, when I try to run make
he comes up with

$ make
make: libpng-config: Command not found
make: libpng-config: Command not found
make: libpng-config: Command not found

Can you guys tell me why I can't compile this png stuff?

Because I NEED the great stuff not included in the stable, precompiled release.

darkpella · Post by **darkpella** » 10 May 2006 14:23

Well, why not giving cygwin a chance?

DaleStan · Post by **DaleStan** » 10 May 2006 15:03

You don't have zlib properly installed.
libpng uses zlib for compression, so the appropriate headers, modules, &c. must exist in order to compile zlib. If they do exist, they aren't in a standard place; try /usr/lib/ and /usr/include/ or /usr/local/lib/ and /usr/local/include/.

Last I heard (admittedly, this was a long time ago), Cygwin didn't have a working libpng.

You may also want to try VC++ Express; this is a problem report, but it has a bunch of links that look interesting.

klogg · Post by **klogg** » 10 May 2006 16:00

Thank you very much!

Please let me tell you the problem.
(Maybe someone could clarify the description on http://wiki.openttd.org/index.php/Compiling_on_MinGW)

First I installed the MinGW Compiler to C:\MinGW
And I updated the WindowsXP-wide-global-master PATH Variable.

Then I did exactly what I was told in the guide and ended up
with all the needed zlib-stuff in the directory C:\msys\mingw
I don't think I've had a fair chance because the zlib-script says:

$ ./mingwPORT.sh
Download file? (Yes)
Download file URI? (http://www.zlib.net)
Archive file type?
0) unknown
1) tar.gz
2) tgz
3) tar.bz2
4) tbz2
5) zip
Select a numeric value: (3)
Archive file? (zlib-1.2.3.tar.bz2)
Download to path? (/tmp)
Source path? (/usr/src/zlib-1.2.3)
Installation directory? (/mingw)
CFLAGS (-O3 -s -mms-bitfields -march=i686)

But by "/mingw" it means NOT C:\MinGW. That was my problem.
I solved it by copying the folders in C:\msys\mingw to C:\MinGW

Now I have one last question:
What source code should I compile when I want a version
that has most of the latest features (PBS?) but is also playable?
See, I don't want to edit the code our something...
I'm a little confused by all those nighty builds and mini integrated ones and patches.
Please give me a chance to catch on to the big picture.

klogg

gkirilov · Post by **gkirilov** » 01 Jul 2006 11:16

Is there any way to combine several patches in one .diff (or .patch) file?

Sacro · Post by **Sacro** » 01 Jul 2006 11:39

Merge them all in, and then generate another diff from that

gkirilov · Post by **gkirilov** » 01 Jul 2006 11:50

That's what i want to avoid. Merging each patch separately.

iNVERTED · Post by **iNVERTED** » 17 Aug 2006 20:38

um I tried applying the gradual loading patch (never tried applying a patch before) but it said a load of stuff failed, and saved stuff to some .c.rej files. Any idea what happened?

DaleStan · Post by **DaleStan** » 17 Aug 2006 21:22

Something broke.
Determining what broke requires the output from patch.

iNVERTED · Post by **iNVERTED** » 17 Aug 2006 21:24

Hmm. The topic says:

Patch against SVN trunk r5911.

So I guess I need this exact version? Where can I get that?

Maedhros · Post by **Maedhros** » 17 Aug 2006 22:03

iNVERTED wrote:Hmm. The topic says:

Patch against SVN trunk r5911.
So I guess I need this exact version? Where can I get that?

I've just tried it, and that patch applies against the latest trunk version - r5934. You're not trying to apply it to the MiniIN source are you?

iNVERTED · Post by **iNVERTED** » 17 Aug 2006 22:29

No, the source I have is called 0.4.8-RC2.

Transport Tycoon Forums

Howto apply a patch/diff file

Yikes

?

Who is online