On Tue, Sep 30, 2008 at 9:20 PM, Stuart Buchanan
<[EMAIL PROTECTED]> wrote:
> (Resend - my previous reply got lost in the ether)
>
> --- On Mon, 22/9/08, Csaba Halász wrote:
>> Patch is broken in multiple places (missing line breaks,
>> parts of lines)
>
> Sorry you are having problems.
>
> I did a comparison between the results of a straight "cvs diff" and what is
> in my patch, and they match (apart from date changes, and ignoring some other
> changes I've been making and removed from the .diff file).
Well, turns out most of the brokenness is ignored by patch, it just
looked wrong. Such as line 10 of simgear.diff:
@@ -203,8 +203,6 @@ void SGEnviro::startOfFrame( sgVec3 p, s
Apart from 2 problems with the dreaded $Id header in cloud.cxx and
sky.cxx it's ok.
In flightgear.diff, however, the hunk at line 36 concerning
environment_mgr.hxx doesn't have any modifications even though the
line count says a line should have been added:
@@ -58,6 +58,7 @@ public:
virtual void bind ();
virtual void unbind ();
virtual void update (double dt);
/**
* Get the environment information for the plane's current position.
Removing this hunk makes the patch apply. It does crash at runtime,
like you described, just with different numbers. So I guess that means
it's okay :)
--
Thanks,
Csaba/Jester
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
