Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Submodule 'iris' (git://github.com/psi-im/iris.git) registered for path 'iris'
- Submodule 'src/libpsi' (git://github.com/psi-im/libpsi.git) registered for path 'src/libpsi'
- Cloning into '/home/user/build/psi-plus-git/src/psi/iris'...
- done.
- Cloning into '/home/user/build/psi-plus-git/src/psi/src/libpsi'...
- done.
- Submodule path 'iris': checked out 'ba7f83ae013195bb82a038a881f86801c23c5c61'
- Submodule path 'src/libpsi': checked out 'dc15ca561a5676da68bad63adc3aae31a26c32fc'
- * Appling 0010-psi-iconsets.diff
- patching file iconsets.qrc
- patching file iconsets/system/default/icondef.xml
- * Appling 0020-psi-icon-actions-shortcuts.diff
- patching file options/default.xml
- Hunk #1 succeeded at 445 (offset 1 line).
- patching file src/psiactionlist.cpp
- * Appling 0030-psi-default-application-settings.diff
- patching file options/default.xml
- Hunk #7 succeeded at 402 (offset 1 line).
- Hunk #8 succeeded at 422 (offset 1 line).
- Hunk #9 succeeded at 434 (offset 1 line).
- Hunk #10 succeeded at 537 (offset 1 line).
- Hunk #11 succeeded at 546 (offset 1 line).
- Hunk #12 succeeded at 594 (offset 1 line).
- Hunk #13 succeeded at 613 (offset 1 line).
- patching file options/macosx.xml
- patching file options/windows.xml
- patching file src/psi_profiles.cpp
- patching file src/psioptions.cpp
- * Appling 0040-psi-tabs-button-killer.diff
- patching file options/default.xml
- Hunk #1 succeeded at 442 (offset 3 lines).
- patching file src/options/opt_chat.cpp
- patching file src/options/opt_chat.ui
- patching file src/psicon.cpp
- Hunk #1 succeeded at 1425 (offset 11 lines).
- patching file src/tabs/tabdlg.cpp
- patching file src/widgets/psitabwidget.cpp
- * Appling 0060-psi-configure-hyperlink-color.diff
- patching file options/default.xml
- Hunk #1 succeeded at 348 (offset 3 lines).
- patching file src/textutil.cpp
- * Appling 0070-psi-dirty-check.diff
- patching file src/AutoUpdater/AutoUpdater.pri
- patching file src/AutoUpdater/QDChangeLog.ui
- patching file src/AutoUpdater/QDChecker.cpp
- patching file src/AutoUpdater/QDChecker.h
- patching file src/psicon.cpp
- Hunk #1 succeeded at 122 (offset 3 lines).
- Hunk #2 succeeded at 466 (offset 2 lines).
- Hunk #3 succeeded at 501 (offset 2 lines).
- patching file src/src.pri
- Hunk #1 succeeded at 58 (offset 7 lines).
- * Appling 0090-psi-add-view-groups-to-tray-menu.diff
- patching file src/mainwin.cpp
- Hunk #3 succeeded at 944 (offset -3 lines).
- * Appling 0100-psi-contact-manager.diff
- patching file src/contactlistaccountmenu.cpp
- Hunk #1 succeeded at 34 (offset 2 lines).
- Hunk #2 succeeded at 49 (offset 2 lines).
- Hunk #3 succeeded at 106 (offset 3 lines).
- Hunk #4 succeeded at 163 (offset 3 lines).
- Hunk #5 succeeded at 234 (offset 9 lines).
- Hunk #6 succeeded at 366 (offset 15 lines).
- patching file src/contactmanager/contactmanager.pri
- patching file src/contactmanager/contactmanagerdlg.cpp
- patching file src/contactmanager/contactmanagerdlg.h
- patching file src/contactmanager/contactmanagerdlg.ui
- patching file src/contactmanager/contactmanagermodel.cpp
- patching file src/contactmanager/contactmanagermodel.h
- patching file src/contactmanager/contactmanagerview.cpp
- patching file src/contactmanager/contactmanagerview.h
- patching file src/src.pri
- Hunk #1 succeeded at 25 (offset 8 lines).
- * Appling 0110-psiplus-more-compatibility-with-skinsplugin.diff
- patching file src/mainwin.cpp
- Hunk #1 succeeded at 346 (offset -12 lines).
- Hunk #2 succeeded at 590 (offset -12 lines).
- patching file src/mainwin.h
- * Appling 0120-psi-css-style-sheet.diff
- patching file options/default.xml
- Hunk #1 succeeded at 122 (offset 2 lines).
- Hunk #2 succeeded at 147 (offset 2 lines).
- Hunk #3 succeeded at 156 (offset 2 lines).
- Hunk #4 succeeded at 420 (offset 3 lines).
- Hunk #5 succeeded at 437 (offset 3 lines).
- patching file src/contactlistitemmenu.cpp
- patching file src/gcuserview.cpp
- Hunk #1 succeeded at 740 (offset 19 lines).
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 1955 (offset 48 lines).
- patching file src/mainwin.cpp
- Hunk #1 succeeded at 562 (offset -12 lines).
- Hunk #2 succeeded at 597 (offset -12 lines).
- patching file src/psichatdlg.cpp
- Hunk #1 succeeded at 289 (offset 5 lines).
- patching file src/psicon.cpp
- Hunk #1 succeeded at 513 (offset 2 lines).
- Hunk #2 succeeded at 1443 (offset 11 lines).
- patching file src/statusmenu.cpp
- patching file src/tabs/tabdlg.cpp
- patching file src/widgets/fancypopup.cpp
- patching file src/widgets/iconaction.cpp
- patching file src/widgets/psitabwidget.cpp
- patching file src/widgets/psitabwidget.h
- patching file src/widgets/psitiplabel.cpp
- patching file src/widgets/urlobject.cpp
- * Appling 0130-psiplus-nix-application-icon-and-name.diff
- patching file psi.desktop
- patching file src/src.pro
- Hunk #1 succeeded at 50 (offset 3 lines).
- * Appling 0140-psi-tray-act-bring-to-front.diff
- patching file options/default.xml
- Hunk #1 succeeded at 220 (offset 3 lines).
- patching file src/mainwin.cpp
- Hunk #3 succeeded at 1487 (offset -3 lines).
- Hunk #4 succeeded at 1631 (offset -3 lines).
- Hunk #5 succeeded at 1684 (offset -3 lines).
- patching file src/mainwin.h
- patching file src/src.pri
- patching file src/x11windowsystem.cpp
- patching file src/x11windowsystem.h
- * Appling 0150-psi-options-language-select.diff
- patching file src/options/opt_application.cpp
- patching file src/options/opt_application.ui
- * Appling 0160-psi-minimize-chat-hotkey.diff
- patching file options/default.xml
- Hunk #1 succeeded at 604 (offset 3 lines).
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 227 (offset 3 lines).
- Hunk #2 succeeded at 796 (offset 9 lines).
- Hunk #3 succeeded at 917 (offset 16 lines).
- Hunk #4 succeeded at 965 (offset 16 lines).
- patching file src/groupchatdlg.h
- Hunk #1 succeeded at 146 (offset 5 lines).
- patching file src/psichatdlg.cpp
- Hunk #1 succeeded at 354 (offset 5 lines).
- Hunk #2 succeeded at 904 (offset 15 lines).
- patching file src/psichatdlg.h
- Hunk #1 succeeded at 35 (offset -1 lines).
- Hunk #2 succeeded at 85 (offset -1 lines).
- * Appling 0170-psi-add-bookmarks-to-join-conference-dlg.diff
- patching file src/mucjoin.ui
- patching file src/mucjoindlg.cpp
- patching file src/mucjoindlg.h
- * Appling 0180-psiplus-decorate-windows.diff
- patching file options/default.xml
- Hunk #1 succeeded at 485 (offset 1 line).
- patching file src/groupchatdlg.cpp
- Hunk #2 succeeded at 252 (offset 2 lines).
- Hunk #3 succeeded at 686 (offset 2 lines).
- Hunk #4 succeeded at 2260 (offset 17 lines).
- patching file src/groupchatdlg.h
- Hunk #1 succeeded at 171 (offset 4 lines).
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file src/options/opt_application.cpp
- patching file src/options/opt_application.ui
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file src/tabs/tabdlg.cpp
- patching file src/tabs/tabdlg.h
- patching file src/tools/advwidget/advwidget.cpp
- patching file src/tools/advwidget/advwidget.h
- patching file src/widgets/psiwindowheader.cpp
- patching file src/widgets/psiwindowheader.h
- patching file src/widgets/psiwindowheader.ui
- patching file src/widgets/widgets.pri
- * Appling 0190-psi-colors-for-tabs.diff
- patching file options/default.xml
- Hunk #1 succeeded at 406 (offset 3 lines).
- patching file src/tabs/tabdlg.cpp
- * Appling 0200-psi-chatview-quote-feature.diff
- patching file src/chatview_te.cpp
- Hunk #1 FAILED at 35.
- Hunk #2 succeeded at 66 (offset 7 lines).
- Hunk #3 succeeded at 150 (offset 9 lines).
- Hunk #4 succeeded at 229 (offset 10 lines).
- 1 out of 4 hunks FAILED -- saving rejects to file src/chatview_te.cpp.rej
- patching file src/chatview_te.h
- Hunk #3 FAILED at 113.
- 1 out of 3 hunks FAILED -- saving rejects to file src/chatview_te.h.rej
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 893 (offset 9 lines).
- patching file src/msgmle.cpp
- Hunk #2 succeeded at 96 (offset 2 lines).
- Hunk #3 succeeded at 129 (offset 2 lines).
- Hunk #4 succeeded at 240 (offset 2 lines).
- Hunk #5 succeeded at 320 with fuzz 1 (offset 4 lines).
- Hunk #6 succeeded at 455 (offset 18 lines).
- patching file src/msgmle.h
- Hunk #1 succeeded at 51 (offset 2 lines).
- Hunk #2 succeeded at 66 (offset 6 lines).
- Hunk #3 succeeded at 76 (offset 6 lines).
- Hunk #4 succeeded at 102 with fuzz 1 (offset 6 lines).
- patching file src/psichatdlg.cpp
- patching file src/webview.cpp
- Hunk #1 succeeded at 50 (offset 5 lines).
- Hunk #2 succeeded at 78 (offset 5 lines).
- Hunk #3 succeeded at 100 (offset 5 lines).
- patching file src/webview.h
- patching file src/widgets/psitextview.cpp
- patching file src/widgets/psitextview.h
- ==> ERROR: A failure occurred in prepare().
- Aborting...
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement