Opened 15 years ago

Closed 14 years ago

#2394 closed defect (wontfix)

QT3 patch won't apply

Reported by: Moody Owned by: blfs-book@…
Priority: normal Milestone: 6.3
Component: BOOK Version: SVN
Severity: trivial Keywords:
Cc:

Description

i pick up a user comment to QT3 here:

... Qt-3.3.8-UTF-8-fix.diff patch won't apply because it's dos formatted with (control)M (linefeed?) ...

I checked this idea because the patch does not apply here, too. I added a sed to wipe out the 0x0D and the patch applies fine:

sed -e "s/\r//g" ../Qt-3.3.8-UTF-8-fix.diff | patch -Np0

So I would recommend to replace the patch command by the above one.

Change History (2)

comment:1 by Randy McMurchy, 15 years ago

Severity: majortrivial
Type: taskdefect

Changing this ticket to a lower priority, as the patch applies (using current LFS), however, it does mention about stripping the CR's.

comment:2 by Randy McMurchy, 14 years ago

Resolution: wontfix
Status: newclosed

Using a stock LFS-6.3 setup, the patch applies fine:

rml@rmlinux: ~/build/qt-x11-free-3.3.8 > patch -Np0 -i ../Qt-3.3.8-UTF-8-fix.diff (Stripping trailing CRs from patch.) patching file src/codecs/qutfcodec.cpp (Stripping trailing CRs from patch.) patching file src/tools/qstring.cpp

I see no reason to modify the patch. Though it certainly wouldn't hurt, there really is no reason to do it unless you're using older versions of the patch command.

If anyone continues to see this problem, I suppose we can reopen the ticket. Closing.

Note: See TracTickets for help on using tickets.