|
Rockbox mail archiveSubject: Re: CrashRe: Crash
From: Mike Holden <rockbox_at_mikeholden.uklinux.net>
Date: Sat, 12 Apr 2003 22:37:43 +0100 (BST) Johan Vromans said: > "Mike Holden" <rockbox_at_mikeholden.uklinux.net> writes: > >> Mike Holden said: >> I've looked at merging your patch, but it doesn't apply cleanly to the >> current CVS version. > > Huh? I just applied it to my CVS tree (last updated earlier today) and > it went in smoothly. Tried a clean CVS checkout, and get the same errors. Below is the output from patch. I manually typed in the correct filename to use, since the patch refers to your local directories which I don't have. -----start of patch output [rockbox_at_penguin dirk]$ patch < /tmp/rockbox-daily-20030122_statusmod.diff (Stripping trailing CRs from patch.) can't find file to patch at input line 4 Perhaps you should have used the -p or --strip option? The text leading up to this was: -------------------------- |diff -ubr rockbox-daily-20030122/apps/recorder/icons.c rockbox-daily-20030122_statusmod/apps/recorder/icons.c |--- rockbox-daily-20030122/apps/recorder/icons.c Thu Dec 19 06:00:18 2002 |+++ rockbox-daily-20030122_statusmod/apps/recorder/icons.c Thu Jan 23 18:29:00 2003 -------------------------- File to patch: apps/recorder/icons.c patching file apps/recorder/icons.c Hunk #2 FAILED at 163. Hunk #3 FAILED at 176. Hunk #4 FAILED at 185. Hunk #5 succeeded at 287 (offset 4 lines). 3 out of 5 hunks FAILED -- saving rejects to file apps/recorder/icons.c.rej (Stripping trailing CRs from patch.) can't find file to patch at input line 66 Perhaps you should have used the -p or --strip option? The text leading up to this was: -------------------------- |diff -ubr rockbox-daily-20030122/apps/recorder/icons.h rockbox-daily-20030122_statusmod/apps/recorder/icons.h |--- rockbox-daily-20030122/apps/recorder/icons.h Thu Oct 10 07:00:48 2002 |+++ rockbox-daily-20030122_statusmod/apps/recorder/icons.h Thu Jan 23 18:27:39 2003 -------------------------- File to patch: apps/recorder/icons.h patching file apps/recorder/icons.h (Stripping trailing CRs from patch.) can't find file to patch at input line 85 Perhaps you should have used the -p or --strip option? The text leading up to this was: -------------------------- |diff -ubr rockbox-daily-20030122/apps/screens.c rockbox-daily-20030122_statusmod/apps/screens.c |--- rockbox-daily-20030122/apps/screens.c Thu Jan 9 06:00:24 2003 |+++ rockbox-daily-20030122_statusmod/apps/screens.c Thu Jan 23 11:07:18 2003 -------------------------- File to patch: apps/screens.c patching file apps/screens.c (Stripping trailing CRs from patch.) can't find file to patch at input line 114 Perhaps you should have used the -p or --strip option? The text leading up to this was: -------------------------- |diff -ubr rockbox-daily-20030122/apps/status.c rockbox-daily-20030122_statusmod/apps/status.c |--- rockbox-daily-20030122/apps/status.c Thu Dec 19 06:00:18 2002 |+++ rockbox-daily-20030122_statusmod/apps/status.c Thu Jan 23 19:15:00 2003 -------------------------- File to patch: apps/status.c patching file apps/status.c Hunk #2 FAILED at 86. Hunk #3 FAILED at 201. Hunk #4 succeeded at 256 with fuzz 2 (offset 4 lines). 2 out of 4 hunks FAILED -- saving rejects to file apps/status.c.rej (Stripping trailing CRs from patch.) can't find file to patch at input line 229 Perhaps you should have used the -p or --strip option? The text leading up to this was: -------------------------- |diff -ubr rockbox-daily-20030122/apps/status.h rockbox-daily-20030122_statusmod/apps/status.h |--- rockbox-daily-20030122/apps/status.h Thu Dec 19 06:00:18 2002 |+++ rockbox-daily-20030122_statusmod/apps/status.h Wed Jan 22 23:24:54 2003 -------------------------- File to patch: apps/status.h patching file apps/status.h ----end ofpatch output -- Mike HoldenReceived on 2003-04-12 Page template was last modified "Tue Sep 7 00:00:02 2021" The Rockbox Crew -- Privacy Policy |