Patching - Revision history

Aximili: Add man page link

2020-03-20T04:20:35Z

Add man page link

EasterlyIrk at 20:43, 29 October 2017

2017-10-29T20:43:59Z

Grahn: /* Example */ removed the example. No need to show two way of doing the same thing.

2015-12-02T22:24:41Z

‎Example: removed the example. No need to show two way of doing the same thing.

Grahn: /* Linux */ be more practical about explaining patch -p. After a question to r.g.r.n.

2015-12-02T22:21:36Z

‎Linux: be more practical about explaining patch -p. After a question to r.g.r.n.

Quantum Immortal: patching on Linux

2015-06-22T08:15:14Z

patching on Linux

Elronnd: todo

2015-04-17T05:04:55Z

todo

86.156.170.102: /* On Windows */ win7 breaks patch, included link with fix

2013-11-30T20:26:37Z

‎On Windows: win7 breaks patch, included link with fix

Paxed: bilious hostname update

2011-05-08T17:23:44Z

bilious hostname update

Aarnott: Missed semicolon...

2011-04-20T17:28:59Z

Missed semicolon...

Aarnott: Let's not have the path variable be erased for the dos session.

2011-04-20T17:28:40Z

Let's not have the path variable be erased for the dos session.

← Older revision		Revision as of 04:20, 20 March 2020
Line 1:		Line 1:
		+	{{man\|patch}}
	Here is a short guide on '''patching''' your NetHack sources, assuming you have already managed to [[compiling\|compile]] your copy.		Here is a short guide on '''patching''' your NetHack sources, assuming you have already managed to [[compiling\|compile]] your copy.

@@ Line 3: / Line 3: @@
 ==On Windows==
-Please see the article on [[compiling]], the following assumes you have installed MinGW and NetHack's sources to the locations shown in that article.
+This assumes you have a basic knowledge of [[compiling]] and similar.
-*Download the patch binary zip package from http://gnuwin32.sourceforge.net/packages/patch.htm
+*Download the patch binary zip package from http://gnuwin32.sourceforge.net/packages/patch.htm, and unpack that into the bin directory of MinGW, so that the patch.exe will be in the same directory as mingw32-make.exe (e.g. c:\mingw\bin).
 *Find the diff-file you want to patch, and download it on to your computer, preferably in the NetHack sources root directory, <tt>c:\nh343</tt>.
-Note that linux-style line endings will cause problems, you need to convert those into Windows-style ones! You can do this for example copypasting the contents of that file from a browser window into Notepad, and then saving the notepad file.
+Note that linux-style line endings will cause problems, you need to convert those into Windows-style ones! You can do this for example copypasting the contents of that file from a browser window into Notepad, and then saving the notepad file. The following code assumes the patch is [[Menucolors]], so to use any other patch just replace <code>nh343-menucolor.diff</code> with the filename of the patch.
 *Start <tt>cmd.exe</tt> and do the following:
@@ Line 18: / Line 14: @@
   path=%path%;c:\mingw\bin
   patch -p1 < nh343-menucolor.diff
 The <tt>1</tt> after the <tt>-p</tt> might need to be changed to <tt>0</tt> or possibly <tt>2</tt> for other patches.
@@ Line 24: / Line 21: @@
 note: Newer version of windows require administrative privileges to run files named patch, which can break GNU patch, see here for a workaround: http://jameswynn.com/2010/03/gnu-patch-in-windows-7-or-vista/
 ==Linux, and Unix in general==
@@ Line 72: / Line 29: @@
 "-p''num''" is used to strip path prefixes from the patch before trying to apply it.
-For example, if the patch contains lines on the form
+For example, if the patch contains lines on the form:
   --- slashem-0.0.7E7F1-orig/dat/Jedi.des 1970-01-01 01:00:00.000000000 +0100
   +++ slashem-0.0.7E7F1/dat/Jedi.des      2005-07-20 14:55:01.434612456 +0200
-you should strip off one level.  You should strip off two levels if the patch says
+you should strip off one level.  You should strip off two levels if the patch says:
   --- a/slashem/dat/Jedi.des 1970-01-01 01:00:00.000000000 +0100

@@ Line 81: / Line 81: @@
   --- a/slashem/dat/Jedi.des 1970-01-01 01:00:00.000000000 +0100
   +++ b/slashem/dat/Jedi.des 2005-07-20 14:55:01.434612456 +0200
 [[Category:Development]]

@@ Line 65: / Line 65: @@
   MENUCOLOR=" unholy "=red
-==Linux==
+==Linux, and Unix in general==
-In general the command for patching is:
+The typical way to patch is to stand in the root directory of the nethack source tree, apply the patch:
-  patch -pnum < my.patch
+  patch -p''num'' < ''my.patch''
-"-pnum" Strip the smallest prefix containing num leading slashes from each file name found in the patch file. A sequence of one or more adjacent slashes is counted as a single slash. This controls how file names found in the patch file are treated, in case you keep your files in a different directory than the person who sent out the patch.
+"-p''num''" is used to strip path prefixes from the patch before trying to apply it.
-For example, supposing the file name in the patch file was:
+ --- slashem-0.0.7E7F1-orig/dat/Jedi.des 1970-01-01 01:00:00.000000000 +0100
-  /u/howard/src/blurfl/blurfl.c
+you should strip off one level.  You should strip off two levels if the patch says
-*setting -p0 gives the entire file name unmodified. Meaning:
+ --- a/slashem/dat/Jedi.des 1970-01-01 01:00:00.000000000 +0100
+  +++ b/slashem/dat/Jedi.des 2005-07-20 14:55:01.434612456 +0200
 ===Example===

@@ Line 1: / Line 1: @@
 Here is a short guide on '''patching''' your NetHack sources, assuming you have already managed to [[compiling|compile]] your copy.
 ==On Windows==
@@ Line 66: / Line 64: @@
   MENUCOLOR=" cursed "=red
   MENUCOLOR=" unholy "=red
 [[Category:Development]]

← Older revision		Revision as of 05:04, 17 April 2015
Line 1:		Line 1:
	Here is a short guide on '''patching''' your NetHack sources, assuming you have already managed to [[compiling\|compile]] your copy.		Here is a short guide on '''patching''' your NetHack sources, assuming you have already managed to [[compiling\|compile]] your copy.
		+
		+	{{todo\|include a short note on patching on unix-derived systems (and also perhaps for OSX}}

	==On Windows==		==On Windows==

← Older revision		Revision as of 20:26, 30 November 2013
Line 22:		Line 22:

	note: On MS-Windows, the patchfile must be a text file, i.e. CR-LF must be used as line endings. A file with LF may give the error: "Assertion failed, hunk, file patch.c, line 343," unless the option '--binary' is given.		note: On MS-Windows, the patchfile must be a text file, i.e. CR-LF must be used as line endings. A file with LF may give the error: "Assertion failed, hunk, file patch.c, line 343," unless the option '--binary' is given.
		+
		+	note: Newer version of windows require administrative privileges to run files named patch, which can break GNU patch, see here for a workaround: http://jameswynn.com/2010/03/gnu-patch-in-windows-7-or-vista/

	*Some patches require extra configuration steps before compiling. For [[menucolors]], you need to edit <tt>c:\nh343\include\config.h</tt> by changing the line		*Some patches require extra configuration steps before compiling. For [[menucolors]], you need to edit <tt>c:\nh343\include\config.h</tt> by changing the line

@@ Line 11: / Line 11: @@
 *Find the diff-file you want to patch, and download it on to your computer, preferably in the NetHack sources root directory, <tt>c:\nh343</tt>.
 Note that linux-style line endings will cause problems, you need to convert those into Windows-style ones! You can do this for example copypasting the contents of that file from a browser window into Notepad, and then saving the notepad file.
-In this example, we'll be using the [[menucolors]]-patch available at http://bilious.homelinux.org/~paxed/nethack/nh343-menucolor.diff
+In this example, we'll be using the [[menucolors]]-patch available at http://bilious.alt.org/~paxed/nethack/nh343-menucolor.diff
 We'll assume the file is saved in <tt>c:\nh343\</tt> as <tt>nh343-menucolor.diff</tt>

@@ Line 16: / Line 16: @@
 *Start <tt>cmd.exe</tt> and do the following:
   cd c:\nh343
-  path=c:\mingw\bin
+  path=%path%c:\mingw\bin
   patch -p1 < nh343-menucolor.diff