[ooo-build] Error build 3.2.0.2

[Petr Mladek]

On Friday 15 January 2010, Davide Dozza wrote:
> Hi all,
>
> building on WinXP, VS2008, Cygwin 1.5.25.
>
> I receive this error
>
> go-oo-win32-installer-branding.diff: testing...unix2dos <
> /cygdrive/c/ooo/ooo-build-3.2.0.2/patches/dev300/./go-oo-win32-installer-br
>anding.diff
>
> | patch  -l -p0
>
>   -d /cygdrive/c/ooo/ooo-build-3.2.0.2/build/ooo320-m9 --dry-run
> (Stripping trailing CRs from patch.)
> patching file
> instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
> Hunk #1 succeeded at 284 (offset -95 lines).
> (Stripping trailing CRs from patch.)
> patching file instsetoo_native/util/makefile.mk
> Hunk #1 FAILED at 372.
> 1 out of 1 hunk FAILED -- saving rejects to file
> instsetoo_native/util/makefile.mk.rej
> (Stripping trailing CRs from patch.)
> patching file instsetoo_native/util/openoffice.lst
> Hunk #1 succeeded at 85 with fuzz 2 (offset 56 lines).
> Hunk #2 succeeded at 149 with fuzz 2 (offset 73 lines).
> Hunk #3 succeeded at 219 with fuzz 1 (offset 97 lines).
> Hunk #4 succeeded at 261 with fuzz 2 (offset 111 lines).
> Hunk #5 succeeded at 356 (offset 264 lines).
> Testing patch go-oo-win32-installer-branding.diff failed. at
> /cygdrive/c/ooo/ooo
> -build-3.2.0.2/patches/apply.pl line 98.
> make: *** [stamp/patch.apply] Error 1

Does it help you to replace 
ooo-build/patches/dev300/go-oo-win32-installer-branding.diff with the 
attached one?

It seems that the diff was not ported for the OOo-3.2 sources. I have updated 
it according to the changes in novell-win32-installer-branding.diff. 

If it does not help, Fridrich or Tor should help you. They are our Windows 
build gurues ;-)

-- 
Best Regards,

Petr Mladek
software developer
---------------------------------------------------------------------  
SUSE LINUX, s. r. o.                        e-mail: pmladek at suse.cz
Lihovarská 1060/12                          tel: +420 284 028 952
190 00 Prague 9                             fax: +420 284 028 951
Czech Republic                              http://www.suse.cz/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: go-oo-win32-installer-branding.diff
Type: text/x-diff
Size: 4601 bytes
Desc: not available
Url : http://lists.freedesktop.org/archives/ooo-build/attachments/20100115/b350b910/attachment.diff