-
-
Save kamiljk87/a737d4b2c315ea26c7e09be4d776153a to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
psi-plus-git 0.16.559.574-1 (2016-05-27 12:31) | |
diff --git a/PKGBUILD b/PKGBUILD | |
index 3753427..7388ce4 100644 | |
--- a/PKGBUILD | |
+++ b/PKGBUILD | |
@@ -14,7 +14,6 @@ optdepends=('qca-gnupg: encrypted client-to-client connection') | |
provides=("psi-plus=$pkgver") | |
replaces=('psi-plus' 'psi-plus-webkit-git') | |
conflicts=('psi-plus' 'psi-plus-webkit-git') | |
-install=psi-plus-git.install | |
source=('git://github.com/psi-im/psi.git' | |
'psi-plus::git://github.com/psi-plus/main.git' | |
'git://github.com/psi-im/iris.git' | |
( Unsupported package: Potentially dangerous ! ) | |
==> Edit PKGBUILD ? [Y/n] ("A" to abort) | |
==> ------------------------------------ | |
==> n | |
==> psi-plus-git dependencies: | |
- qt4 (already installed) | |
- qca-qt4 (already installed) | |
- libidn (already installed) | |
- aspell (already installed) | |
- libxss (already installed) | |
- git (already installed) [makedepend] | |
- patch (already installed) [makedepend] | |
- qconf-git (already installed) [makedepend] | |
==> Continue building psi-plus-git ? [Y/n] | |
==> -------------------------------------- | |
==> | |
==> Building and installing package | |
==> Making package: psi-plus-git 0.16.559.574-1 (Thu Oct 13 19:02:50 CEST 2016) | |
==> WARNING: Skipping dependency checks. | |
==> Retrieving sources... | |
-> Updating psi git repo... | |
Fetching origin | |
-> Updating psi-plus git repo... | |
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... | |
Cloning into 'psi'... | |
done. | |
-> Creating working copy of main git repo... | |
Cloning into 'psi-plus'... | |
done. | |
-> Creating working copy of iris git repo... | |
Cloning into 'iris'... | |
done. | |
-> Creating working copy of libpsi git repo... | |
Cloning into 'libpsi'... | |
done. | |
==> 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 '/var/cache/yaourt/yaourt_tmp/yaourt-tmp-$USER/aur-psi-plus-git/src/psi/iris'... | |
done. | |
Cloning into '/var/cache/yaourt/yaourt_tmp/yaourt-tmp-$USER/aur-psi-plus-git/src/psi/src/libpsi'... | |
done. | |
Submodule path 'iris': checked out '1db95f9af245e0dd8d33fd7e686e960b59d0cb9d' | |
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 1945 (offset 38 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 145 (offset 4 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 2250 (offset 7 lines). | |
patching file src/groupchatdlg.h | |
Hunk #1 succeeded at 170 (offset 3 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 | |
patching file src/chatview_te.h | |
patching file src/groupchatdlg.cpp | |
Hunk #1 succeeded at 893 (offset 9 lines). | |
patching file src/msgmle.cpp | |
patching file src/msgmle.h | |
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 | |
* 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 | |
Hunk #1 succeeded at 253 (offset 1 line). | |
Hunk #2 succeeded at 856 (offset 6 lines). | |
Hunk #3 succeeded at 874 (offset 6 lines). | |
Hunk #4 succeeded at 934 (offset 9 lines). | |
patching file src/groupchatdlg.h | |
Hunk #1 succeeded at 87 (offset 2 lines). | |
Hunk #2 succeeded at 146 (offset 4 lines). | |
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 | |
Hunk #1 succeeded at 112 (offset 2 lines). | |
Hunk #2 succeeded at 610 (offset 3 lines). | |
patching file src/msgmle.cpp | |
patching file src/msgmle.h | |
* Appling 0230-psi-autostart.diff | |
patching file src/applicationinfo.cpp | |
patching file src/applicationinfo.h | |
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 | |
Hunk #1 succeeded at 113 (offset 2 lines). | |
patching file src/chatview_te.cpp | |
* Appling 0260-psi-tab-highlight-color.diff | |
patching file src/chatdlg.cpp | |
Hunk #1 succeeded at 1146 (offset 19 lines). | |
patching file src/groupchatdlg.cpp | |
Hunk #1 succeeded at 2234 (offset 52 lines). | |
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 | |
Hunk #1 succeeded at 682 (offset 2 lines). | |
Hunk #2 succeeded at 1328 (offset 8 lines). | |
Hunk #3 succeeded at 2033 (offset 12 lines). | |
patching file src/mooddlg.cpp | |
patching file src/mucjoindlg.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 | |
* 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 | |
Hunk #1 succeeded at 114 (offset 2 lines). | |
patching file src/chatdlg.cpp | |
Hunk #1 succeeded at 640 (offset 3 lines). | |
patching file src/groupchatdlg.cpp | |
Hunk #1 succeeded at 1979 (offset 38 lines). | |
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 #3 succeeded at 651 (offset -3 lines). | |
Hunk #4 succeeded at 668 (offset -3 lines). | |
* Appling 0330-iris-XEP-0083-nested-roster-groups.diff | |
patching file iris/src/xmpp/xmpp-im/client.cpp | |
Hunk #2 succeeded at 896 (offset 13 lines). | |
Hunk #3 succeeded at 1351 (offset 13 lines). | |
Hunk #4 succeeded at 1408 (offset 13 lines). | |
patching file iris/src/xmpp/xmpp-im/types.cpp | |
Hunk #1 succeeded at 3055 (offset 43 lines). | |
Hunk #2 succeeded at 3106 (offset 43 lines). | |
patching file iris/src/xmpp/xmpp-im/xmpp_client.h | |
Hunk #3 succeeded at 171 (offset 1 line). | |
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_tasks.cpp | |
patching file iris/src/xmpp/xmpp-im/xmpp_tasks.h | |
* Appling 0340-psi-multirows-tab.diff | |
patching file options/default.xml | |
Hunk #1 succeeded at 512 (offset 2 lines). | |
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 9970-psiplus-join-to-support-muc.diff | |
patching file src/mainwin.cpp | |
Hunk #1 succeeded at 1087 (offset -9 lines). | |
Hunk #2 succeeded at 1097 (offset -9 lines). | |
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 | |
patching file src/pluginmanager.cpp | |
* Appling 9990-psiplus-aboutdlg.diff | |
patching file src/aboutdlg.cpp | |
patching file src/about.ui | |
* Appling 9998-psi-plus-migrate-old-home.diff | |
patching file src/homedirmigration.cpp | |
* Appling 9999-psiplus-application-info.diff | |
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 | |
Hunk #2 succeeded at 46 (offset 2 lines). | |
==> Starting pkgver()... | |
==> Updated version: psi-plus-git 0.16.564.585-1 | |
==> Sources are ready. | |
==> Making package: psi-plus-git 0.16.564.585-1 (Thu Oct 13 19:03:04 CEST 2016) | |
==> Checking runtime dependencies... | |
==> Checking buildtime dependencies... | |
==> Retrieving sources... | |
-> Updating psi git repo... | |
Fetching origin | |
-> Updating psi-plus git repo... | |
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()... | |
* 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 | |
The next patch would create the file src/AutoUpdater/QDChangeLog.ui, | |
which already exists! Assume -R? [n] | |
Apply anyway? [n] | |
Skipping patch. | |
1 out of 1 hunk ignored | |
The next patch would create the file src/AutoUpdater/QDChecker.cpp, | |
which already exists! Assume -R? [n] | |
Apply anyway? [n] | |
Skipping patch. | |
1 out of 1 hunk ignored | |
The next patch would create the file src/AutoUpdater/QDChecker.h, | |
which already exists! Assume -R? [n] | |
Apply anyway? [n] | |
Skipping patch. | |
1 out of 1 hunk ignored | |
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). | |
==> ERROR: A failure occurred in prepare(). | |
Aborting... | |
==> ERROR: Makepkg was unable to build psi-plus-git. | |
==> Restart building psi-plus-git ? [y/N] | |
==> ------------------------------------- | |
==> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment