Chris Staub wrote: > > Just showing every step here to verify that I'm using the same patch > that's in the book, and I even pasted the patch command from the book... > > [EMAIL PROTECTED]:~/qt-x11-free-3.3.8$ patch -Np0 -i > ../Qt-3.3.8-UTF-8-fix.diff > patching file src/codecs/qutfcodec.cpp > Hunk #1 FAILED at 154. > Hunk #2 FAILED at 168. > Hunk #3 FAILED at 184. > Hunk #4 FAILED at 194. > Hunk #5 FAILED at 205. > 5 out of 5 hunks FAILED -- saving rejects to file > src/codecs/qutfcodec.cpp.rej > patching file src/tools/qstring.cpp > Hunk #1 FAILED at 5805. > Hunk #2 FAILED at 5823. > Hunk #3 FAILED at 5851. > 3 out of 3 hunks FAILED -- saving rejects to file src/tools/qstring.cpp.rej > [EMAIL PROTECTED]:~/qt-x11-free-3.3.8$ file ../Qt-3.3.8-UTF-8-fix.diff > ../Qt-3.3.8-UTF-8-fix.diff: ASCII C++ program text, with CRLF line > terminators
And one more step... [EMAIL PROTECTED]:~/qt-x11-free-3.3.8$ patch -Np0 -i ../Qt-3.3.8-UTF-8-fix.diff patching file src/codecs/qutfcodec.cpp Hunk #1 FAILED at 154. Hunk #2 FAILED at 168. Hunk #3 FAILED at 184. Hunk #4 FAILED at 194. Hunk #5 FAILED at 205. 5 out of 5 hunks FAILED -- saving rejects to file src/codecs/qutfcodec.cpp.rej patching file src/tools/qstring.cpp Hunk #1 FAILED at 5805. Hunk #2 FAILED at 5823. Hunk #3 FAILED at 5851. 3 out of 3 hunks FAILED -- saving rejects to file src/tools/qstring.cpp.rej [EMAIL PROTECTED]:~/qt-x11-free-3.3.8$ tr -d '\15\32' < ../Qt-3.3.8-UTF-8-fix.diff > ../qt-new-patch [EMAIL PROTECTED]:~/qt-x11-free-3.3.8$ patch -Np0 -i ../qt-new-patch patching file src/codecs/qutfcodec.cpp patching file src/tools/qstring.cpp -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
