Previous Thread
Next Thread
Print Thread
#68737 04/19/11 08:42 PM
Joined: Jul 2008
Posts: 19
P
powtrix Offline OP
Member
OP Offline
Member
P
Joined: Jul 2008
Posts: 19
Hi there.

I was using the method "sed -i -e 's/.$//' '{}' ';' to compile the updates, now 0.142u1 fails to patch:

Quote:
patch -p0 --binary < 0142u1.diff
patching file makefile
(... removed the good patched lines)
patching file src/mame/layout/armora.lay
Hunk #1 succeeded at 180 with fuzz 1.
(...)
patching file src/mame/layout/gridiron.lay
Hunk #1 FAILED at 17.
1 out of 1 hunk FAILED -- saving rejects to file src/mame/layout/gridiron.lay.rej
patching file src/mame/layout/jollycrd.lay
patching file src/mame/layout/lagunar.lay
(...)
patching file src/osd/windows/winmisc.c
patching file src/tools/src2html.c
patching file src/version.c


with or witout --binary and/or sed 's/.$//' didn't work here.
Any idea?


--
pow!
Joined: Mar 2001
Posts: 17,070
Likes: 143
R
Very Senior Member
Online Content
Very Senior Member
R
Joined: Mar 2001
Posts: 17,070
Likes: 143
So just those two layout files don't patch correctly?

Joined: Jul 2008
Posts: 19
P
powtrix Offline OP
Member
OP Offline
Member
P
Joined: Jul 2008
Posts: 19
just one fail

Quote:
powtrix@laptrix:~/downloads/mame/tmp/mamesrc$ patch -p0 --binary --dry-run \
> -i 0142u1.diff | grep -v patching
Hunk #1 succeeded at 180 with fuzz 1.
Hunk #1 FAILED at 17.
1 out of 1 hunk FAILED -- saving rejects to file src/mame/layout/gridiron.lay.rej


--
pow!
Joined: Mar 2004
Posts: 675
Likes: 1
Senior Member
Offline
Senior Member
Joined: Mar 2004
Posts: 675
Likes: 1

Joined: Jul 2008
Posts: 19
P
powtrix Offline OP
Member
OP Offline
Member
P
Joined: Jul 2008
Posts: 19
thanks, fixed
- sed -i 's/.$//'
+ sed -i 's/\r//'


--
pow!

Moderated by  R. Belmont 

Link Copied to Clipboard
Who's Online Now
5 members (Pernod, drewcifer, Phil Bennett, Golden Child, 1 invisible), 32 guests, and 1 robot.
Key: Admin, Global Mod, Mod
ShoutChat
Comment Guidelines: Do post respectful and insightful comments. Don't flame, hate, spam.
Forum Statistics
Forums9
Topics9,221
Posts120,756
Members5,053
Most Online1,283
Dec 21st, 2022
Our Sponsor
These forums are sponsored by Superior Solitaire, an ad-free card game collection for macOS and iOS. Download it today!

Superior Solitaire
Forum hosted by www.retrogamesformac.com