On Thursday May 17 2007 02:39, Bruce Dubbs wrote: > Robert Connolly wrote: > > All hunks of the Qt-3.3.8-UTF-8-fix.diff patch fail for me, with > > patch-2.5.9. It's a dos2unix problem. This works for me: > > > > tr -d \\r < ../Qt-3.3.8-UTF-8-fix.diff | patch -Np0 > > Hmm. We don't usually mess with upstream patches like that. I followed > the book's instructions and got: > > $ tar -xf qt-x11-free-3.3.8.tar.bz2 > [bdubbs@/usr/src/qt]$ cd qt-x11-free-3.3.8 > [bdubbs@/usr/src/qt/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 > > [bdubbs@/usr/src/qt/qt-x11-free-3.3.8]$ cd .. > [bdubbs@/usr/src/qt]$ md5sum qt-x11-free-3.3.8.tar.bz2 > Qt-3.3.8-UTF-8-fix.diff > cf3c43a7dfde5bfb76f8001102fe6e85 qt-x11-free-3.3.8.tar.bz2 > ed2033e8f6c40ba86fe679f78b174bff Qt-3.3.8-UTF-8-fix.diff > > The patch was successful with a couple of warnings. > > -- Bruce
This is a patch-2.5.9 bug:
2003-05-18
Do not set p_strip_trailing_cr merely because a -p line contains a CR.
Fixed in:
2003-07-02
* pch.c (intuit_diff_type): If a unified-diff header line contains
trailing CR, strip CR from each body line. This corrects a bug
introduced in the 2003-05-18 patch. Bug reported by Andreas
Gruenbacher.
robert
pgp2Tr4TstFK1.pgp
Description: PGP signature
-- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
