[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freebsd-openoffice
Subject:    Re: Build of 2.3.0 on 6-stable fails
From:       Don Lewis <truckman () freebsd ! org>
Date:       2007-09-28 20:53:48
Message-ID: 200709282053.l8SKrmra025850 () gw ! catspoiler ! org
[Download RAW message or body]

On 28 Sep, Maho NAKATA wrote:
> From: Don Lewis <truckman@FreeBSD.org>
> Subject: Re: Build of 2.3.0 on 6-stable fails
> Date: Tue, 25 Sep 2007 21:11:13 -0700 (PDT)
> 
>> The trigger is WITH_TTF_BYTECODE_ENABLED=yes, which causes the patch
>> file files/optpatch-freetype to be applied to the freetype-2.2.1.patch
>> file in the OO source.   The  freetype-2.2.1.patch patch file was
>> apparently changed for the OO 2.3.0 release, and the optpatch-freetype
>> patch file in the port was not updated to match.
> 
> Right.
> 
>> Where things get interesting is that the patch program applies the first
>> chunk of optpatch-freetype and doesn't reject it, even though the lines
>> being changed don't match those in the patch.   This causes the first
>> four chunks of freetype-2.2.1.patch to be applied to the wrong file in
>> the freetype source and to be rejected.   This apparently confuses
>> gpatch, causing it to think that the rest of the chunks of
>> freetype-2.2.1.patch have already been applied.
> :)
> 
> thanks for clarifying about that.
> 
>> Here's a patch to a patch to a patch that should fix this problem:
> 
> Huge thanks, and as this will never be covered by JCA,
> I can directly commit it to our FBSD port cvs repo. Please verify.

It looked to me like you had some other way of generating
optpatch-freetype using "cvs diff" on a checked-in copy of the OO source
tree.  If so, you should be able to regenerate the file, otherwise you
are welcome to commit my patch.

_______________________________________________
freebsd-openoffice@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice
To unsubscribe, send any mail to "freebsd-openoffice-unsubscribe@freebsd.org"
[prev in list] [next in list] [prev in thread] [next in thread]