Re: Applying of Patches Fails When Building ooo-build 3.2.1.4

On 06/18/2010 05:25 PM, [email protected] wrote:
> On 06/18/2010 05:11 PM, Kohei Yoshida wrote:
>> On Fri, 2010-06-18 at 16:58 -0700, [email protected] wrote:
>>> On 06/18/2010 04:36 PM, Kohei Yoshida wrote:
>>>> On Fri, 2010-06-18 at 15:18 -0700, [email protected] wrote:
>>>>
>>>>> Testing patch calc-perf-speedup-pagebreak-update.diff failed. at
>>>>> /tmp/ooo-build-3.2.1.4/patches/apply.pl line 98.
>>>>> make: *** [stamp/patch.apply] Error 1
>>>>>
>>>>>
>>>>> This also happened with 3.2.1.3, which was the first 3.2.1 version I
>>>>> attempted to build.
>>>>>
>>>>> Any help is appreciated.  Please let me know if more information is
>>>>> required.
>>>>
>>>> Check the version of your patch program.  If it's not 2.5.9, try to
>>>> upgrade it to that version.  My gut feeling is that you are using a
>>>> version older than 2.5.9 which is known to choke on applying that above
>>>> patch (of mine).
>>>>
>>>> Kohei
>>>>
>>>
>>> Kohei,
>>>
>>> Thanks for the tip.  The version of patch that ships with Slackware 13.1
>>> is 2.5.4.  I'll upgrade to 2.5.9 and try again.
>>>
>>> Did something change with the calc-perf-speedup-pagebreak-update.diff
>>> patch from the 3.2.0 branch and the 3.2.1 branch?  I didn't have
>>> problems building ooo-build 3.2.0.x with patch version 2.5.4.
>>
>> I may have hand-edited some hunks in that patch.  The older patch
>> programs were pretty picky on hand-crafted hunks especially when the
>> number of context line(s) before and after the changed line(s) were
>> different.
>>
>> Petr just checked in a fix for that patch so that it would apply even
>> with the older patch versions.  So, you may want to try the latest from
>> the ooo-build-3-2-1 branch in case you can't (or don't want to) upgrade
>> your patch program.
>>
>> HTH,
>>
>> Kohei
> 
> I downloaded the diff for this patch.  I'll apply that rather than 
> upgrade the patch program on my system and see if that works.
> 
> Thanks for your help.
> 
> -Mike

The updated calc-perf-speedup-pagebreak-update.diff patched applied
without error using patch version 2.5.4.

Thanks again,

Mike