Howto apply a patch/diff file

Forum for technical discussions regarding development. If you have a general suggestion, problem or comment, please use one of the other forums.

Moderator: OpenTTD Developers

User avatar
leno4
Traffic Manager
Traffic Manager
Posts: 247
Joined: 10 Mar 2008 02:45
Location: Australia

Re: Howto apply a patch/diff file

Post by leno4 »

TGVfan wrote:Starting to get angry and it won't take long begore this PC will get some flying lessons.
I have no clue what I'm doing wrong.

Downloaded the sourcefiles, and the tortoise SVN , but what then? I'm quite new to this and I start to understand that I don't understand anything of it at all..... :mrgreen:

What I have now:
Map with OTTD
Map with sourcefile
some patches... like the yapp/PBS

Please tell me how to get things working as I start to get mad.
Im with you mate i apply patches using SVN but can never compile using programs get too many erroros which are because of mistakes in the patch code which i cant fix.
Yexo
Tycoon
Tycoon
Posts: 3663
Joined: 20 Dec 2007 12:49

Re: Howto apply a patch/diff file

Post by Yexo »

leno4 wrote:
TGVfan wrote:Starting to get angry and it won't take long begore this PC will get some flying lessons.
I have no clue what I'm doing wrong.

Downloaded the sourcefiles, and the tortoise SVN , but what then? I'm quite new to this and I start to understand that I don't understand anything of it at all..... :mrgreen:

What I have now:
Map with OTTD
Map with sourcefile
some patches... like the yapp/PBS

Please tell me how to get things working as I start to get mad.
Im with you mate i apply patches using SVN but can never compile using programs get too many erroros which are because of mistakes in the patch code which i cant fix.
We can only help you if you post what errors you are getting and what the exact stept are you've been following.
Wasila
Tycoon
Tycoon
Posts: 1498
Joined: 15 Mar 2008 07:02

Re: Howto apply a patch/diff file

Post by Wasila »

I've SVN Checkouted OpenTTD and attempted to apply numerous patches, all failed (including Gonozal, extralarge patchpack 256k and 1M, found a town, filter by cargo and town growth needs goods). Attempted both with version 0.6 and the latest nightly. Could I be doing something wrong?

Thanks in advance.
Yexo
Tycoon
Tycoon
Posts: 3663
Joined: 20 Dec 2007 12:49

Re: Howto apply a patch/diff file

Post by Yexo »

Wasila wrote:I've SVN Checkouted OpenTTD and attempted to apply numerous patches, all failed (including Gonozal, extralarge patchpack 256k and 1M, found a town, filter by cargo and town growth needs goods). Attempted both with version 0.6 and the latest nightly. Could I be doing something wrong?

Thanks in advance.
If every patch fails, obviously something is going wrong. That could be you using vista (which is not supported by BOTTD). Have you tried setting the checkbox "force revision to match patch"?
Wasila
Tycoon
Tycoon
Posts: 1498
Joined: 15 Mar 2008 07:02

Re: Howto apply a patch/diff file

Post by Wasila »

I am using XP SP2. A while ago I tried to use BuildOTTD and it didn't work so I'm using TortoiseSVN.
Trond
Tycoon
Tycoon
Posts: 973
Joined: 25 Jan 2008 07:32
Location: Gamle Ørnenuten

Re: Howto apply a patch/diff file

Post by Trond »

Wasila wrote:I am using XP SP2. A while ago I tried to use BuildOTTD and it didn't work so I'm using TortoiseSVN.
So do I, and I use BOTTD almost every day... Together with tortoise...
..: Trond :.. because you deserve it! Image

The whole problem with the world is that fools and fanatics are always so certain of themselves,
and wiser people so full of doubts.
Bertrand Russell

MyGRFs: Norwegian Funny Town Names 4 | LOTR & WoW Town Names 2 | Islandic Town Names 1 | Random Norwegian Town Names
Favorites: GRFCrawler | ISR | WIKI | Now Playing: OpenTTD 1.3.2 w/YAPP 3.0-RC3.9ish
Wasila
Tycoon
Tycoon
Posts: 1498
Joined: 15 Mar 2008 07:02

Re: Howto apply a patch/diff file

Post by Wasila »

I reinstalled BuildOTTD and got it working but I would like to apply multiple patches so the problem still stands.
Trond
Tycoon
Tycoon
Posts: 973
Joined: 25 Jan 2008 07:32
Location: Gamle Ørnenuten

Re: Howto apply a patch/diff file

Post by Trond »

Apply multiple patches in TortoiseSVN, make a patch of those with Tortoise, and use BOTTD to make a build.
..: Trond :.. because you deserve it! Image

The whole problem with the world is that fools and fanatics are always so certain of themselves,
and wiser people so full of doubts.
Bertrand Russell

MyGRFs: Norwegian Funny Town Names 4 | LOTR & WoW Town Names 2 | Islandic Town Names 1 | Random Norwegian Town Names
Favorites: GRFCrawler | ISR | WIKI | Now Playing: OpenTTD 1.3.2 w/YAPP 3.0-RC3.9ish
Wasila
Tycoon
Tycoon
Posts: 1498
Joined: 15 Mar 2008 07:02

Re: Howto apply a patch/diff file

Post by Wasila »

Wasila wrote:I've SVN Checkouted OpenTTD and attempted to apply numerous patches, all failed (including Gonozal, extralarge patchpack 256k and 1M, found a town, filter by cargo and town growth needs goods). Attempted both with version 0.6 and the latest nightly. Could I be doing something wrong?

Thanks in advance.
Tortoise SVN doesn't work. I managed to patch through cygwin but I'm getting the same problems (even tried Roest's and it corrupted four folders). Could it be because the patches aren't updated to latest trunk?
Yexo
Tycoon
Tycoon
Posts: 3663
Joined: 20 Dec 2007 12:49

Re: Howto apply a patch/diff file

Post by Yexo »

Wasila wrote:
Wasila wrote:I've SVN Checkouted OpenTTD and attempted to apply numerous patches, all failed (including Gonozal, extralarge patchpack 256k and 1M, found a town, filter by cargo and town growth needs goods). Attempted both with version 0.6 and the latest nightly. Could I be doing something wrong?

Thanks in advance.
Tortoise SVN doesn't work. I managed to patch through cygwin but I'm getting the same problems (even tried Roest's and it corrupted four folders). Could it be because the patches aren't updated to latest trunk?
That could be, and it can also be that those patches you try aren't compatible or need some manual fixing. Needing manual fixing is exactly the reason bottd will never support multiple patches.
Wasila
Tycoon
Tycoon
Posts: 1498
Joined: 15 Mar 2008 07:02

Re: Howto apply a patch/diff file

Post by Wasila »

I managed to get it working using a different compiler. Thanks for the help anyway.
iranair777
Traffic Manager
Traffic Manager
Posts: 163
Joined: 13 Apr 2007 21:18

Re: Howto apply a patch/diff file

Post by iranair777 »

I have just downloaded a few things in the list below but I'm stuck as in how to install them into OpenTTD. Any help wil be appriciated

- airport-close-v6-r13374.patch
- airport-close-v6-0.6.1.patch
- airport-close-v6-0.6.0.patch
- r13031_infrastructure_sharing_v0.3.patch
- r13031IS0.3m.diff
- dd_buy_land_r12684.diff
- trafficlights_v3_r12951.diff
- trafficlights.diff
- yapp_r13612_v8_1.patch

Thanks!

P.s. I am a complete beginniner in .patch and .diff and have downloaded and installed BuildOTTD
Alberth
OpenTTD Developer
OpenTTD Developer
Posts: 4765
Joined: 09 Sep 2007 05:03
Location: home

Re: Howto apply a patch/diff file

Post by Alberth »

Start simple by applying only one patch first, the first post in the thread explains how.
iranair777
Traffic Manager
Traffic Manager
Posts: 163
Joined: 13 Apr 2007 21:18

Re: Howto apply a patch/diff file

Post by iranair777 »

Alberth wrote:Start simple by applying only one patch first, the first post in the thread explains how.
Thats the problem as well, I dont understand the first post and I dont know where to put these patches.

Also are these patches for the originals as I'm worried that I may not have the originals
Yexo
Tycoon
Tycoon
Posts: 3663
Joined: 20 Dec 2007 12:49

Re: Howto apply a patch/diff file

Post by Yexo »

iranair777 wrote:
Alberth wrote:Start simple by applying only one patch first, the first post in the thread explains how.
Thats the problem as well, I dont understand the first post and I dont know where to put these patches.

Also are these patches for the originals as I'm worried that I may not have the originals
As I said you earlier, read http://www.tt-forums.net/viewtopic.php?f=33&t=31823
If you don't understand that either, post in that thread and post the steps you don't understand.
TommyGun
Engineer
Engineer
Posts: 3
Joined: 01 Jul 2008 12:10

Re: Howto apply a patch/diff file

Post by TommyGun »

Is it possible to uninstall a patch? (Linux). Without having to compile the game over again
User avatar
CommanderZ
Tycoon
Tycoon
Posts: 1872
Joined: 07 Apr 2008 18:29
Location: Czech Republic
Contact:

Re: Howto apply a patch/diff file

Post by CommanderZ »

If you have only one patch applied and you want to remove it, just download OTTD again and extract it :)
User avatar
belugas
OpenTTD Developer
OpenTTD Developer
Posts: 1507
Joined: 05 Apr 2005 01:48
Location: Deep down the deepest blue
Contact:

Re: Howto apply a patch/diff file

Post by belugas »

TommyGun wrote:Is it possible to uninstall a patch? (Linux). Without having to compile the game over again
No matter the OS you are using, you cannot uninstall a patch withouth recompiling the game.
The patch is incorporated in it.
A patch it nothing more than a difference between two source code. Therefor...
IT can be switched on or off, if the possibility is given, but it's stillpart of the application
If you are not ready to work a bit for your ideas, it means they don't count much for you.
OpenTTD and Realism? Well... Here are a few thoughs on the matter.
He he he he
------------------------------------------------------------
Music from the Bloody Time Zones
amirtaheri
Engineer
Engineer
Posts: 7
Joined: 20 Jul 2008 14:17

Re: Howto apply a patch/diff file

Post by amirtaheri »

I'm trying to install the passenger destination patch and it all went swimmingly until it came to compiling the source code. When I type in the "Make" command, I get this error, but I have no idea why.

Macbook:/users/amirtaheri/openttd amirtaheri$ make build
make -C /users/amirtaheri/openttd/objs/lang strgen
make[2]: *** No rule to make target `/users/amirtaheri/openttd/src/core/alloc_func.cpp', needed by `alloc_func.o'. Stop.
make[1]: *** [/users/amirtaheri/openttd/objs/lang/strgen] Error 2
make: *** [build.o] Error 2
Macbook:/users/amirtaheri/openttd amirtaheri$
Yexo
Tycoon
Tycoon
Posts: 3663
Joined: 20 Dec 2007 12:49

Re: Howto apply a patch/diff file

Post by Yexo »

amirtaheri wrote:I'm trying to install the passenger destination patch and it all went swimmingly until it came to compiling the source code. When I type in the "Make" command, I get this error, but I have no idea why.

Macbook:/users/amirtaheri/openttd amirtaheri$ make build
make -C /users/amirtaheri/openttd/objs/lang strgen
make[2]: *** No rule to make target `/users/amirtaheri/openttd/src/core/alloc_func.cpp', needed by `alloc_func.o'. Stop.
make[1]: *** [/users/amirtaheri/openttd/objs/lang/strgen] Error 2
make: *** [build.o] Error 2
Macbook:/users/amirtaheri/openttd amirtaheri$
Don't use a path with spaces in it. Btw, "make" should do, instead of "make build"
Post Reply

Return to “OpenTTD Development”

Who is online

Users browsing this forum: No registered users and 15 guests