On 14 Jul, 2010, at 3:41 AM, Alexander Hansen wrote:
> Try a different level. The default -p1 patch assumes that you're
> rooted in the top level Fink build directory for the package
> (/sw/src/freeciv-2.2.1-5/), and your diff appears to be from at least
> one level lower. Try p2 maybe.
The problem remains, though it has changed slightly. Here is more
detail from the -p1 level:
> [ -r /sw/fink/dists/local/main/finkinfo/freeciv.patch ]
> patch -p1 < /sw/fink/dists/local/main/finkinfo/freeciv.patch
> can't find file to patch at input line 3
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |--- client/audio_sdl.c-original.c 2010-05-23 14:43:05.000000000 -0700
> |+++ client/audio_sdl.c 2010-07-11 01:08:33.000000000 -0700
> --------------------------
Here is -p2 and above:
> [ -r /sw/fink/dists/local/main/finkinfo/freeciv.patch ]
> patch -p2 </sw/fink/dists/local/main/finkinfo/freeciv.patch
> missing header for unified diff at line 3 of patch
> can't find file to patch at input line 3
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |--- client/audio_sdl.c-original.c 2010-05-23 14:43:05.000000000 -0700
> |+++ client/audio_sdl.c 2010-07-11 01:08:33.000000000 -0700
> --------------------------
So the 'missing header' line is new, but doesn't put me any closer to
fixing this. Should there be a space between the '<' character and the '/'
character on the line above it?
Sent from my MacBookPro
Many wish to serve God, but only in an advisory capacity.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Fink-devel mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel
