[Open Office] syntax error in patches/src680/apply?

[Atle Nissestad]

On Monday 04 December 2006 22:35, Atle Nissestad wrote:
> On Monday 04 December 2006 20:28, Jonathan Smith wrote:
> > When building with head ooo-build, I get the following error:
> >
> > Execute with  for distro(s) 'rpl2 Localize'
> > Old patch version - pruning LFs
> > PATCHPATH =>
> > .:../evo2:../vba:../mono:../64bit:../cairo:../scsolver:../gstreamer
> > OLDEST_SUPPORTED => ooe680-m2
> > Syntax error at
> > /tmp/conary/builds/openoffice.org/ooo-build/patches/src680/apply, line
> > 1792 make: *** [stamp/patch.apply] Error 2
> >
> > Poking around in that file, the following commit seems relevent:
> >
> > revision 1.1456
> > date: 2006/12/04 11:08:16;  author: rengelhard;  state: Exp;  lines: +3
> > -0 2006-12-03  Rene Engelhard  <rene at debian.org>
> >
> >          * patches/src680/apply,
> >            patches/src680/ooo64508.vcl.honourfontconfighinting.patch,
> >            patches/src680/ooo59127.vcl.honourcairofont.patch: import from
> >            Fedora, add to FedoraFixes
> >
> > I don't know the ins and outs of the format of the file, but that area
> > looks ok to me. Perhaps someone else wouldn't mind taking a look?
> >
> > -smithj
>
> Same error for me too with todays ooo-build and ooe680-m6. The problem
> seems to be that ooo59127.vcl.honourcairofont.patch and
> ooo64508.vcl.honourfontconfighinting.patch should have had the
> extension .diff instead of .patch.
> Limitation of the apply.pl script I guess.
>
> - Atle

And... these patches are generated with the OO top-directory included in the 
diff-path, and will not apply as apply.pl uses 'patch -p0'

- Atle