[ooo-build] 3.2.0.9 patch apply error

[Petr Mladek]

On Sunday 28 March 2010, Sasa Ostrouska wrote:
> Hi , today I was traying to build up ooo with the 3.2.0.9 version of
> ooo-build and I got the following error during the apply phase of patches.
>
> /home/sasa/DEVELOPMENT/DROPLINE_GNOME/DBS/DLG/WORK/openoffice-3.2.0-1/ooo-b
>uild-3.2.0.9/patches/dev300/./branch_directly_to_cpp_vtable_call_on_arm.diff
> sed 's/^\(@.*\)\r$/\1/' | patch  -l -p0  -d
> /home/sasa/DEVELOPMENT/DROPLINE_GNOME/DBS/DLG/WORK/openoffice-3.2.0-1/ooo-b
>uild-3.2.0.9/build/ooo320-m12 --dry-run
> patching file bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s
> Hunk #1 FAILED at 8.
> 1 out of 1 hunk FAILED -- saving rejects to file
> bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s.rej
> Testing patch branch_directly_to_cpp_vtable_call_on_arm.diff failed.
> at
> /home/sasa/DEVELOPMENT/DROPLINE_GNOME/DBS/DLG/WORK/openoffice-3.2.0-1/ooo-b
>uild-3.2.0.9/patches/apply.pl line 98.
> make: *** [stamp/patch.apply] Error 1
> Error!  make exited with status: 2
> Failed package openoffice

Hmm, the branch_directly_to_cpp_vtable_call_on_arm.diff included DOS end of 
lines. I expect that it caused the troubles on your system.

I have just fixed this, see
http://cgit.freedesktop.org/ooo-build/ooo-build/commit/?h=ooo-build-3-2&id=cf86e1033f53214377af9522cf9a942610cb6c77

If you want to use the released ooo-build-3.2.0.9.tar.gz, you might copy the 
attached fixed diff into the ooo-build-3.2.0.9/patches/hotfixes directory.


-- 
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: branch_directly_to_cpp_vtable_call_on_arm.diff
Type: text/x-diff
Size: 1620 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/ooo-build/attachments/20100329/aedc3a25/attachment.diff>