[ooo-build] apply script is going crazy on master

[Jan Holesovsky]

Hi Kohei,

On Thursday 01 October 2009, Petr Mladek wrote:

> > > Two things strike me as odd.  First, why the apply script go back up in
> > > the apply file, and second, why apply patches under BFBuildBits
> > > section, which AFAIK no distros use.
> >
> > Well, I chatted with Tor a bit in IRC, and found out that there are
> > several special sections that automatically get applied *after* all the
> > other normal patches get applied, and the Binfilter sections
> > (BFBuildBits, BFFixes, and BFShrink) are just one of those special
> > sections.  And they can be anywhere in the apply file, and still get
> > applied at the end...
>
> These sections are applied via the extra --distro options, see
> ooo-build/bin/applyflags. The distros are proceed one by one by apply.pl.
> It would need to change the design to fix this.

It was a quick hack added by me, because it was enough at that time to fix the 
pressing need, and possible with just a trivial change in apply.pl :-)  See 
the commit 65af47f76c0a1ab03f10f2ab4c7b5437a6cf0794 for more details.

> Another possibility would be to apply these extra sections via
> the --additional-sections option.
>
> The --distro options are used from histrical reasons
> because --additional-sections was implemented later. Any volunteer who
> would swith it it ;-)

Clearly, --additional-sections is the way to go.  Petr/Kohei, can you please 
test (& eventually apply) the attached patch?

Regards,
Kendy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: applyflags.diff
Type: text/x-diff
Size: 1860 bytes
Desc: not available
Url : http://lists.freedesktop.org/archives/ooo-build/attachments/20091002/64feaf01/attachment.diff