I put the patchfile in /dosbox-0.65 then did:
patch -p0 <nullmodem7.diff and it said the following:
(Stripping trailing CRs from patch.)
patching file src/ints/bios.cpp
Hunk #2 succeeded at 376 (offset 14 lines).
Hunk #4 succeeded at 438 (offset 14 lines).
Hunk #5 FAILED at 866.
Hunk #6 succeeded at 933 (offset -35 lines).
1 out of 6 hunks FAILED -- saving rejects to file src/ints/bios.cpp.rej
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/softmodem.cpp
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/directserial_win32.cpp
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/serialdummy.cpp
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/directserial_win32.h
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/softmodem.h
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/serialport.cpp
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/Makefile.am
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/serialdummy.h
(Stripping trailing CRs from patch.)
patching file configure.in
Hunk #1 succeeded at 290 (offset -2 lines).
(Stripping trailing CRs from patch.)
can't find file to patch at input line 3851
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: .cvsignore
|===================================================================
|RCS file: /cvsroot/dosbox/dosbox/.cvsignore,v
|retrieving revision 1.3
|diff -u -r1.3 .cvsignore
|--- .cvsignore 18 Jul 2004 16:56:07 -0000 1.3
|+++ .cvsignore 16 Nov 2006 00:37:54 -0000
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch.)
patching file visualc_net/dosbox.vcproj
Hunk #3 succeeded at 513 (offset -9 lines).
(Stripping trailing CRs from patch.)
can't find file to patch at input line 3936
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: visualc_net/.cvsignore
|===================================================================
|RCS file: /cvsroot/dosbox/dosbox/visualc_net/.cvsignore,v
|retrieving revision 1.1
|diff -u -r1.1 .cvsignore
|--- visualc_net/.cvsignore 1 Jan 2004 13:53:48 -0000 1.1
|+++ visualc_net/.cvsignore 16 Nov 2006 00:38:04 -0000
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch.)
patching file src/dosbox.cpp
Hunk #1 succeeded at 412 (offset -9 lines).
Hunk #2 succeeded at 460 (offset -3 lines).
(Stripping trailing CRs from patch.)
patching file src/cpu/cpu.cpp
Hunk #1 FAILED at 34.
Hunk #2 succeeded at 2015 (offset -108 lines).
1 out of 2 hunks FAILED -- saving rejects to file src/cpu/cpu.cpp.rej
(Stripping trailing CRs from patch.)
patching file include/bios.h
Hunk #1 succeeded at 169 with fuzz 2 (offset -8 lines).
(Stripping trailing CRs from patch.)
patching file include/ipx.h
Hunk #1 FAILED at 27.
1 out of 1 hunk FAILED -- saving rejects to file include/ipx.h.rej
(Stripping trailing CRs from patch.)
patching file include/pic.h
Hunk #1 succeeded at 59 with fuzz 1 (offset -1 lines).
(Stripping trailing CRs from patch.)
patching file include/serialport.h
(Stripping trailing CRs from patch.)
patching file src/platform/visualc/config.h
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/nullmodem.h
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/misc_util.h
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/directserial_posix.h
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/misc_util.cpp
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/directserial_posix.cpp
(Stripping trailing CRs from patch.)
patching file src/hardware/serialport/nullmodem.cpp
Then I did configure and then make and make died with the following:
serialport.cpp: In static member function `static bool CSerial::getBituSubstring
(const char*, Bitu*, CommandLine*)':
serialport.cpp:1072: error: invalid conversion from `const char*' to `char*'
serialport.cpp:1072: error: initializing argument 1 of `bool CommandLine::Find
StringBegin(char*, std::string&, bool)'
serialport.cpp: In constructor `SERIALPORTS::SERIALPORTS(Section*)':
serialport.cpp:1182: error: invalid conversion from `const char*' to `char*'
serialport.cpp:1182: error: initializing argument 2 of `CommandLine::CommandLi
ne(char*, char*)'
make[4]: *** [serialport.o] Error 1
There were also a ton of warnings before this.
What did I do wrong??
Thanks
PS, Sorry to be such a pain. 😀