[ooo-build] error applying patch "always-save-option-svtools.diff"

[Kohei Yoshida]

On Fri, 2009-12-18 at 17:57 -0800, Ross Melin wrote:
> I'm trying to get started using ooo-build.
> Following the simple instructions on the Developers page:
> 
> git clone git://anongit.freedesktop.org/git/ooo-build/ooo-build 
> 
> cd ooo-build
> ./autogen.sh --with-distro=ArchLinux
> ./download
> make 
> 
> Build bails out shortly with this error
> 
> always-save-option-svtools.diff:
> testing...< /home/build/ooo-build/patches/dev300/./always-save-option-svtools.diff patch  -l -p0  -d /home/build/ooo-build/build/ooo320-m8 --dry-run 
> patching file svtools/inc/svtools/miscopt.hxx
> Hunk #1 succeeded at 147 (offset -2 lines).
> patching file svtools/source/config/miscopt.cxx
> Hunk #1 FAILED at 91.
> Hunk #2 FAILED at 126.
> Hunk #3 succeeded at 200 with fuzz 2 (offset -6 lines).
> Hunk #4 succeeded at 352 (offset -6 lines).
> Hunk #5 succeeded at 457 with fuzz 1 (offset -13 lines).
> Hunk #6 succeeded at 578 with fuzz 1 (offset -18 lines).
> Hunk #7 succeeded at 747 with fuzz 1 (offset -24 lines).
> Hunk #8 FAILED at 798.
> Hunk #9 succeeded at 974 (offset -30 lines).
> 3 out of 9 hunks FAILED -- saving rejects to file
> svtools/source/config/miscopt.cxx.rej
> Testing patch always-save-option-svtools.diff failed.
> at /home/build/ooo-build/patches/apply.pl line 98.
> make: *** [stamp/patch.apply] Error 1
> 
> Any help will be appreciated

Well, someone else also had a similar problem with that patch of mine.
A quick search reveals that there are several other patches that touch
that particular file to add slot ID:

* linkwarn-svtools-miscopts-bits.diff (in LinkWarningDlg section)
* ui-desktop-integration.diff (in Lockdown section)
* novell-win32-odma.diff (in Features section)

Now, every distro-config should have both the LinkWarningDlg and
Features sections included.  So, that only leaves us the Lockdown
section.  If you look at ArchLinux's configuration it only has

  ArchLinux: LinuxCommon (line 116 in 'patches/dev300/apply')

which doesn't include the Lockdown section.  So, my advice is to add
'Lockdown' to ArchLinux configuration i.e. change the above line in the
apply file into

ArchLinux: LinuxCommon, Lockdown

and run 'make' again.  That *should* in theory solve the problem for
you.

HTH,

Kohei

-- 
Kohei Yoshida - OpenOffice.org Engineer - Novell, Inc.
<kyoshida at novell.com>