To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=97527 Issue #|97527 Summary|STLport-4.5.patch broken due to DOS EOL markings on Li |nux here Component|tools Version|DEV300m37 Platform|All URL| OS/Version|Linux Status|UNCONFIRMED Status whiteboard| Keywords| Resolution| Issue type|DEFECT Priority|P3 Subcomponent|code Assigned to|ydario Reported by|andyrtr
------- Additional comments from andy...@openoffice.org Tue Dec 23 10:25:25 +0000 2008 ------- build breaks on ArchLinux x86_64 --with-stlport when applying the STLport-4.5.patch. diff -yrN /tmp/m37/src/DEV300_m37/stlport/STLport-4.5.patch /tmp/openoffice-base-devel/trunk/src/DEV300_m38/stlport/STLport-4.5.patch | less shows a "^M" at each End of Line. this breaks here with "patch" version 2.5.9 and "ed" version 1.1: cd ./unxlngx6.pro/misc/build && cat ../../..//STLport-4.5.patch | patch -p2 && touch so_patched_so_stlport patching file STLport-4.5/src/common_macros_os2.mak Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file STLport-4.5/src/common_macros_os2.mak.rej patching file STLport-4.5/src/common_percent_rules.mak Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file STLport-4.5/src/common_percent_rules.mak.rej patching file STLport-4.5/src/dll_main.cpp Hunk #1 FAILED at 147. 1 out of 1 hunk FAILED -- saving rejects to file STLport-4.5/src/dll_main.cpp.rej patching file STLport-4.5/src/gcc-3.0-freebsd.mak Hunk #1 FAILED at 1. ... --------------------------------------------------------------------- Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@tools.openoffice.org For additional commands, e-mail: issues-h...@tools.openoffice.org --------------------------------------------------------------------- To unsubscribe, e-mail: allbugs-unsubscr...@openoffice.org For additional commands, e-mail: allbugs-h...@openoffice.org
