https://bugs.freedesktop.org/show_bug.cgi?id=66826
Priority: medium
Bug ID: 66826
Assignee: [email protected]
Summary: patch 2.7 / line-ending issue
Severity: normal
Classification: Unclassified
OS: Windows (All)
Reporter: [email protected]
Hardware: Other
Status: UNCONFIRMED
Version: 4.1.0.0.alpha0+ Master
Component: Libreoffice
Product: LibreOffice
I've been trying to debug a nasty with building on a recent cygwin. It seems
that the new version of patch has a <cough> non-optimal feature.
$ untar lp_solve...
$ patch --dry-run -p2 <
/opt/libreoffice/calc-group-interpreter/lpsolve/lp_solve_5.5-windows.patch
checking file lpsolve55/cgcc.bat
Hunk #1 FAILED at 7 (different line endings).
1 out of 1 hunk FAILED
checking file lpsolve55/lpsolve.rc
Hunk #1 FAILED at 7 (different line endings).
1 out of 1 hunk FAILED
checking file lpsolve55/cvc6.bat
Hunk #1 FAILED at 14 (different line endings).
1 out of 1 hunk FAILED
michael@linux-9ia1:/ssd/opt/libreoffice/calc-group-interpreter/foo/lp_solve_5.5>
patch --version
GNU patch 2.7.1
Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1988 Larry Wall
This is not ideal - so convert the line-endings to DOS in the patch:
$ unix2dos
/opt/libreoffice/calc-group-interpreter/lpsolve/lp_solve_5.5-windows.patch
$ patch --dry-run -p2 <
/opt/libreoffice/calc-group-interpreter/lpsolve/lp_solve_5.5-windows.patch
(Stripping trailing CRs from patch; use --binary to disable.)
checking file lpsolve55/cgcc.bat
Hunk #1 FAILED at 7 (different line endings).
1 out of 1 hunk FAILED
(Stripping trailing CRs from patch; use --binary to disable.)
checking file lpsolve55/lpsolve.rc
Hunk #1 FAILED at 7 (different line endings).
1 out of 1 hunk FAILED
(Stripping trailing CRs from patch; use --binary to disable.)
checking file lpsolve55/cvc6.bat
Hunk #1 FAILED at 14 (different line endings).
1 out of 1 hunk FAILED
As you see patch carefully does:
"(Stripping trailing CRs from patch; use --binary to disable.)"
and then (because they are missing) refuses to apply the patch :-)
Doh.
--
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Libreoffice-bugs mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
