On Monday 20 October 2003 19:18, Pollywog wrote: > On Mon, 20 Oct 2003 16:12:55 -0300 ... > > 3446: support build directory > > 3447: fix bug #777187 > > 3448: fix auto-popup in non chat mode > > 3449: utility socket notifier fix (probably useless) > > 3450: shows client information in contact list > > The first few patches applied correctly but when I got to 3450, I > got errors. I used today's cvs.
Hum. here all is ok.
[EMAIL PROTECTED] licq $ cd cvs
[EMAIL PROTECTED] cvs $ cvs update -C|grep '?'|awk '{print $2}'|xargs rm -rf
[EMAIL PROTECTED] cvs $ ls
licq licq-common qt-gui rms
[EMAIL PROTECTED] cvs $ for i in ../patches/*; do echo $i; patch -p0 < $i; done
../patches/3446.diff
patching file qt-gui/share/Makefile.am
../patches/3447.diff
patching file qt-gui/src/usereventdlg.h
patching file qt-gui/src/usereventdlg.cpp
Hunk #3 succeeded at 2040 (offset 11 lines).
Hunk #4 succeeded at 2188 (offset 11 lines).
Hunk #5 succeeded at 2296 (offset 11 lines).
Hunk #6 succeeded at 2470 (offset 11 lines).
Hunk #7 succeeded at 2589 (offset 11 lines).
Hunk #8 succeeded at 2719 (offset 11 lines).
../patches/3448.diff
patching file qt-gui/src/mainwin.cpp
../patches/3449.diff
patching file qt-gui/src/utilitydlg.cpp
../patches/3450.diff
patching file qt-gui/src/userbox.cpp
patching file licq/include/licq_user.h
patching file licq/src/user.cpp
Hunk #1 succeeded at 1607 (offset 15 lines).
Hunk #2 succeeded at 1748 (offset 15 lines).
patching file licq/src/icqd-srv.cpp
Hunk #1 succeeded at 1937 (offset 18 lines).
../patches/3451.diff
patching file qt-gui/src/mainwin.h
patching file qt-gui/src/filedlg.cpp
patching file qt-gui/src/optionsdlg.cpp
patching file qt-gui/src/mainwin.cpp
Hunk #2 succeeded at 2898 (offset -179 lines).
patching file qt-gui/src/optionsdlg.h
../patches/3452.diff
patching file licq/src/icqpacket.cpp
patching file licq/src/clientident.h
patching file licq/src/clientident.cpp
patching file licq/src/icqd-srv.cpp
Hunk #2 succeeded at 1850 (offset 18 lines).
Hunk #3 succeeded at 1930 (offset 18 lines).
Hunk #4 succeeded at 1995 (offset 18 lines).
patching file licq/src/Makefile.am
../patches/3453.diff
patching file licq/include/licq_languagecodes.h
patching file licq/src/languagecodes.c
../patches/3454.diff
patch: **** Only garbage was found in the patch input.
../patches/3455.diff
patching file qt-gui/src/mlview3.cpp
../patches/3456.diff
patching file qt-gui/src/userbox.h
patching file qt-gui/src/userbox.cpp
../patches/3457.diff
patching file rms/src/rms.cpp
patching file rms/src/rms.h
../patches/3458.diff
patching file licq-common/admin/acinclude.m4.in
../patches/3459.diff
patching file qt-gui/src/usereventdlg.cpp
../patches/3460.diff
patching file licq/src/licq.conf.h
../patches/3461.diff
patching file qt-gui/src/gui-defines.h
patching file qt-gui/src/mainwin.h
Hunk #4 succeeded at 210 (offset -1 lines).
patching file qt-gui/src/emoticon.h
patching file qt-gui/src/skinbrowser.cpp
patching file qt-gui/src/emoticon.cpp
patching file qt-gui/src/mainwin.cpp
Hunk #5 succeeded at 2915 (offset -179 lines).
patching file qt-gui/src/licq_qt-gui.conf.h
patching file qt-gui/src/skinbrowser.h
patching file qt-gui/src/mlview3.cpp
patching file qt-gui/src/Makefile.am
patching file qt-gui/share/qt-gui/emoticons/None/emoticons.xml
patching file qt-gui/share/qt-gui/emoticons/ccmathteam.com/emoticons.xml
patching file qt-gui/share/qt-gui/emoticons/ccmathteam.com/README
patching file qt-gui/share/qt-gui/emoticons/Default/emoticons.xml
patching file qt-gui/share/qt-gui/emoticons/Default/README.txt
patching file qt-gui/share/qt-gui/emoticons/emoticon.xsd
patching file qt-gui/share/qt-gui/emoticons/phpBB/emoticons.xml
patching file qt-gui/share/qt-gui/emoticons/phpBB/README.txt
patching file qt-gui/share/Makefile.am
../patches/3462.diff
patching file licq/src/clientident.cpp
../patches/3463.diff
patching file qt-gui/src/userbox.cpp
../patches/3464.diff
patch: **** Only garbage was found in the patch input.
--
Buenos Aires, Argentina 21°C with winds at 9 km/h N
pgp00000.pgp
Description: signature
