[ooo-build] [PATCH/RFC] Fix --disable-extensions build

[Petr Mladek]

Rene Engelhard píše v St 18. 08. 2010 v 10:34 +0200:
> Hi,
> 
> On Wed, Aug 18, 2010 at 02:51:21AM -0500, Jonathan Nieder wrote:
> >  redirect-extensions.diff: testing...< /home/jrn/src/ooo-build/patches/dev300/./redirect-extensions.diff patch  --fuzz=0  -l -p0  -d /home/jrn/src/ooo-build/build/ooo330-m2 --dry-run 
> >  patching file cui/source/options/optlingu.cxx
> >  patching file dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
> >  patching file instsetoo_native/util/openoffice.lst
> >  patching file officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
> >  can't find file to patch at input line 164
> >  Perhaps you used the wrong -p or --strip option?
> >  The text leading up to this was:
> >  --------------------------
> >  |--- reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs.old   2010-07-22 13:08:24.000000000 +0200
> >  |+++ reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs       2010-07-29 14:58:55.000000000 +0200
> >  --------------------------
> >  File to patch: 
> > 
> > There is no reportbuilder directory because I have not enabled extensions.
> 
> That is strictly speaking a bug in that patch, though.
> It should probably be split and the reportbuilder part be in a extra part.

To be more precise. We need to split the diffs into two:

redirect-extensions.diff
redirect-extensions-reportbuilder.diff

The second diff should be mentioned in the section [ ExtensionFixes ] in
the ooo-build/patches/dev300/apply file.


It would great if you could try it and provide diff against ooo-build.


Best Regards,
Petr