Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Fetching origin
- -> Updating iris git repo...
- Fetching origin
- -> Updating libpsi git repo...
- Fetching origin
- ==> Validating source files with md5sums...
- psi ... Skipped
- psi-plus ... Skipped
- iris ... Skipped
- libpsi ... Skipped
- ==> Extracting sources...
- -> Creating working copy of psi git repo...
- Switched to a new branch 'makepkg'
- -> Creating working copy of main git repo...
- Switched to a new branch 'makepkg'
- -> Creating working copy of iris git repo...
- Switched to a new branch 'makepkg'
- -> Creating working copy of libpsi git repo...
- Switched to a new branch 'makepkg'
- ==> Starting prepare()...
- 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 'iris'...
- done.
- Submodule path 'iris': checked out '9b678e85f2e02a8cef22130093a21822e4023e15'
- Cloning into 'src/libpsi'...
- done.
- Submodule path 'src/libpsi': checked out '97bce58cf60a952fe139bb8e4fb35cfb2b3a8d52'
- * 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
- patching file src/psiactionlist.cpp
- * Appling 0030-psi-default-application-settings.diff
- patching file options/default.xml
- 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
- patching file src/options/opt_chat.cpp
- patching file src/options/opt_chat.ui
- patching file src/psicon.cpp
- Hunk #1 succeeded at 1410 (offset -4 lines).
- patching file src/tabs/tabdlg.cpp
- patching file src/widgets/psitabwidget.cpp
- * Appling 0050-psi-plugins-qcm-fix.diff
- patching file qcm/plugins.qcm
- patching file psi.qc
- * Appling 0060-psi-configure-hyperlink-color.diff
- patching file options/default.xml
- 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 #2 succeeded at 463 (offset -1 lines).
- Hunk #3 succeeded at 498 (offset -1 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
- * Appling 0100-psi-contact-manager.diff
- patching file src/contactlistaccountmenu.cpp
- 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
- patching file src/mainwin.h
- * Appling 0120-psi-css-style-sheet.diff
- patching file options/default.xml
- patching file src/contactlistitemmenu.cpp
- patching file src/gcuserview.cpp
- Hunk #1 succeeded at 724 (offset 3 lines).
- patching file src/groupchatdlg.cpp
- patching file src/mainwin.cpp
- patching file src/psichatdlg.cpp
- patching file src/psicon.cpp
- Hunk #1 succeeded at 510 (offset -1 lines).
- Hunk #2 succeeded at 1428 (offset -4 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
- * Appling 0140-psi-tray-act-bring-to-front.diff
- patching file options/default.xml
- patching file src/mainwin.cpp
- Hunk #3 succeeded at 1490 (offset 4 lines).
- Hunk #4 succeeded at 1634 (offset 4 lines).
- Hunk #5 succeeded at 1687 (offset 4 lines).
- patching file src/mainwin.h
- patching file src/src.pri
- Hunk #1 succeeded at 357 (offset 8 lines).
- 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
- patching file src/groupchatdlg.cpp
- patching file src/groupchatdlg.h
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- * 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
- patching file src/groupchatdlg.cpp
- patching file src/groupchatdlg.h
- patching file src/mainwin.cpp
- Hunk #5 succeeded at 1802 (offset 4 lines).
- Hunk #6 succeeded at 2056 (offset 4 lines).
- 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.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
- patching file src/tabs/tabdlg.cpp
- * Appling 0200-psi-chatview-quote-feature.diff
- patching file src/chatview_te.cpp
- patching file src/chatview_te.h
- patching file src/groupchatdlg.cpp
- patching file src/msgmle.cpp
- patching file src/msgmle.h
- patching file src/psichatdlg.cpp
- patching file src/webview.cpp
- patching file src/webview.h
- patching file src/widgets/psitextview.cpp
- patching file src/widgets/psitextview.h
- * Appling 0210-psi-vert-splitter-position.diff
- patching file options/default.xml
- patching file src/chatsplitter.cpp
- patching file src/chatsplitter.h
- patching file src/groupchatdlg.cpp
- patching file src/groupchatdlg.h
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file src/tabs/tabbablewidget.h
- patching file src/tabs/tabdlg.cpp
- patching file src/tabs/tabdlg.h
- * Appling 0220-psi-auto-capitalizer.diff
- patching file options/default.xml
- patching file src/msgmle.cpp
- patching file src/msgmle.h
- * Appling 0230-psi-autostart.diff
- patching file src/applicationinfo.cpp
- Hunk #1 succeeded at 377 (offset -6 lines).
- patching file src/applicationinfo.h
- Hunk #1 succeeded at 43 (offset -1 lines).
- patching file src/options/opt_application.cpp
- patching file src/options/opt_application.ui
- * Appling 0240-psi-fix-psitooltiphandler.diff
- patching file src/widgets/psitooltip.cpp
- * Appling 0250-psi-disable-auto-scroll-to-bottom.diff
- patching file options/default.xml
- patching file src/chatview_te.cpp
- * Appling 0260-psi-tab-highlight-color.diff
- patching file src/chatdlg.cpp
- Hunk #1 succeeded at 1126 (offset -1 lines).
- patching file src/groupchatdlg.cpp
- patching file src/tabs/tabbablewidget.h
- patching file src/tabs/tabdlg.cpp
- * Appling 0270-psi-set-window-icons.diff
- patching file src/aboutdlg.cpp
- patching file src/accountmanagedlg.cpp
- patching file src/activitydlg.cpp
- patching file src/avcall/calldlg.cpp
- patching file src/bookmarkmanagedlg.cpp
- patching file src/contactmanager/contactmanagerdlg.cpp
- patching file src/geolocationdlg.cpp
- patching file src/groupchatdlg.cpp
- patching file src/mooddlg.cpp
- patching file src/mucjoindlg.cpp
- patching file src/options/optionsdlg.cpp
- Hunk #1 succeeded at 513 (offset 4 lines).
- patching file src/privacy/privacydlg.cpp
- patching file src/profiledlg.cpp
- patching file src/psioptionseditor.cpp
- patching file src/statusdlg.cpp
- patching file src/tipdlg.cpp
- patching file src/xmlconsole.cpp
- Hunk #1 succeeded at 34 (offset 1 line).
- Hunk #2 succeeded at 43 (offset 1 line).
- * Appling 0280-psi-optionseditor-show-only-first-line.diff
- patching file src/tools/optionstree/optionstreemodel.cpp
- * Appling 0290-psi-custom-chat-window-caption.diff
- patching file options/default.xml
- patching file src/chatdlg.cpp
- Hunk #1 succeeded at 636 (offset -1 lines).
- patching file src/groupchatdlg.cpp
- patching file src/tabs/tabdlg.cpp
- * Appling 0300-psi-fix-trackbar.diff
- patching file src/tabs/tabbablewidget.cpp
- patching file src/tabs/tabbablewidget.h
- patching file src/tabs/tabdlg.cpp
- * Appling 0310-psi-fix-online-contacts-count-update.diff
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 450 (offset 2 lines).
- Hunk #2 succeeded at 481 (offset 1 line).
- Hunk #3 succeeded at 651 (offset 1 line).
- Hunk #4 succeeded at 668 (offset 1 line).
- * Appling 0320-psi-muc-highlight-events.diff
- patching file options/default.xml
- patching file src/chatdlg.cpp
- Hunk #1 succeeded at 448 (offset -1 lines).
- patching file src/groupchatdlg.cpp
- patching file src/groupchatdlg.h
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 2755 (offset -34 lines).
- Hunk #2 succeeded at 5024 (offset -52 lines).
- Hunk #3 succeeded at 5074 (offset -52 lines).
- Hunk #4 succeeded at 5138 (offset -52 lines).
- Hunk #5 succeeded at 5551 (offset -52 lines).
- Hunk #6 succeeded at 5573 (offset -52 lines).
- Hunk #7 succeeded at 5688 (offset -52 lines).
- Hunk #8 succeeded at 5723 (offset -52 lines).
- patching file src/psiaccount.h
- Hunk #1 succeeded at 449 (offset -2 lines).
- patching file src/psicon.cpp
- Hunk #1 succeeded at 82 (offset 1 line).
- Hunk #2 succeeded at 1734 (offset -4 lines).
- Hunk #3 succeeded at 1787 (offset -4 lines).
- patching file src/psievent.cpp
- patching file src/psiiconset.cpp
- Hunk #1 succeeded at 706 (offset 20 lines).
- * Appling 0330-iris-XEP-0083-nested-roster-groups.diff
- patching file iris/src/xmpp/xmpp-im/client.cpp
- Hunk #1 succeeded at 87 (offset -15 lines).
- Hunk #2 succeeded at 891 (offset 2 lines).
- Hunk #3 succeeded at 1346 (offset 62 lines).
- Hunk #4 succeeded at 1403 (offset 62 lines).
- patching file iris/src/xmpp/xmpp-im/types.cpp
- Hunk #1 succeeded at 3007 (offset 161 lines).
- Hunk #2 succeeded at 3058 (offset 161 lines).
- patching file iris/src/xmpp/xmpp-im/xmpp_client.h
- Hunk #1 succeeded at 81 (offset 2 lines).
- Hunk #2 succeeded at 137 (offset -1 lines).
- Hunk #3 succeeded at 171 (offset -1 lines).
- patching file iris/src/xmpp/xmpp-im/xmpp_liveroster.h
- patching file iris/src/xmpp/xmpp-im/xmpp_roster.h
- patching file iris/src/xmpp/xmpp-im/xmpp_task.cpp
- patching file iris/src/xmpp/xmpp-im/xmpp_task.h
- patching file iris/src/xmpp/xmpp-im/xmpp_tasks.cpp
- Hunk #1 succeeded at 369 (offset -4 lines).
- Hunk #2 succeeded at 411 (offset -4 lines).
- Hunk #3 succeeded at 419 (offset -4 lines).
- Hunk #4 succeeded at 469 (offset -4 lines).
- Hunk #5 succeeded at 482 (offset -4 lines).
- Hunk #6 succeeded at 555 (offset -4 lines).
- patching file iris/src/xmpp/xmpp-im/xmpp_tasks.h
- * Appling 0340-psi-multirows-tab.diff
- patching file options/default.xml
- patching file src/widgets/psitabbar.cpp
- patching file src/widgets/psitabbar.h
- patching file src/widgets/psitabwidget.cpp
- patching file src/widgets/psitabwidget.h
- patching file src/widgets/tabbar.cpp
- patching file src/widgets/tabbar.h
- patching file src/widgets/widgets.pri
- * Appling 8000-psi-extend-plugins-interface.diff
- patching file iris/src/xmpp/xmpp-im/client.cpp
- Hunk #1 succeeded at 630 (offset 11 lines).
- patching file iris/src/xmpp/xmpp-im/xmpp_client.h
- patching file src/applicationinfo.cpp
- patching file src/applicationinfo.h
- patching file src/chatdlg.cpp
- patching file src/chatdlg.h
- patching file src/common.cpp
- patching file src/common.h
- patching file src/contactlistaccountmenu.cpp
- patching file src/groupchatdlg.cpp
- patching file src/options/opt_plugins.cpp
- patching file src/options/opt_plugins.h
- patching file src/options/opt_plugins.ui
- patching file src/options/options.pri
- patching file src/options/optionsdlg.cpp
- Hunk #1 succeeded at 204 (offset 4 lines).
- Hunk #2 succeeded at 245 (offset 4 lines).
- Hunk #3 succeeded at 456 (offset 4 lines).
- Hunk #4 succeeded at 468 (offset 4 lines).
- patching file src/options/optionstab.cpp
- patching file src/options/optionstab.h
- patching file src/options/plugininfodialog.ui
- patching file src/options/pluginsettsdialog.ui
- patching file src/pluginhost.cpp
- patching file src/pluginhost.h
- patching file src/pluginmanager.cpp
- patching file src/pluginmanager.h
- patching file src/plugins/include/accountinfoaccessinghost.h
- patching file src/plugins/include/accountinfoaccessor.h
- patching file src/plugins/include/activetabaccessinghost.h
- patching file src/plugins/include/activetabaccessor.h
- patching file src/plugins/include/applicationinfoaccessinghost.h
- patching file src/plugins/include/applicationinfoaccessor.h
- patching file src/plugins/include/chattabaccessor.h
- patching file src/plugins/include/contactinfoaccessinghost.h
- patching file src/plugins/include/contactinfoaccessor.h
- patching file src/plugins/include/contactstateaccessinghost.h
- patching file src/plugins/include/contactstateaccessor.h
- patching file src/plugins/include/eventcreatinghost.h
- patching file src/plugins/include/eventcreator.h
- patching file src/plugins/include/eventfilter.h
- patching file src/plugins/include/gctoolbariconaccessor.h
- patching file src/plugins/include/iconfactoryaccessinghost.h
- patching file src/plugins/include/iconfactoryaccessor.h
- patching file src/plugins/include/iqfilteringhost.h
- patching file src/plugins/include/iqnamespacefilter.h
- patching file src/plugins/include/menuaccessor.h
- patching file src/plugins/include/optionaccessinghost.h
- patching file src/plugins/include/optionaccessor.h
- patching file src/plugins/include/plugininfoprovider.h
- patching file src/plugins/include/popupaccessinghost.h
- patching file src/plugins/include/popupaccessor.h
- patching file src/plugins/include/psiaccountcontroller.h
- patching file src/plugins/include/psiaccountcontrollinghost.h
- patching file src/plugins/include/psiplugin.h
- patching file src/plugins/include/shortcutaccessinghost.h
- patching file src/plugins/include/shortcutaccessor.h
- patching file src/plugins/include/soundaccessinghost.h
- patching file src/plugins/include/soundaccessor.h
- patching file src/plugins/include/stanzafilter.h
- patching file src/plugins/include/stanzasendinghost.h
- patching file src/plugins/include/toolbariconaccessor.h
- patching file src/plugins/plugins.pri
- patching file src/psi_profiles.cpp
- patching file src/psiaccount.cpp
- patching file src/psiaccount.h
- patching file src/psiactionlist.cpp
- patching file src/psichatdlg.cpp
- patching file src/psicon.cpp
- patching file src/psicontactmenu.cpp
- patching file src/psievent.cpp
- patching file src/psievent.h
- patching file src/psioptions.cpp
- patching file src/tabs/tabdlg.cpp
- patching file src/tabs/tabdlg.h
- * Appling 9970-psiplus-join-to-support-muc.diff
- patching file src/mainwin.cpp
- patching file src/psiactionlist.cpp
- * Appling 9980-psi-search-for-psimedia-in-all-plugins-dirs.diff
- patching file src/applicationinfo.cpp
- Hunk #1 succeeded at 128 (offset -6 lines).
- patching file src/applicationinfo.h
- Hunk #1 succeeded at 39 (offset -1 lines).
- patching file src/avcall/avcall.cpp
- Hunk #1 FAILED at 117.
- 1 out of 1 hunk FAILED -- saving rejects to file src/avcall/avcall.cpp.rej
- patching file src/pluginmanager.cpp
- ==> ERROR: A failure occurred in prepare().
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement