Issue 97527 - STLport-4.5.patch broken due to DOS EOL markings on Linux here
Summary: STLport-4.5.patch broken due to DOS EOL markings on Linux here
Status: CLOSED FIXED
Alias: None
Product: Build Tools
Classification: Code
Component: code (show other issues)
Version: DEV300m37
Hardware: All Linux, all
: P3 Trivial (vote)
Target Milestone: ---
Assignee: Yuri Dario
QA Contact: issues@tools
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-12-23 10:25 UTC by andyrtr
Modified: 2010-02-22 15:38 UTC (History)
1 user (show)

See Also:
Issue Type: DEFECT
Latest Confirmation in: ---
Developer Difficulty: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description andyrtr 2008-12-23 10:25:25 UTC 
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.
...
Comment 1 Yuri Dario 2010-02-22 15:37:58 UTC 
This report is probably correct, CRLF issues have been fixed in later CWSs, so
I'm going to close this issue.
Comment 2 Yuri Dario 2010-02-22 15:38:47 UTC 
Closing.