Howto apply a patch/diff file

[Yexo]

You should probably create the directory /usr/src first

[kamnet]

Yep, that helped. Strange. I'll update the wiki to note that. NEXT ISSUE:

Code: Select all

Administrator@KAM-GIGABYTE /home/zlib-1.2.3/mingwPORT
$ ./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) 
SYSTEM_WGETRC = c:/progra~1/wget/etc/wgetrc
syswgetrc = c:\tools\gnu\coreutils/etc/wgetrc
--2010-05-10 18:52:54--  http://www.zlib.net/zlib-1.2.3.tar.bz2
Resolving www.zlib.net... 69.73.181.135
Connecting to www.zlib.net|69.73.181.135|:80... connected.
HTTP request sent, awaiting response... 404 Not Found
2010-05-10 18:52:54 ERROR 404: Not Found.

tar (child): /tmp/zlib-1.2.3.tar.bz2: Cannot open: No such file or directory
tar (child): Error is not recoverable: exiting now
tar: Child returned status 2
tar: Error exit delayed from previous errors
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u3pr zlib-1.2.3/win32/Makefile.gcc zlib-1.2.3-mingwPORT/win32/Makefile.gcc
|--- zlib-1.2.3/win32/Makefile.gcc      Fri Aug  1 23:49:00 2003
|+++ zlib-1.2.3-mingwPORT/win32/Makefile.gcc    Wed Feb  1 11:48:04 2006
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
/usr/src/zlib-1.2.3
make: win32/Makefile.gcc: No such file or directory
make: *** No rule to make target `win32/Makefile.gcc'.  Stop.
make: win32/Makefile.gcc: No such file or directory
make: *** No rule to make target `win32/Makefile.gcc'.  Stop.
make: win32/Makefile.gcc: No such file or directory
make: *** No rule to make target `win32/Makefile.gcc'.  Stop.

Administrator@KAM-GIGABYTE /home/zlib-1.2.3/mingwPORT
$ 

It appears that zlib-1.2.3 is no longer available from zlib.net (current version is 1.2.5). And the script is specifically looking for that version. I don't see an updated script on mingw's page either. Any idea what to do from here? I figured maybe editing the mingwPORT.ini file with the latest version would do it, but it appears everything is still failing at input line 4, so I'm at a loss now.

[therealelvis]

Hi, does anyone know how to install a patch on a mac? For example the chunnels patch. I've looked through all the wikis and they haven't helped at all! Can anyone explain please?

Thanks:)

[Rubidium]

The first post of this topic has been written by the former Mac OS X porter/developer, so whatever is written there should also apply to Mac OS X.

[therealelvis]

Ok thanks

[Echo51]

I have trouble getting my personal .bat to function correctly, either it cant find the file, or subversion claims -p is not a valid option charecter

Code: Select all

subversion patch -p0 -i mestool.diff

also tried

Code: Select all

subversion patch -p0 < mestool.diff

It just wont work...
(win 7 32bit)

[planetmaker]

subversion and patch are different programmes.
try without the 'subversion' part.

[Echo51]

Forgot to add im using svn.exe, so not sure if i need something else?

[planetmaker]

subversion and patch are different programmes.

How else can I phrase that? Subversion won't help you with patching a single bit.

[Echo51]

eh, my bad for not reading that proberly, i'll try

[Quintus]

I want to try out some patches nevertheless I hadn't the courage to do that yet. For example, the daylength-patch. As advised by the wiki and the tutorials around here, I installed TortoiseSVN on my Windows 7 32bit OS and checked the latest OpenTTD-version out. Then I downloaded the patches and tried to apply them by using TortoiseSVN - but nothing happened (I followed the instructions on page 1 of this thread). Afterwards I read about a difference between SVN type and HG/GIT type patches - and the daylength-patch isn't obviously a SVN one. So how do I apply it anyway? The wikipage only describes the way by using TortoiseSVN or with the console for Linux users.

Edit: I'm not talking about compiling - just how to apply a HG/GIT type patch.

Edit#2: Done.

[Eonwe]

how didi u do id? i am encountering the same problem atm

[Gremnon]

Use -p1 instead of -p0 when running patch.

[Alberth]

Use -p1 instead of -p0 when running patch.

That's with a normal patch program, but Eonwe is asking how to do it with TortoiseSVN.

(I don't know, unfortunately)

[Gremnon]

In that case, it can be solved by editing the .patch/diff file directly. Usually, I've found mercurial and git patches often have 'a/src...' and 'b/src...' instead of the normal lines, and by removing the a/ and b/ lines from it, it can be applied as per normal.
I've found one or two cases where it didn't work as expected even then, but it usually fixes it.

[AppeL]

hooray, i managed to compile OpenTTD with MinGW.. now I have a pile of patches (daylength, cargodist etc).. how cna i do that? tortoisesvn apparently works differently from the description on the first page, maybe its updated?

whats to do next?

edit: oh no, it still works the same.. it seems i have the same problem with the a/ and b/ lines.. i removed the +++ line and the --- line but there is another line at the very top, do i remove that aswell? i tried that but i can never apply a patch with tortoise, if i choose .diff file and the trunk directory and click "ok" nothing happens, that small window never opens :<


edit 2: right, i managed to edit the file to make it a svn patch, so i was able to use it with tortoisesvn (it was outdated tho, but thats another thing)

anyways, do i really need to go through ALL the cargodist git files and change the code to make them svn and that everytime i update cargodist?

[ChillCore]

anyways, do i really need to go through ALL the cargodist git files and change the code to make them svn and that everytime i update cargodist?

Yes, unless you apply the patch from the console.
In that case you use "patch -p1 < patch.diff" as command.
"patch -p0" is for svn patches.

[thefluffycontroller]

Possibly seemingly obvious question, but not to me.
If i want to start compiling OTTD myself which of the instructions should i be using from here
http://wiki.openttd.org/Category:Compiling_OpenTTD
I assume i need to mention i am using windows XP as that will have some barring on which i use.

It would be useful for complete noobs like me if it pointed out somewhere which guide was appropriate for which operating system.

[AppeL]

anyways, do i really need to go through ALL the cargodist git files and change the code to make them svn and that everytime i update cargodist?

Yes, unless you apply the patch from the console.
In that case you use "patch -p1 < patch.diff" as command.
"patch -p0" is for svn patches.

is that possible in windows or only linux?

[Eddi]

patch.exe is included in mingw/msys, with this it works on windows as well