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

Rubidium
OpenTTD Developer
OpenTTD Developer
Posts: 3815
Joined: 09 Feb 2006 19:15

Re: Howto apply a patch/diff file

Post by Rubidium »

Depending on the compile environment it means that:
- you freetype-dev is broken;
- you failed to download openttd-useful;
- you failed to properly configure your compiler to add the openttd-useful path to it's search path for includes.
User avatar
snowie
Engineer
Engineer
Posts: 14
Joined: 06 Feb 2009 18:09
Location: Kraków, Poland
Contact:

Re: Howto apply a patch/diff file

Post by snowie »

So would you tell me what should I do? I'm not advanced in it.
Yexo
Tycoon
Tycoon
Posts: 3663
Joined: 20 Dec 2007 12:49

Re: Howto apply a patch/diff file

Post by Yexo »

snowie wrote:So would you tell me what should I do? I'm not advanced in it.
Rubidium wrote:Depending on the compile environment it means that:
So telling us what environment you use would be a good start.
1. What OS do you use (Windows/Linux/Mac OSX/Other)?
2. What compiler do you use (msvc/gcc (under mingw or cygwin))?
dihedral
Tycoon
Tycoon
Posts: 1053
Joined: 14 Feb 2007 17:48

Re: Howto apply a patch/diff file

Post by dihedral »

./configure --without-freetype
:-P
User avatar
snowie
Engineer
Engineer
Posts: 14
Joined: 06 Feb 2009 18:09
Location: Kraków, Poland
Contact:

Re: Howto apply a patch/diff file

Post by snowie »

OS: Windows XP, compiler: Cygwin
User avatar
Caelan
Route Supervisor
Route Supervisor
Posts: 412
Joined: 23 Dec 2005 12:56
Location: Haarlem, Netherlands

Re: Howto apply a patch/diff file

Post by Caelan »

And another newbie to OTTD bites the dust. Perhaps its my lack of technological knowledge or the fact that I do not understand the idea of what a patch is; I only want to integrate the new passenger destinations and timetables in OTTD; its just that I do not know how, despite all advices given in this forum. Might I ask for a simpler way, can somebody help me by providing a prepared OTTD patch with the above patches in it? I know I ask for a lot but there must be loads who have already that included.
Image
mad_railman
Engineer
Engineer
Posts: 7
Joined: 13 Oct 2008 22:03

Re: Howto apply a patch/diff file

Post by mad_railman »

towards the begining of this thread It was stated:
MeusH wrote:If you're using windows, you can download TortoiseSVN, install and do the following:

Download the source files:
Make a new folder...
where should the folder be put that has SVN? I looked and I didn't see an answer.
Yexo
Tycoon
Tycoon
Posts: 3663
Joined: 20 Dec 2007 12:49

Re: Howto apply a patch/diff file

Post by Yexo »

mad_railman wrote:towards the begining of this thread It was stated:
MeusH wrote:If you're using windows, you can download TortoiseSVN, install and do the following:

Download the source files:
Make a new folder...
where should the folder be put that has SVN? I looked and I didn't see an answer.
At a place you can find it again.
mad_railman
Engineer
Engineer
Posts: 7
Joined: 13 Oct 2008 22:03

Re: Howto apply a patch/diff file

Post by mad_railman »

ok, just wondering so I don't screw OTTD up beyond repiar, thanks!

ok now I have another question, what if the patch finds conflicting lines in the script (I can only do a little HTML and CSS nothing else so I dont know what the problem is) the patches that im trying to install are Bilbo's Extra large map patch and his Max Hight Modification patch
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 »

mad_railman wrote:what if the patch finds conflicting lines in the script (I can only do a little HTML and CSS nothing else so I dont know what the problem is) the patches that im trying to install are Bilbo's Extra large map patch and his Max Hight Modification patch
Then, unless a kind soul helps you out, you will need to find by yourself what is the right part. This is called a conflict, and a conflict can only be fixed by knowing what the code is intended to do on both patches (if combining) or on trunk.
Yes, you have to learn C/C++ for that, no magic trick possible.
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
mad_railman
Engineer
Engineer
Posts: 7
Joined: 13 Oct 2008 22:03

Re: Howto apply a patch/diff file

Post by mad_railman »

thank you, and sorry for being a noob
User avatar
Bilbo
Tycoon
Tycoon
Posts: 1710
Joined: 06 Jun 2007 21:07
Location: Czech Republic

Re: Howto apply a patch/diff file

Post by Bilbo »

mad_railman wrote:ok now I have another question, what if the patch finds conflicting lines in the script (I can only do a little HTML and CSS nothing else so I dont know what the problem is) the patches that im trying to install are Bilbo's Extra large map patch and his Max Hight Modification patch
Then you're out of luck. My "height modification patch" is incomplete and even if you somehow manage to apply it, you won't get functional game.

For more height levels go to http://www.tt-forums.net/viewtopic.php?f=33&t=40844 and use the patch from there. Unlike my unfinished patch it is working and perhaps it would work. If not, drop here a line and I may look at it.

Hmm ... I think I rather remove link to my unfinished "Max Hight Modification patch" from my signature, as it is kinda obsolete ....
If you need something, do it yourself or it will be never done.

My patches: Extra large maps (1048576 high, 1048576 wide) (FS#1059), Vehicle + Town + Industry console commands (FS#1060), few minor patches (FS#2820, FS#1521, FS#2837, FS#2843), AI debugging facility

Other: Very large ships NewGRF, Bilbo's multiplayer patch pack v5 (for OpenTTD 0.7.3)
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 »

mad_railman wrote:thank you, and sorry for being a noob
You do not have to excuse yourself for being new at something ;) This is totally normal.
What is less acceptable is to stay one. But i'm pretty sure it will not be your case :mrgreen:
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
pecX
Engineer
Engineer
Posts: 23
Joined: 05 Apr 2009 11:25

Re: Howto apply a patch/diff file

Post by pecX »

Hi!

i downloadet the source via TourtoiseSVN. Its revision 15962.
Now i´d like to install a daylength patch http://www.tt-forums.net/viewtopic.php?f=33&t=42432

After i did what meusH wrote at the beginning of this thread, i dont know how to play the game with the patch.
Patch has revision 15961.

I did all from meusH`s post. Installed SVN. created folder then Downloadet source. then "add patch". Chosed the .patch file and clicket "patch all". Then SVN did some changes in the source (i think), but i dont know what to do now! How do i link the source with my OTTD 0.7.0? ingame i cant see the daylength options....

please help :)
Conditional Zenith
Chief Executive
Chief Executive
Posts: 697
Joined: 10 Jun 2003 00:19
Location: Australia

Re: Howto apply a patch/diff file

Post by Conditional Zenith »

You need to compile the game. There are instructions on the wiki.
Melfice
Transport Coordinator
Transport Coordinator
Posts: 305
Joined: 20 Apr 2006 19:11
Location: Oldenzaal, the Netherlands, gateway to Germany

Re: Howto apply a patch/diff file

Post by Melfice »

I can seem to get BuildOpenTTD to work.
It doesn't seem to want to connect to the server for the source code?

Here's the exact error message I get:
The remote server returned an error (404) Not Found
Right after that, I get this one:
Value cannot be null. Parameter name: items
EDIT: Y'know what?
Never mind. I see after a bit of searching that this is a known problem without a fix right now.
I'll leave the compiling to you guys. You're better at it anyway. ;)
User avatar
ChillCore
Tycoon
Tycoon
Posts: 2822
Joined: 04 Oct 2008 23:05
Location: Lost in spaces

Re: Howto apply a patch/diff file

Post by ChillCore »

Don't give up so fast. there are many other compilers.
As long as we dont have to call the Whambulance people will help you if you get stuck. After trying and continuing to tell what went wrong.
-- .- -.-- / - .... . / ..-. --- .-. -.-. . / -... . / .-- .. - .... / -.-- --- ..- .-.-.-
--- .... / -.-- . .- .... --..-- / .- -. -.. / .--. .-. .- .. ... . / - .... . / .-.. --- .-. -.. / ..-. --- .-. / .... . / --. .- ...- . / ..- ... / -.-. .... --- --- -.-. .... --- --- ... .-.-.- / ---... .--.

Playing with my patchpack? Ask questions on usage and report bugs in the correct thread first, please.
All included patches have been modified and are no longer 100% original.
Melfice
Transport Coordinator
Transport Coordinator
Posts: 305
Joined: 20 Apr 2006 19:11
Location: Oldenzaal, the Netherlands, gateway to Germany

Re: Howto apply a patch/diff file

Post by Melfice »

ChillCore wrote:Don't give up so fast. there are many other compilers.
As long as we dont have to call the Whambulance people will help you if you get stuck. After trying and continuing to tell what went wrong.
Maybe I'll give it another try in the morning, following the FAQ on the OpenTTD wiki, but honestly... I'm not really that tech-savvy, so I'm happy enough when I get compilations made by others working for myself.

I'll try something else tomorrow then and see how it goes.

EDIT: Also, I can see where the Whambulance-thing comes from, but I'm not giving up on frustration.
More... knowing my limits, satisfaction with what I've got anyway... and maybe just a milligram of frustration, I'll admit. ;)

EDIT: Actually, no. It's too complicated for me, and it's only eyecandy I'm trying to add anyway. All I need, I've already got.

EDIT AGAIN: Curiousity got the better of me.
So, I've now compiled the trunk, it seems, in MinGW.
How do I make it so, that whatever patch I cobbled together gets compiled with the trunk?
Do I need to place the files I made with tortoiseSVN into a folder, or do I need to run a command-line in MinGW?
User avatar
ChillCore
Tycoon
Tycoon
Posts: 2822
Joined: 04 Oct 2008 23:05
Location: Lost in spaces

Re: Howto apply a patch/diff file

Post by ChillCore »

Now you paste the patchfile,(.patch or .diff) in your "trunk"folder.
Rightclick select apply patch.
Solve conflicts if any.
Save.
Recompile.
Start exe.

If you are into making patches yourself:

Adjust source manually.
Save.
Recompile.

ps:
Glad you have taken the whambulance in a good way.
Everybody gets frustrated at some point.
No matter who you are or how much experience you have.
My best suggestion is then:
Do something else for a while but do get back at it.
There is no substitute for
YEAH, I DID IT !!!!
-- .- -.-- / - .... . / ..-. --- .-. -.-. . / -... . / .-- .. - .... / -.-- --- ..- .-.-.-
--- .... / -.-- . .- .... --..-- / .- -. -.. / .--. .-. .- .. ... . / - .... . / .-.. --- .-. -.. / ..-. --- .-. / .... . / --. .- ...- . / ..- ... / -.-. .... --- --- -.-. .... --- --- ... .-.-.- / ---... .--.

Playing with my patchpack? Ask questions on usage and report bugs in the correct thread first, please.
All included patches have been modified and are no longer 100% original.
Post Reply

Return to “OpenTTD Development”

Who is online

Users browsing this forum: No registered users and 40 guests