Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- florian@horus ~/scratch % tar xzf psi-plus-git.tar.gz
- florian@horus ~/scratch % cd psi-plus-git
- florian@horus ~/scratch/psi-plus-git % ls
- PKGBUILD
- florian@horus ~/scratch/psi-plus-git % makepkg PKGBUILD
- ==> Erstelle Paket: psi-plus-git 0.16.424-1 (Di 25. Nov 22:02:16 CET 2014)
- ==> Prüfe Laufzeit-Abhängigkeiten...
- ==> Prüfe Buildtime-Abhängigkeiten...
- ==> Empfange Quellen...
- -> Klone das psi git Repo...
- Klone in Bare-Repository '/home/florian/scratch/psi-plus-git/psi'...
- remote: Counting objects: 18488, done.
- remote: Compressing objects: 100% (291/291), done.
- remote: Total 18488 (delta 208), reused 326 (delta 150)
- Empfange Objekte: 100% (18488/18488), 12.87 MiB | 638.00 KiB/s, Fertig.
- Löse Unterschiede auf: 100% (12766/12766), Fertig.
- Prüfe Konnektivität... Fertig.
- -> Klone das psi-plus git Repo...
- Klone in Bare-Repository '/home/florian/scratch/psi-plus-git/psi-plus'...
- remote: Counting objects: 5573, done.
- remote: Compressing objects: 100% (41/41), done.
- remote: Total 5573 (delta 14), reused 23 (delta 8)
- Empfange Objekte: 100% (5573/5573), 4.63 MiB | 990.00 KiB/s, Fertig.
- Löse Unterschiede auf: 100% (3186/3186), Fertig.
- Prüfe Konnektivität... Fertig.
- -> Klone das iris git Repo...
- Klone in Bare-Repository '/home/florian/scratch/psi-plus-git/iris'...
- remote: Counting objects: 4494, done.
- remote: Compressing objects: 100% (54/54), done.
- remote: Total 4494 (delta 15), reused 22 (delta 1)
- Empfange Objekte: 100% (4494/4494), 2.08 MiB | 549.00 KiB/s, Fertig.
- Löse Unterschiede auf: 100% (2412/2412), Fertig.
- Prüfe Konnektivität... Fertig.
- -> Klone das libpsi git Repo...
- Klone in Bare-Repository '/home/florian/scratch/psi-plus-git/libpsi'...
- remote: Counting objects: 511, done.
- remote: Compressing objects: 100% (7/7), done.
- remote: Total 511 (delta 1), reused 5 (delta 1)
- Empfange Objekte: 100% (511/511), 210.25 KiB | 193.00 KiB/s, Fertig.
- Löse Unterschiede auf: 100% (264/264), Fertig.
- Prüfe Konnektivität... Fertig.
- ==> Überprüfe Gültigkeit der Quell-Dateien mit md5sums...
- psi ... Übersprungen
- psi-plus ... Übersprungen
- iris ... Übersprungen
- libpsi ... Übersprungen
- ==> Entpacke Quellen ...
- -> Erstelle Arbeitskopie des psi git Repos...
- Klone nach 'psi'...
- Fertig.
- -> Erstelle Arbeitskopie des main git Repos...
- Klone nach 'psi-plus'...
- Fertig.
- -> Erstelle Arbeitskopie des iris git Repos...
- Klone nach 'iris'...
- Fertig.
- -> Erstelle Arbeitskopie des libpsi git Repos...
- Klone nach 'libpsi'...
- Fertig.
- ==> Beginne pkgver()...
- ==> Aktualisierte Version: psi-plus-git 0.16.439-1
- ==> Beginne prepare()...
- Submodul 'iris' (git://github.com/psi-im/iris.git) für Pfad 'iris' in die Konfiguration eingetragen.
- Submodul 'src/libpsi' (git://github.com/psi-im/libpsi.git) für Pfad 'src/libpsi' in die Konfiguration eingetragen.
- Klone nach 'iris'...
- Fertig.
- Submodul-Pfad: 'iris': '659712301d602f25997e171a9a1473a4c5126086' ausgecheckt
- Klone nach 'src/libpsi'...
- Fertig.
- Submodul-Pfad: 'src/libpsi': '6bdd75f9ff506a1ee3582d160092bbaabb39a271' ausgecheckt
- patching file options/default.xml
- Hunk #1 succeeded at 453 (offset 2 lines).
- patching file src/chatdlg.cpp
- patching file src/options/opt_advanced.cpp
- patching file src/options/opt_advanced.ui
- patching file iconsets/system/default/icondef.xml
- patching file iconsets.qrc
- patching file src/entitytimetask.cpp
- patching file src/entitytimetask.h
- patching file src/infodlg.cpp
- Hunk #2 succeeded at 244 (offset 1 line).
- Hunk #3 succeeded at 778 (offset 1 line).
- Hunk #4 succeeded at 816 (offset 1 line).
- Hunk #5 succeeded at 858 (offset 1 line).
- patching file src/infodlg.h
- patching file src/psiaccount.cpp
- patching file src/src.pri
- patching file src/systeminfo.cpp
- patching file src/timeserver.cpp
- patching file src/timeserver.h
- patching file src/userlist.cpp
- patching file src/userlist.h
- patching file src/moodcatalog.cpp
- patching file src/moodcatalog.h
- patching file src/mood.cpp
- patching file src/mooddlg.cpp
- patching file src/mood.h
- patching file src/options/opt_appearance.cpp
- patching file src/options/opt_iconset.cpp
- patching file src/options/opt_iconset.h
- patching file src/options/opt_iconset_mood.ui
- patching file src/options/options.pri
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 5514 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psiiconset.cpp
- patching file src/psiiconset.h
- patching file src/userlist.cpp
- patching file src/gcuserview.cpp
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 1687 (offset 16 lines).
- Hunk #2 succeeded at 1706 (offset 16 lines).
- patching file src/chatview_te.cpp
- patching file src/chatview_te.h
- patching file src/chatview_webkit.cpp
- patching file src/chatview_webkit.h
- patching file src/desktoputil.cpp
- patching file src/gcuserview.cpp
- patching file src/gcuserview.h
- patching file src/groupchatdlg.cpp
- patching file src/groupchatdlg.h
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 4273 (offset 6 lines).
- patching file src/webview.cpp
- patching file src/widgets/urlobject.cpp
- patching file themes/chatview/psi/classic/index.html
- patching file src/psiaccount.cpp
- Hunk #2 succeeded at 2281 (offset 6 lines).
- patching file options/default.xml
- Hunk #1 succeeded at 364 (offset 1 line).
- patching file src/psiactionlist.cpp
- patching file src/chatdlg.cpp
- patching file src/chatdlg.h
- patching file src/common.cpp
- patching file src/common.h
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 3936 (offset 6 lines).
- Hunk #2 succeeded at 3970 (offset 6 lines).
- Hunk #3 succeeded at 4276 (offset 6 lines).
- Hunk #4 succeeded at 5257 (offset 6 lines).
- Hunk #5 succeeded at 5273 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psicon.cpp
- patching file src/tabs/tabdlg.cpp
- patching file src/tabs/tabdlg.h
- patching file src/activitycatalog.cpp
- patching file src/activitycatalog.h
- patching file src/activity.cpp
- patching file src/activitydlg.cpp
- patching file src/activitydlg.h
- patching file src/activity.h
- patching file src/activity.ui
- patching file src/contactlistaccountmenu.cpp
- patching file src/contactview.cpp
- patching file src/contactview.h
- patching file src/psiaccount.cpp
- Hunk #4 succeeded at 2253 (offset 6 lines).
- Hunk #5 succeeded at 3431 (offset 6 lines).
- Hunk #6 succeeded at 3489 (offset 6 lines).
- Hunk #7 succeeded at 3812 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psicon.cpp
- patching file src/src.pri
- patching file src/userlist.cpp
- patching file src/userlist.h
- patching file options/default.xml
- Hunk #1 succeeded at 354 (offset 1 line).
- patching file src/chatdlg.cpp
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 759 (offset 8 lines).
- Hunk #2 succeeded at 1060 (offset 8 lines).
- Hunk #3 succeeded at 1153 (offset 8 lines).
- Hunk #4 succeeded at 1207 (offset 8 lines).
- Hunk #5 succeeded at 1483 (offset 7 lines).
- Hunk #6 succeeded at 1791 (offset 7 lines).
- patching file src/groupchatdlg.h
- patching file src/psichatdlg.cpp
- Hunk #2 succeeded at 415 (offset 1 line).
- patching file src/tabs/tabbablewidget.cpp
- patching file src/tabs/tabbablewidget.h
- patching file src/tabs/tabdlg.cpp
- patching file src/tabs/tabdlg.h
- patching file src/widgets/psitabwidget.cpp
- patching file src/widgets/psitabwidget.h
- patching file options/default.xml
- Hunk #1 succeeded at 427 (offset 1 line).
- patching file src/chatdlg.cpp
- Hunk #1 succeeded at 684 (offset -9 lines).
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 944 (offset 8 lines).
- patching file src/msgmle.cpp
- Hunk #1 succeeded at 59 (offset 1 line).
- Hunk #2 succeeded at 272 (offset 1 line).
- patching file src/msgmle.h
- patching file src/mainwin_p.cpp
- patching file options/default.xml
- patching file options/macosx.xml
- patching file options/windows.xml
- patching file src/psioptions.cpp
- patching file src/psi_profiles.cpp
- patching file options/default.xml
- patching file src/options/opt_application.cpp
- patching file src/options/opt_application.ui
- patching file src/options/optionsdlg.cpp
- Hunk #2 succeeded at 277 (offset 6 lines).
- patching file src/options/options.pri
- patching file src/options/opt_roster.cpp
- patching file src/options/opt_roster.h
- patching file src/options/opt_roster.ui
- patching file options/default.xml
- patching file src/options/opt_appearance.cpp
- patching file src/options/opt_iconset_client.ui
- patching file src/options/opt_iconset.cpp
- patching file src/options/opt_iconset.h
- patching file src/options/options.pri
- patching file src/options/opt_roster.cpp
- patching file src/options/opt_roster.ui
- patching file src/psiiconset.cpp
- patching file src/psiiconset.h
- patching file src/userlist.cpp
- patching file src/userlist.h
- patching file src/contactlistgroupmenu.cpp
- patching file src/psicontactmenu.cpp
- patching file src/statusdlg.cpp
- patching file src/statusdlg.h
- patching file options/default.xml
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file src/options/opt_chat.cpp
- patching file src/options/opt_chat.ui
- patching file src/psicon.cpp
- patching file src/psicon.h
- patching file src/psitoolbar.cpp
- Hunk #1 succeeded at 55 (offset 1 line).
- Hunk #2 succeeded at 82 (offset 1 line).
- Hunk #3 succeeded at 123 (offset 10 lines).
- patching file src/psitoolbar.h
- patching file src/tabs/tabdlg.cpp
- patching file options/default.xml
- patching file src/options/opt_chat.cpp
- patching file src/options/opt_chat.ui
- patching file src/psicon.cpp
- patching file src/tabs/tabdlg.cpp
- patching file src/widgets/psitabwidget.cpp
- patching file qcm/plugins.qcm
- patching file psi.qc
- patching file src/chatdlg.ui
- patching file src/gcuserview.cpp
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 1678 (offset 3 lines).
- patching file src/psichatdlg.cpp
- patching file src/psicontactmenu.cpp
- patching file options/default.xml
- patching file src/chatdlg.ui
- patching file src/groupchatdlg.cpp
- Hunk #3 succeeded at 680 (offset 4 lines).
- Hunk #4 succeeded at 693 (offset 4 lines).
- Hunk #5 succeeded at 705 (offset 4 lines).
- Hunk #6 succeeded at 764 (offset 4 lines).
- Hunk #7 succeeded at 1793 (offset 3 lines).
- Hunk #8 succeeded at 1826 (offset 3 lines).
- patching file src/groupchatdlg.h
- patching file src/groupchatdlg.ui
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file src/sendbuttonmenu.cpp
- patching file src/sendbuttonmenu.h
- patching file src/sendbuttontemplateseditor.ui
- patching file src/src.pri
- patching file src/tabs/tabbablewidget.cpp
- patching file src/tabs/tabbablewidget.h
- patching file options/default.xml
- patching file src/mainwin.cpp
- patching file src/options/opt_application.cpp
- patching file src/options/opt_application.h
- patching file src/options/opt_application.ui
- patching file src/contactlistaccountmenu.cpp
- patching file src/contactview.cpp
- patching file src/options/opt_avcall.cpp
- patching file src/options/opt_plugins.cpp
- patching file src/options/opt_tree.cpp
- patching file src/psichatdlg.cpp
- patching file src/psicontactmenu.cpp
- patching file iris/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
- patching file src/discodlg.cpp
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 3285 (offset 6 lines).
- Hunk #2 succeeded at 3786 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psiaccount.cpp
- patching file iris/src/xmpp/xmpp-im/xmpp_features.cpp
- patching file iris/src/xmpp/xmpp-im/xmpp_features.h
- patching file options/default.xml
- patching file src/chatview_te.cpp
- patching file themes/chatview/psi/classic/index.html
- patching file src/options/opt_appearance.cpp
- Hunk #1 succeeded at 250 (offset 2 lines).
- patching file src/options/opt_appearance.ui
- patching file src/bookmarkmanager.cpp
- patching file src/bookmarkmanager.h
- patching file src/groupchatdlg.cpp
- Hunk #4 succeeded at 689 (offset 4 lines).
- Hunk #5 succeeded at 904 (offset 4 lines).
- Hunk #6 succeeded at 1832 (offset 3 lines).
- Hunk #7 succeeded at 1891 (offset 3 lines).
- patching file src/groupchatdlg.h
- patching file src/groupchatdlg.ui
- patching file options/default.xml
- patching file src/textutil.cpp
- patching file src/psiaccount.cpp
- Hunk #4 succeeded at 5921 (offset 6 lines).
- Hunk #5 succeeded at 5929 (offset 6 lines).
- patching file src/rc.cpp
- patching file src/rc.h
- patching file options/default.xml
- patching file src/tabs/tabdlg.cpp
- patching file src/tabs/tabdlg.h
- 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/contactlistaccountmenu.cpp
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 2002 (offset 1 line).
- patching file options/default.xml
- patching file src/groupchatdlg.cpp
- Hunk #2 succeeded at 747 (offset 4 lines).
- Hunk #3 succeeded at 785 (offset 4 lines).
- Hunk #4 succeeded at 809 (offset 4 lines).
- Hunk #5 succeeded at 827 (offset 4 lines).
- Hunk #6 succeeded at 2008 (offset 3 lines).
- patching file src/groupchatdlg.h
- 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
- patching file src/src.pri
- patching file src/gcuserview.cpp
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 2410 (offset 6 lines).
- Hunk #2 succeeded at 2481 (offset 6 lines).
- Hunk #3 succeeded at 2997 (offset 6 lines).
- patching file options/default.xml
- patching file src/chatview_te.cpp
- patching file src/chatview_te.h
- patching file src/chatview_webkit.cpp
- patching file src/chatview_webkit.h
- patching file src/groupchatdlg.cpp
- Hunk #6 succeeded at 663 (offset 4 lines).
- Hunk #7 succeeded at 717 (offset 4 lines).
- Hunk #8 succeeded at 1128 (offset 4 lines).
- Hunk #9 succeeded at 1139 (offset 4 lines).
- Hunk #10 succeeded at 1153 (offset 4 lines).
- Hunk #11 succeeded at 1162 (offset 4 lines).
- Hunk #12 succeeded at 1752 (offset 3 lines).
- patching file src/groupchatdlg.h
- patching file src/groupchatdlg.ui
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file src/widgets/typeaheadfind.cpp
- patching file src/widgets/typeaheadfind.h
- patching file src/widgets/widgets.pri
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file src/psitrayicon.cpp
- patching file src/psitrayicon.h
- patching file options/default.xml
- patching file src/activity.cpp
- patching file src/activitydlg.cpp
- patching file src/activity.h
- patching file src/options/opt_appearance.cpp
- patching file src/options/opt_iconset_activity.ui
- patching file src/options/opt_iconset.cpp
- patching file src/options/opt_iconset.h
- patching file src/options/options.pri
- patching file src/options/opt_roster.cpp
- patching file src/options/opt_roster.ui
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 5582 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psiiconset.cpp
- patching file src/psiiconset.h
- patching file src/userlist.cpp
- Hunk #1 succeeded at 863 (offset 2 lines).
- patching file src/mainwin.cpp
- patching file options/default.xml
- patching file src/contactlistaccountmenu.cpp
- patching file src/geolocation.cpp
- patching file src/geolocationdlg.cpp
- patching file src/geolocationdlg.h
- patching file src/geolocation.h
- patching file src/geolocation.ui
- patching file src/options/opt_roster.cpp
- patching file src/options/opt_roster.ui
- patching file src/physicallocation.cpp
- patching file src/physicallocation.h
- patching file src/psiaccount.cpp
- Hunk #3 succeeded at 2259 (offset 6 lines).
- Hunk #4 succeeded at 3454 (offset 6 lines).
- Hunk #5 succeeded at 3514 (offset 6 lines).
- Hunk #6 succeeded at 3522 (offset 6 lines).
- Hunk #7 succeeded at 3846 (offset 6 lines).
- Hunk #8 succeeded at 5593 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psicon.cpp
- patching file src/src.pri
- patching file src/userlist.cpp
- Hunk #3 succeeded at 708 (offset 2 lines).
- Hunk #4 succeeded at 716 (offset 2 lines).
- Hunk #5 succeeded at 891 (offset 2 lines).
- Hunk #6 succeeded at 981 (offset 2 lines).
- patching file src/userlist.h
- patching file src/options/opt_iconset.cpp
- patching file src/psiiconset.cpp
- patching file src/contactlistaccountmenu.cpp
- patching file options/default.xml
- patching file src/contactlistmodel.cpp
- patching file src/contactlistmodel.h
- patching file src/contactlistviewdelegate.cpp
- patching file src/psicontactlistviewdelegate.cpp
- patching file src/psicontactlistviewdelegate.h
- 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
- patching file src/avcall/avcall.cpp
- patching file options/default.xml
- patching file src/widgets/psitiplabel.cpp
- patching file src/widgets/psitiplabel.h
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file options/default.xml
- patching file src/contactlistitemmenu.cpp
- patching file src/gcuserview.cpp
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 1706 (offset 3 lines).
- patching file src/mainwin.cpp
- patching file src/psichatdlg.cpp
- patching file src/psicon.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
- patching file options/default.xml
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file src/psiactionlist.cpp
- patching file src/psirosterwidget.cpp
- patching file options/default.xml
- patching file src/chatdlg.cpp
- Hunk #2 succeeded at 197 (offset -9 lines).
- patching file src/chatdlg.h
- patching file src/contactlistgroup.h
- patching file src/contactlistgroupmenu.cpp
- patching file src/contactlistmodel.cpp
- patching file src/contactlistmodel.h
- patching file src/contactlistnestedgroup.cpp
- Hunk #1 succeeded at 312 (offset 14 lines).
- patching file src/contactlistspecialgroup.cpp
- patching file src/eventdlg.cpp
- patching file src/groupchatdlg.cpp
- Hunk #4 succeeded at 742 (offset 4 lines).
- Hunk #5 succeeded at 874 (offset 4 lines).
- Hunk #6 succeeded at 893 (offset 4 lines).
- Hunk #7 succeeded at 910 (offset 4 lines).
- Hunk #8 succeeded at 1331 (offset 4 lines).
- Hunk #9 succeeded at 1618 (offset 3 lines).
- Hunk #10 succeeded at 1690 (offset 3 lines).
- patching file src/historydlg.cpp
- Hunk #1 succeeded at 234 (offset 9 lines).
- patching file src/mucjoindlg.cpp
- Hunk #1 succeeded at 159 (offset -2 lines).
- Hunk #2 succeeded at 200 (offset -2 lines).
- patching file src/psiaccount.cpp
- Hunk #2 succeeded at 3874 (offset 6 lines).
- Hunk #3 succeeded at 4846 (offset 6 lines).
- Hunk #4 succeeded at 5034 (offset 6 lines).
- Hunk #5 succeeded at 5050 (offset 6 lines).
- Hunk #6 succeeded at 5079 (offset 6 lines).
- Hunk #7 succeeded at 5185 (offset 6 lines).
- Hunk #8 succeeded at 5381 (offset 6 lines).
- Hunk #9 succeeded at 5405 (offset 6 lines).
- Hunk #10 succeeded at 5444 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psicontact.cpp
- patching file src/psicontact.h
- patching file src/psicontactlistviewdelegate.cpp
- patching file src/psicontactmenu.cpp
- patching file src/tabs/tabbablewidget.cpp
- patching file src/tabs/tabbablewidget.h
- patching file src/tabs/tabdlg.cpp
- patching file src/tabs/tabdlg.h
- patching file src/userlist.cpp
- Hunk #2 succeeded at 742 (offset 2 lines).
- Hunk #3 succeeded at 884 (offset 2 lines).
- Hunk #4 succeeded at 988 (offset 2 lines).
- patching file src/userlist.h
- patching file src/avcall/jinglertp.cpp
- patching file src/contactlistgroupmenu.cpp
- patching file src/gcuserview.cpp
- patching file src/chatdlg.ui
- patching file src/psichatdlg.cpp
- patching file src/contactlistaccountmenu.cpp
- patching file options/default.xml
- patching file src/activitydlg.cpp
- patching file src/activitydlg.h
- patching file src/geolocationdlg.cpp
- patching file src/geolocationdlg.h
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file src/mooddlg.cpp
- patching file src/mooddlg.h
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 3837 (offset 6 lines).
- patching file src/psiactionlist.cpp
- patching file options/default.xml
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file src/options/opt_roster.cpp
- patching file src/options/opt_roster.ui
- patching file src/psicon.cpp
- patching file src/psicon.h
- patching file src/rosteravatarframe.cpp
- patching file src/rosteravatarframe.h
- patching file src/rosteravatarframe.ui
- patching file src/src.pri
- patching file src/dbus.cpp
- patching file options/default.xml
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file src/options/opt_roster.cpp
- patching file src/options/opt_roster.ui
- patching file psi.desktop
- patching file src/src.pro
- patching file iris/src/xmpp/xmpp-im/types.cpp
- patching file iris/src/xmpp/xmpp-im/xmpp_status.h
- patching file options/default.xml
- patching file src/accountmodifydlg.cpp
- Hunk #1 succeeded at 84 (offset -2 lines).
- Hunk #2 succeeded at 120 (offset -2 lines).
- Hunk #3 succeeded at 145 (offset -2 lines).
- Hunk #4 succeeded at 154 (offset -2 lines).
- Hunk #5 succeeded at 258 (offset -2 lines).
- Hunk #6 succeeded at 318 (offset -2 lines).
- Hunk #7 succeeded at 333 (offset -2 lines).
- Hunk #8 succeeded at 521 (offset -2 lines).
- Hunk #9 succeeded at 533 (offset -2 lines).
- Hunk #10 succeeded at 661 (offset -2 lines).
- patching file src/accountmodifydlg.h
- patching file src/accountmodify.ui
- patching file src/accountstatusmenu.cpp
- patching file src/accountstatusmenu.h
- patching file src/chatdlg.cpp
- Hunk #1 succeeded at 383 (offset -9 lines).
- Hunk #2 succeeded at 401 (offset -9 lines).
- Hunk #3 succeeded at 411 (offset -9 lines).
- Hunk #4 succeeded at 449 (offset -9 lines).
- Hunk #5 succeeded at 469 (offset -9 lines).
- patching file src/chatdlg.h
- patching file src/chatview_te.cpp
- patching file src/common.cpp
- patching file src/common.h
- patching file src/contactlistaccountmenu.cpp
- patching file src/contactlistgroupmenu.cpp
- patching file src/globalstatusmenu.cpp
- patching file src/globalstatusmenu.h
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 1362 (offset 4 lines).
- Hunk #2 succeeded at 1382 (offset 4 lines).
- Hunk #3 succeeded at 1415 (offset 4 lines).
- patching file src/libpsi/tools/priorityvalidator.cpp
- patching file src/libpsi/tools/priorityvalidator.h
- patching file src/libpsi/tools/tools.pri
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file src/mainwin_p.cpp
- patching file src/messageview.cpp
- patching file src/messageview.h
- patching file src/options/optionsdlg.cpp
- Hunk #1 succeeded at 182 (offset 6 lines).
- Hunk #2 succeeded at 432 (offset 6 lines).
- patching file src/options/options.pri
- patching file src/options/optionstab.cpp
- patching file src/options/optionstab.h
- patching file src/options/opt_statusauto.cpp
- patching file src/options/opt_statusauto.h
- patching file src/options/opt_statusauto.ui
- patching file src/options/opt_status.cpp
- patching file src/options/opt_statusgeneral.cpp
- patching file src/options/opt_statusgeneral.h
- patching file src/options/opt_statusgeneral.ui
- patching file src/options/opt_status.h
- patching file src/options/opt_status.ui
- patching file src/profiles.h
- patching file src/psiaccount.cpp
- Hunk #5 succeeded at 1576 (offset 6 lines).
- Hunk #6 succeeded at 1741 (offset 6 lines).
- Hunk #7 succeeded at 2850 (offset 6 lines).
- Hunk #8 succeeded at 2858 (offset 6 lines).
- Hunk #9 succeeded at 2935 (offset 6 lines).
- Hunk #10 succeeded at 3746 (offset 6 lines).
- Hunk #11 succeeded at 5547 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psiactionlist.cpp
- patching file src/psicon.cpp
- patching file src/psicon.h
- patching file src/psicontactmenu.cpp
- patching file src/psiiconset.cpp
- patching file src/psiiconset.h
- patching file src/psi_profiles.cpp
- patching file src/src.pri
- patching file src/statuscombobox.cpp
- patching file src/statusdlg.cpp
- patching file src/statusdlg.h
- patching file src/statusmenu.cpp
- patching file src/statusmenu.h
- patching file src/statuspreset.cpp
- patching file src/statuspreset.h
- patching file src/tools/optionstree/optionstree.cpp
- patching file src/tools/optionstree/optionstree.h
- patching file src/widgets/iconaction.cpp
- patching file src/widgets/iconaction.h
- patching file options/default.xml
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file src/src.pri
- patching file src/x11windowsystem.cpp
- patching file src/x11windowsystem.h
- patching file src/discodlg.cpp
- patching file src/groupchatdlg.cpp
- patching file src/options/optionsdlg.cpp
- patching file src/psichatdlg.cpp
- patching file src/psicontactlistviewdelegate.cpp
- patching file src/psicontactlistviewdelegate.h
- patching file src/psiiconset.cpp
- patching file src/psiiconset.h
- patching file src/psitoolbar.cpp
- patching file src/tools/iconset/iconset.cpp
- patching file src/tools/iconset/iconset.h
- patching file src/options/opt_application.cpp
- patching file src/options/opt_application.ui
- patching file src/userlist.cpp
- Hunk #2 succeeded at 865 (offset 2 lines).
- Hunk #3 succeeded at 920 (offset 2 lines).
- Hunk #4 succeeded at 929 (offset 2 lines).
- Hunk #5 succeeded at 939 (offset 2 lines).
- Hunk #6 succeeded at 949 (offset 2 lines).
- Hunk #7 succeeded at 974 (offset 2 lines).
- Hunk #8 succeeded at 1005 (offset 2 lines).
- Hunk #9 succeeded at 1063 (offset 2 lines).
- Hunk #10 succeeded at 1096 (offset 2 lines).
- patching file options/default.xml
- patching file src/groupchatdlg.cpp
- Hunk #2 succeeded at 699 (offset 4 lines).
- Hunk #3 succeeded at 841 (offset 4 lines).
- Hunk #4 succeeded at 888 (offset 4 lines).
- patching file src/groupchatdlg.h
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file src/chatdlg.cpp
- Hunk #1 succeeded at 681 (offset -9 lines).
- patching file src/groupchatdlg.cpp
- Hunk #2 succeeded at 680 (offset 4 lines).
- Hunk #3 succeeded at 729 (offset 4 lines).
- Hunk #4 succeeded at 1079 (offset 4 lines).
- Hunk #5 succeeded at 1764 (offset 3 lines).
- patching file src/htmltextcontroller.cpp
- patching file src/htmltextcontroller.h
- patching file src/messageview.cpp
- patching file src/msgmle.cpp
- Hunk #1 succeeded at 38 (offset 1 line).
- Hunk #2 succeeded at 50 (offset 1 line).
- Hunk #3 succeeded at 73 (offset 1 line).
- Hunk #4 succeeded at 113 (offset 1 line).
- Hunk #5 succeeded at 367 (offset 1 line).
- patching file src/msgmle.h
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file src/src.pri
- patching file src/registrationdlg.cpp
- patching file src/searchdlg.cpp
- Hunk #3 succeeded at 186 (offset -2 lines).
- patching file src/search.ui
- patching file src/xdata_widget.cpp
- patching file src/miniclient.cpp
- patching file src/passdialog.cpp
- patching file src/passdialog.h
- patching file src/psiaccount.cpp
- Hunk #2 succeeded at 1971 (offset 6 lines).
- Hunk #3 succeeded at 2110 (offset 6 lines).
- Hunk #4 succeeded at 2130 (offset 6 lines).
- Hunk #5 succeeded at 2140 (offset 6 lines).
- Hunk #6 succeeded at 2189 (offset 6 lines).
- Hunk #7 succeeded at 2201 (offset 6 lines).
- Hunk #8 succeeded at 2903 (offset 6 lines).
- Hunk #9 succeeded at 2958 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/src.pri
- patching file src/mucjoindlg.cpp
- Hunk #2 succeeded at 65 (offset -2 lines).
- Hunk #3 succeeded at 73 (offset -2 lines).
- Hunk #4 succeeded at 117 (offset -2 lines).
- Hunk #5 succeeded at 147 (offset -2 lines).
- Hunk #6 succeeded at 227 (offset -2 lines).
- patching file src/mucjoindlg.h
- patching file src/mucjoin.ui
- patching file src/chatdlg.cpp
- Hunk #2 succeeded at 367 (offset -9 lines).
- Hunk #3 succeeded at 636 (offset -9 lines).
- patching file src/chatdlg.h
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 3601 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file options/default.xml
- patching file src/tabs/tabdlg.cpp
- patching file src/contactlistmodel.cpp
- patching file src/contactlistmodel.h
- patching file src/privacy/privacydlg.cpp
- Hunk #1 succeeded at 46 (offset -2 lines).
- Hunk #2 succeeded at 250 (offset -2 lines).
- patching file src/privacy/privacydlg.h
- patching file src/privacy/privacylist.cpp
- patching file src/privacy/privacylist.h
- patching file src/privacy/privacymanager.h
- patching file src/privacy/psiprivacymanager.cpp
- patching file src/privacy/psiprivacymanager.h
- patching file src/psiaccount.cpp
- patching file src/psicontact.cpp
- patching file src/psicontactlistviewdelegate.cpp
- patching file src/psicontactmenu.cpp
- patching file src/ahcexecutetask.cpp
- patching file src/ahcformdlg.cpp
- patching file options/default.xml
- patching file src/groupchatdlg.cpp
- Hunk #4 succeeded at 2119 (offset 3 lines).
- patching file src/groupchatdlg.h
- 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.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
- patching file options/default.xml
- patching file src/tabs/tabdlg.cpp
- patching file src/avcall/avcall.cpp
- patching file src/options/opt_avcall.cpp
- patching file src/options/opt_avcall.ui
- 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
- patching file src/adduserdlg.cpp
- Hunk #1 succeeded at 327 (offset -2 lines).
- patching file src/xmlconsole.cpp
- patching file src/xmlconsole.ui
- patching file src/libpsi/tools/systemwatch/systemwatch_unix.cpp
- patching file src/libpsi/tools/systemwatch/systemwatch_unix.h
- patching file src/chatdlg.cpp
- Hunk #3 succeeded at 323 (offset -9 lines).
- Hunk #4 succeeded at 339 (offset -9 lines).
- Hunk #5 succeeded at 841 (offset -9 lines).
- patching file src/chatdlg.h
- patching file options/default.xml
- patching file src/chatsplitter.cpp
- patching file src/chatsplitter.h
- patching file src/groupchatdlg.cpp
- Hunk #2 succeeded at 789 (offset 4 lines).
- Hunk #3 succeeded at 807 (offset 4 lines).
- Hunk #4 succeeded at 862 (offset 4 lines).
- 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
- patching file src/accountmanagedlg.cpp
- Hunk #1 succeeded at 255 (offset -2 lines).
- Hunk #2 succeeded at 285 (offset -2 lines).
- Hunk #3 succeeded at 337 (offset -2 lines).
- Hunk #4 succeeded at 345 (offset -2 lines).
- patching file src/accountmanagedlg.h
- patching file src/accountmanage.ui
- patching file src/psicon.cpp
- patching file src/psicon.h
- patching file src/psicontactlist.cpp
- patching file src/psicontactlist.h
- patching file options/default.xml
- patching file src/mucjoindlg.cpp
- Hunk #1 succeeded at 46 (offset -2 lines).
- Hunk #2 succeeded at 176 (offset -2 lines).
- Hunk #3 succeeded at 248 (offset -2 lines).
- patching file src/mucjoindlg.h
- patching file src/psiaccount.cpp
- Hunk #2 succeeded at 2346 (offset 6 lines).
- Hunk #3 succeeded at 3388 (offset 6 lines).
- Hunk #4 succeeded at 3397 (offset 6 lines).
- Hunk #5 succeeded at 5534 (offset 6 lines).
- Hunk #6 succeeded at 5626 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/tabs/tabbablewidget.cpp
- patching file options/default.xml
- patching file src/msgmle.cpp
- Hunk #1 succeeded at 41 (offset 1 line).
- Hunk #2 succeeded at 172 (offset 1 line).
- Hunk #3 succeeded at 189 (offset 1 line).
- Hunk #4 succeeded at 197 (offset 1 line).
- Hunk #5 succeeded at 229 (offset 1 line).
- Hunk #6 succeeded at 241 (offset 1 line).
- Hunk #7 succeeded at 431 (offset 1 line).
- Hunk #8 succeeded at 642 (offset 1 line).
- patching file src/msgmle.h
- patching file options/default.xml
- patching file src/chatdlg.cpp
- Hunk #1 succeeded at 481 (offset -9 lines).
- patching file src/applicationinfo.cpp
- patching file src/applicationinfo.h
- patching file src/options/opt_application.cpp
- patching file src/options/opt_application.ui
- patching file options/default.xml
- patching file src/options/options.pri
- patching file src/options/opt_status.cpp
- patching file src/options/opt_statuspep.cpp
- patching file src/options/opt_statuspep.h
- patching file src/options/opt_statuspep.ui
- patching file src/src.pri
- patching file src/tools/tunecontroller/aimptunecontroller.cpp
- patching file src/tools/tunecontroller/aimptunecontroller.h
- patching file src/tools/tunecontroller/itunestunecontroller.cpp
- patching file src/tools/tunecontroller/itunestunecontroller.h
- patching file src/tools/tunecontroller/plugins/aimp/aimpplugin.cpp
- patching file src/tools/tunecontroller/plugins/aimp/third-party/apiRemote.h
- patching file src/tools/tunecontroller/plugins/itunes/itunescontroller.cpp
- patching file src/tools/tunecontroller/plugins/itunes/itunescontroller.h
- patching file src/tools/tunecontroller/plugins/itunes/itunesplugin.cpp
- patching file src/tools/tunecontroller/plugins/winamp/winampcontroller.cpp
- patching file src/tools/tunecontroller/plugins/winamp/winampcontroller.h
- patching file src/tools/tunecontroller/plugins/winamp/winampplugin.cpp
- patching file src/tools/tunecontroller/plugins/winamp/winampplugin.h
- patching file src/tools/tunecontroller/tunecontrollermanager.cpp
- patching file src/tools/tunecontroller/tunecontroller.pri
- patching file src/tools/tunecontroller/winamptunecontroller.cpp
- patching file src/tools/tunecontroller/winamptunecontroller.h
- patching file src/widgets/psitooltip.cpp
- patching file src/psioptions.cpp
- patching file src/psioptions.h
- patching file src/psioptionseditor.cpp
- patching file src/psioptionseditor.h
- patching file src/activity.cpp
- patching file src/activity.h
- patching file src/activitycatalog.cpp
- patching file src/activitydlg.cpp
- patching file src/avatars.cpp
- patching file src/avatars.h
- patching file src/geolocation.cpp
- patching file src/geolocation.h
- patching file src/geolocationdlg.cpp
- patching file src/mood.cpp
- patching file src/mood.h
- patching file src/moodcatalog.cpp
- patching file src/mooddlg.cpp
- patching file src/pepmanager.cpp
- patching file src/pepmanager.h
- patching file src/groupchatdlg.cpp
- Hunk #2 succeeded at 699 (offset 4 lines).
- Hunk #3 succeeded at 746 (offset 4 lines).
- Hunk #4 succeeded at 1967 (offset 3 lines).
- patching file options/default.xml
- patching file src/chatview_te.cpp
- patching file src/contactlistmodel.cpp
- patching file src/contactlistmodel.h
- patching file src/psicontactlistviewdelegate.cpp
- patching file src/userlist.cpp
- Hunk #1 succeeded at 1122 (offset 2 lines).
- patching file src/userlist.h
- patching file src/passphrasedlg.cpp
- patching file src/passphrasedlg.h
- patching file src/passphrase.ui
- patching file src/pgputil.cpp
- patching file src/pgputil.h
- patching file src/profiles.h
- patching file src/psiaccount.cpp
- Hunk #2 succeeded at 5824 (offset 6 lines).
- Hunk #3 succeeded at 5864 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psi_profiles.cpp
- patching file src/mucreasonseditor.cpp
- patching file src/mucreasonseditor.h
- patching file src/mucreasonseditor.ui
- patching file options/default.xml
- patching file src/chatdlg.cpp
- Hunk #2 succeeded at 397 (offset -9 lines).
- Hunk #3 succeeded at 456 (offset -9 lines).
- Hunk #4 succeeded at 507 (offset -9 lines).
- patching file src/chatdlg.h
- patching file src/chatdlg.ui
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 2726 (offset 6 lines).
- Hunk #2 succeeded at 2760 (offset 6 lines).
- Hunk #3 succeeded at 3221 (offset 6 lines).
- Hunk #4 succeeded at 3762 (offset 6 lines).
- Hunk #5 succeeded at 3781 (offset 6 lines).
- Hunk #6 succeeded at 4960 (offset 6 lines).
- Hunk #7 succeeded at 4974 (offset 6 lines).
- Hunk #8 succeeded at 4992 (offset 6 lines).
- Hunk #9 succeeded at 5464 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file src/psicon.cpp
- patching file src/chatdlg.cpp
- Hunk #1 succeeded at 1122 (offset -9 lines).
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 1994 (offset 3 lines).
- patching file src/tabs/tabbablewidget.h
- patching file src/tabs/tabdlg.cpp
- patching file options/default.xml
- patching file src/avatars.cpp
- patching file src/avatars.h
- patching file src/contactlistmodel.cpp
- patching file src/gcuserview.cpp
- patching file src/gcuserview.h
- patching file src/groupchatdlg.cpp
- Hunk #2 succeeded at 818 (offset 4 lines).
- Hunk #3 succeeded at 1485 (offset 4 lines).
- Hunk #4 succeeded at 1581 (offset 4 lines).
- Hunk #5 succeeded at 1861 (offset 3 lines).
- patching file src/groupchatdlg.h
- patching file src/options/opt_appearance.cpp
- patching file src/options/opt_iconset_affiliation.ui
- patching file src/options/opt_iconset.cpp
- patching file src/options/opt_iconset.h
- patching file src/options/options.pri
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 6219 (offset 6 lines).
- patching file src/psichatdlg.cpp
- patching file src/psicontactlistviewdelegate.cpp
- patching file src/psiiconset.cpp
- patching file src/psiiconset.h
- patching file src/userlist.cpp
- Hunk #1 succeeded at 879 (offset 2 lines).
- patching file src/avatars.cpp
- patching file src/contactlistgroup.cpp
- patching file src/contactlistproxymodel.cpp
- patching file src/profiles.h
- patching file src/psiaccount.cpp
- Hunk #3 succeeded at 1378 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psicontact.cpp
- patching file src/psicontact.h
- patching file src/psicontactmenu.cpp
- patching file src/psi_profiles.cpp
- patching file src/contactlistgroup.cpp
- patching file src/contactlistgroup.h
- patching file src/contactlistgroupmenu.cpp
- patching file src/contactlistgroupstate.cpp
- patching file src/contactlistgroupstate.h
- patching file src/contactlistproxymodel.cpp
- 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
- 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
- patching file src/tools/optionstree/optionstreemodel.cpp
- patching file options/default.xml
- patching file src/chatdlg.cpp
- Hunk #1 succeeded at 636 (offset -9 lines).
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 1805 (offset 3 lines).
- patching file src/tabs/tabdlg.cpp
- patching file src/groupchatdlg.cpp
- Hunk #3 succeeded at 734 (offset 4 lines).
- Hunk #4 succeeded at 2127 (offset 3 lines).
- patching file src/groupchatdlg.h
- patching file src/infodlg.cpp
- Hunk #1 succeeded at 159 (offset -2 lines).
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 1466 (offset 4 lines).
- Hunk #2 succeeded at 1474 (offset 4 lines).
- Hunk #3 succeeded at 1933 (offset 3 lines).
- Hunk #4 succeeded at 1999 (offset 3 lines).
- patching file src/mucreasonseditor.cpp
- patching file src/mucreasonseditor.h
- patching file src/discodlg.cpp
- patching file src/disco.ui
- patching file src/mucjoindlg.cpp
- patching file src/mucjoindlg.h
- patching file src/bookmarkmanagedlg.cpp
- Hunk #2 succeeded at 48 (offset -2 lines).
- Hunk #3 succeeded at 227 (offset -2 lines).
- patching file src/bookmarkmanagedlg.h
- patching file src/bookmarkmanage.ui
- patching file src/groupchatdlg.cpp
- patching file src/discodlg.cpp
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 3428 (offset 6 lines).
- Hunk #2 succeeded at 4467 (offset 6 lines).
- Hunk #3 succeeded at 4852 (offset 6 lines).
- patching file src/psiaccount.h
- patching file options/default.xml
- patching file src/psiaccount.cpp
- patching file src/psicon.cpp
- patching file src/psicon.h
- patching file src/mucaffiliationsmodel.cpp
- patching file src/mucaffiliationsview.cpp
- patching file src/chatdlg.ui
- patching file src/psichatdlg.cpp
- patching file src/privacy/privacydlg.cpp
- Hunk #1 succeeded at 57 (offset -2 lines).
- Hunk #2 succeeded at 356 (offset -2 lines).
- patching file src/privacy/privacydlg.h
- patching file src/privacy/privacy.ui
- patching file src/gcuserview.cpp
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 2037 (offset 3 lines).
- patching file options/default.xml
- patching file src/activecontactsmenu.cpp
- patching file src/activecontactsmenu.h
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 3336 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psiactionlist.cpp
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file src/psicontact.cpp
- patching file src/psicontact.h
- patching file src/src.pri
- patching file src/chatview_te.cpp
- patching file src/chatview_te.h
- patching file src/chatview_webkit.cpp
- patching file src/chatview_webkit.h
- patching file src/psichatdlg.cpp
- patching file themes/chatview/psi/classic/index.html
- patching file src/options/opt_groupchat.cpp
- patching file src/options/opt_groupchat.h
- patching file options/default.xml
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file src/tabs/tabbablewidget.cpp
- patching file src/tabs/tabbablewidget.h
- patching file src/tabs/tabdlg.cpp
- patching file src/groupchatdlg.cpp
- Hunk #1 succeeded at 1732 (offset 4 lines).
- patching file src/psidbusnotifier.cpp
- patching file src/psigrowlnotifier.cpp
- patching file src/psipopup.cpp
- patching file src/accountstatusmenu.cpp
- patching file src/accountstatusmenu.h
- patching file src/mainwin.cpp
- patching file src/profiles.h
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 4096 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psicon.cpp
- patching file src/psi_profiles.cpp
- patching file options/default.xml
- patching file src/libpsi/tools/spellchecker/aspellchecker.cpp
- patching file src/libpsi/tools/spellchecker/aspellchecker.h
- patching file src/libpsi/tools/spellchecker/spellchecker.h
- patching file src/psicon.cpp
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 4276 (offset 6 lines).
- Hunk #2 succeeded at 4284 (offset 6 lines).
- Hunk #3 succeeded at 4622 (offset 6 lines).
- patching file src/libpsi/tools/spellchecker/spellhighlighter.cpp
- patching file src/msgmle.cpp
- Hunk #1 succeeded at 349 (offset 1 line).
- patching file src/psiaccount.cpp
- patching file src/psiaccount.cpp
- Hunk #1 succeeded at 4690 (offset 6 lines).
- patching file src/widgets/psirichtext.cpp
- patching file src/psiaccount.cpp
- Hunk #2 succeeded at 1564 (offset 6 lines).
- Hunk #3 succeeded at 2766 (offset 6 lines).
- Hunk #4 succeeded at 5196 (offset 6 lines).
- patching file src/psiaccount.h
- patching file src/psicon.cpp
- patching file src/psievent.h
- patching file src/sxe/sxemanager.cpp
- patching file src/sxe/sxemanager.h
- patching file src/whiteboarding/wbmanager.cpp
- patching file src/whiteboarding/wbmanager.h
- patching file src/userlist.cpp
- Hunk #2 succeeded at 962 (offset 2 lines).
- patching file src/contactlistnestedgroup.cpp
- Hunk #1 succeeded at 69 (offset 14 lines).
- Hunk #2 succeeded at 144 (offset 14 lines).
- patching file src/accountmodifydlg.cpp
- Hunk #2 succeeded at 152 (offset -2 lines).
- Hunk #3 succeeded at 487 (offset -2 lines).
- Hunk #4 succeeded at 569 (offset -2 lines).
- patching file src/accountmodifydlg.h
- patching file src/accountmodify.ui
- patching file src/profiles.h
- patching file src/psiaccount.cpp
- patching file src/psi_profiles.cpp
- patching file src/contactlistmodel.h
- patching file src/psicontactlistmodel.cpp
- patching file src/psicontactlistviewdelegate.cpp
- patching file options/default.xml
- patching file src/chatdlg.cpp
- Hunk #1 succeeded at 924 (offset -9 lines).
- patching file src/options/opt_chat.cpp
- patching file src/options/opt_chat.ui
- patching file options/default.xml
- patching file src/groupchatdlg.cpp
- Hunk #6 succeeded at 737 (offset 4 lines).
- Hunk #7 succeeded at 798 (offset 4 lines).
- Hunk #8 succeeded at 817 (offset 4 lines).
- Hunk #9 succeeded at 858 (offset 4 lines).
- Hunk #10 succeeded at 873 (offset 4 lines).
- Hunk #11 succeeded at 886 (offset 4 lines).
- Hunk #12 succeeded at 987 (offset 4 lines).
- Hunk #13 succeeded at 1471 (offset 4 lines).
- Hunk #14 succeeded at 1916 (offset 4 lines).
- Hunk #15 succeeded at 1944 (offset 4 lines).
- Hunk #16 succeeded at 1973 (offset 4 lines).
- Hunk #17 succeeded at 2099 (offset 4 lines).
- Hunk #18 succeeded at 2164 (offset 4 lines).
- Hunk #19 succeeded at 2242 (offset 4 lines).
- patching file src/groupchatdlg.h
- patching file src/mainwin.cpp
- patching file src/options/opt_lookfeel_toolbars.ui
- patching file src/options/opt_toolbars.cpp
- patching file src/psiactionlist.cpp
- patching file src/psiactionlist.h
- patching file src/psichatdlg.cpp
- patching file src/psichatdlg.h
- patching file src/psioptions.cpp
- patching file src/psi_profiles.cpp
- patching file src/widgets/iconaction.cpp
- patching file src/mainwin.cpp
- patching file src/mainwin.h
- patching file src/options/opt_toolbars.cpp
- patching file src/chatview_te.cpp
- patching file src/chatview_te.h
- patching file src/chatview_webkit.cpp
- patching file src/chatview_webkit.h
- patching file src/groupchatdlg.cpp
- Hunk #2 succeeded at 887 (offset 4 lines).
- patching file src/psichatdlg.cpp
- patching file src/libpsi/tools/spellchecker/enchantchecker.cpp
- patching file src/libpsi/tools/spellchecker/enchantchecker.h
- patching file options/default.xml
- patching file src/chatdlg.cpp
- patching file src/groupchatdlg.cpp
- patching file src/groupchatdlg.h
- patching file src/psiaccount.cpp
- patching file src/psiaccount.h
- patching file src/psicon.cpp
- patching file src/psievent.cpp
- patching file src/psiiconset.cpp
- patching file iris/src/xmpp/xmpp-im/client.cpp
- Hunk #2 succeeded at 889 (offset 2 lines).
- Hunk #3 succeeded at 1284 (offset 2 lines).
- Hunk #4 succeeded at 1341 (offset 2 lines).
- patching file iris/src/xmpp/xmpp-im/types.cpp
- patching file iris/src/xmpp/xmpp-im/xmpp_client.h
- 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
- patching file iris/src/xmpp/xmpp-im/xmpp_tasks.h
- patching file src/chatdlg.cpp
- patching file src/groupchatdlg.cpp
- 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
- patching file iris/src/xmpp/xmpp-im/client.cpp
- Hunk #1 succeeded at 628 (offset 2 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.h
- patching file src/contactlistaccountmenu.cpp
- patching file src/groupchatdlg.cpp
- Hunk #2 succeeded at 907 (offset 5 lines).
- Hunk #3 succeeded at 1973 (offset 4 lines).
- Hunk #4 succeeded at 2142 (offset 4 lines).
- patching file src/options/options.pri
- 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/plugininfodialog.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/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/psi_profiles.cpp
- patching file src/mainwin.cpp
- patching file src/psiactionlist.cpp
- patching file src/applicationinfo.cpp
- patching file src/applicationinfo.h
- patching file src/avcall/avcall.cpp
- patching file src/pluginmanager.cpp
- patching file src/aboutdlg.cpp
- patching file src/about.ui
- patching file certs/README
- patching file psi.desktop
- patching file qcm/conf.qcm
- patching file src/applicationinfo.cpp
- patching file src/homedirmigration.ui
- patching file src/plugins/psiplugin.pri
- patching file src/src.pro
- ==> Beginne build()...
- Project name: Psi
- Profile: psi.pro
- Deps: qt4* buildmodeapp* idn* qca* zlib* qjdns* x11* universal qdbus webkit growl whiteboarding xss aspell enchant spell* plugins conf* recursiveprl*
- 'configure' written.
- Configuring Psi ...
- Verifying Qt 4 build environment ... ok
- Checking for Qt >= 4.7.0 ... yes
- Checking for LibIDN ... no
- Error: need LibIDN!
- ==> FEHLER: Ein Fehler geschah in build().
- Breche ab ...
- makepkg PKGBUILD 7,23s user 1,79s system 21% cpu 42,151 total
- 2 florian@horus ~/scratch/psi-plus-git %
Advertisement
Add Comment
Please, Sign In to add comment