Advertisement
Guest User

Untitled

a guest
Mar 28th, 2016
105
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 15.46 KB | None | 0 0
  1. Fetching origin
  2. -> Updating iris git repo...
  3. Fetching origin
  4. -> Updating libpsi git repo...
  5. Fetching origin
  6. ==> Validating source files with md5sums...
  7. psi ... Skipped
  8. psi-plus ... Skipped
  9. iris ... Skipped
  10. libpsi ... Skipped
  11. ==> Extracting sources...
  12. -> Creating working copy of psi git repo...
  13. Switched to a new branch 'makepkg'
  14. -> Creating working copy of main git repo...
  15. Switched to a new branch 'makepkg'
  16. -> Creating working copy of iris git repo...
  17. Switched to a new branch 'makepkg'
  18. -> Creating working copy of libpsi git repo...
  19. Switched to a new branch 'makepkg'
  20. ==> Starting prepare()...
  21. Submodule 'iris' (git://github.com/psi-im/iris.git) registered for path 'iris'
  22. Submodule 'src/libpsi' (git://github.com/psi-im/libpsi.git) registered for path 'src/libpsi'
  23. Cloning into 'iris'...
  24. done.
  25. Submodule path 'iris': checked out '9b678e85f2e02a8cef22130093a21822e4023e15'
  26. Cloning into 'src/libpsi'...
  27. done.
  28. Submodule path 'src/libpsi': checked out '97bce58cf60a952fe139bb8e4fb35cfb2b3a8d52'
  29. * Appling 0010-psi-iconsets.diff
  30. patching file iconsets.qrc
  31. patching file iconsets/system/default/icondef.xml
  32. * Appling 0020-psi-icon-actions-shortcuts.diff
  33. patching file options/default.xml
  34. patching file src/psiactionlist.cpp
  35. * Appling 0030-psi-default-application-settings.diff
  36. patching file options/default.xml
  37. patching file options/macosx.xml
  38. patching file options/windows.xml
  39. patching file src/psi_profiles.cpp
  40. patching file src/psioptions.cpp
  41. * Appling 0040-psi-tabs-button-killer.diff
  42. patching file options/default.xml
  43. patching file src/options/opt_chat.cpp
  44. patching file src/options/opt_chat.ui
  45. patching file src/psicon.cpp
  46. Hunk #1 succeeded at 1410 (offset -4 lines).
  47. patching file src/tabs/tabdlg.cpp
  48. patching file src/widgets/psitabwidget.cpp
  49. * Appling 0050-psi-plugins-qcm-fix.diff
  50. patching file qcm/plugins.qcm
  51. patching file psi.qc
  52. * Appling 0060-psi-configure-hyperlink-color.diff
  53. patching file options/default.xml
  54. patching file src/textutil.cpp
  55. * Appling 0070-psi-dirty-check.diff
  56. patching file src/AutoUpdater/AutoUpdater.pri
  57. patching file src/AutoUpdater/QDChangeLog.ui
  58. patching file src/AutoUpdater/QDChecker.cpp
  59. patching file src/AutoUpdater/QDChecker.h
  60. patching file src/psicon.cpp
  61. Hunk #2 succeeded at 463 (offset -1 lines).
  62. Hunk #3 succeeded at 498 (offset -1 lines).
  63. patching file src/src.pri
  64. Hunk #1 succeeded at 58 (offset 7 lines).
  65. * Appling 0090-psi-add-view-groups-to-tray-menu.diff
  66. patching file src/mainwin.cpp
  67. * Appling 0100-psi-contact-manager.diff
  68. patching file src/contactlistaccountmenu.cpp
  69. patching file src/contactmanager/contactmanager.pri
  70. patching file src/contactmanager/contactmanagerdlg.cpp
  71. patching file src/contactmanager/contactmanagerdlg.h
  72. patching file src/contactmanager/contactmanagerdlg.ui
  73. patching file src/contactmanager/contactmanagermodel.cpp
  74. patching file src/contactmanager/contactmanagermodel.h
  75. patching file src/contactmanager/contactmanagerview.cpp
  76. patching file src/contactmanager/contactmanagerview.h
  77. patching file src/src.pri
  78. Hunk #1 succeeded at 25 (offset 8 lines).
  79. * Appling 0110-psiplus-more-compatibility-with-skinsplugin.diff
  80. patching file src/mainwin.cpp
  81. patching file src/mainwin.h
  82. * Appling 0120-psi-css-style-sheet.diff
  83. patching file options/default.xml
  84. patching file src/contactlistitemmenu.cpp
  85. patching file src/gcuserview.cpp
  86. Hunk #1 succeeded at 724 (offset 3 lines).
  87. patching file src/groupchatdlg.cpp
  88. patching file src/mainwin.cpp
  89. patching file src/psichatdlg.cpp
  90. patching file src/psicon.cpp
  91. Hunk #1 succeeded at 510 (offset -1 lines).
  92. Hunk #2 succeeded at 1428 (offset -4 lines).
  93. patching file src/statusmenu.cpp
  94. patching file src/tabs/tabdlg.cpp
  95. patching file src/widgets/fancypopup.cpp
  96. patching file src/widgets/iconaction.cpp
  97. patching file src/widgets/psitabwidget.cpp
  98. patching file src/widgets/psitabwidget.h
  99. patching file src/widgets/psitiplabel.cpp
  100. patching file src/widgets/urlobject.cpp
  101. * Appling 0130-psiplus-nix-application-icon-and-name.diff
  102. patching file psi.desktop
  103. patching file src/src.pro
  104. * Appling 0140-psi-tray-act-bring-to-front.diff
  105. patching file options/default.xml
  106. patching file src/mainwin.cpp
  107. Hunk #3 succeeded at 1490 (offset 4 lines).
  108. Hunk #4 succeeded at 1634 (offset 4 lines).
  109. Hunk #5 succeeded at 1687 (offset 4 lines).
  110. patching file src/mainwin.h
  111. patching file src/src.pri
  112. Hunk #1 succeeded at 357 (offset 8 lines).
  113. patching file src/x11windowsystem.cpp
  114. patching file src/x11windowsystem.h
  115. * Appling 0150-psi-options-language-select.diff
  116. patching file src/options/opt_application.cpp
  117. patching file src/options/opt_application.ui
  118. * Appling 0160-psi-minimize-chat-hotkey.diff
  119. patching file options/default.xml
  120. patching file src/groupchatdlg.cpp
  121. patching file src/groupchatdlg.h
  122. patching file src/psichatdlg.cpp
  123. patching file src/psichatdlg.h
  124. * Appling 0170-psi-add-bookmarks-to-join-conference-dlg.diff
  125. patching file src/mucjoin.ui
  126. patching file src/mucjoindlg.cpp
  127. patching file src/mucjoindlg.h
  128. * Appling 0180-psiplus-decorate-windows.diff
  129. patching file options/default.xml
  130. patching file src/groupchatdlg.cpp
  131. patching file src/groupchatdlg.h
  132. patching file src/mainwin.cpp
  133. Hunk #5 succeeded at 1802 (offset 4 lines).
  134. Hunk #6 succeeded at 2056 (offset 4 lines).
  135. patching file src/mainwin.h
  136. patching file src/options/opt_application.cpp
  137. patching file src/options/opt_application.ui
  138. patching file src/psichatdlg.cpp
  139. patching file src/psichatdlg.h
  140. patching file src/tabs/tabdlg.cpp
  141. patching file src/tabs/tabdlg.h
  142. patching file src/tools/advwidget/advwidget.h
  143. patching file src/widgets/psiwindowheader.cpp
  144. patching file src/widgets/psiwindowheader.h
  145. patching file src/widgets/psiwindowheader.ui
  146. patching file src/widgets/widgets.pri
  147. * Appling 0190-psi-colors-for-tabs.diff
  148. patching file options/default.xml
  149. patching file src/tabs/tabdlg.cpp
  150. * Appling 0200-psi-chatview-quote-feature.diff
  151. patching file src/chatview_te.cpp
  152. patching file src/chatview_te.h
  153. patching file src/groupchatdlg.cpp
  154. patching file src/msgmle.cpp
  155. patching file src/msgmle.h
  156. patching file src/psichatdlg.cpp
  157. patching file src/webview.cpp
  158. patching file src/webview.h
  159. patching file src/widgets/psitextview.cpp
  160. patching file src/widgets/psitextview.h
  161. * Appling 0210-psi-vert-splitter-position.diff
  162. patching file options/default.xml
  163. patching file src/chatsplitter.cpp
  164. patching file src/chatsplitter.h
  165. patching file src/groupchatdlg.cpp
  166. patching file src/groupchatdlg.h
  167. patching file src/psichatdlg.cpp
  168. patching file src/psichatdlg.h
  169. patching file src/tabs/tabbablewidget.h
  170. patching file src/tabs/tabdlg.cpp
  171. patching file src/tabs/tabdlg.h
  172. * Appling 0220-psi-auto-capitalizer.diff
  173. patching file options/default.xml
  174. patching file src/msgmle.cpp
  175. patching file src/msgmle.h
  176. * Appling 0230-psi-autostart.diff
  177. patching file src/applicationinfo.cpp
  178. Hunk #1 succeeded at 377 (offset -6 lines).
  179. patching file src/applicationinfo.h
  180. Hunk #1 succeeded at 43 (offset -1 lines).
  181. patching file src/options/opt_application.cpp
  182. patching file src/options/opt_application.ui
  183. * Appling 0240-psi-fix-psitooltiphandler.diff
  184. patching file src/widgets/psitooltip.cpp
  185. * Appling 0250-psi-disable-auto-scroll-to-bottom.diff
  186. patching file options/default.xml
  187. patching file src/chatview_te.cpp
  188. * Appling 0260-psi-tab-highlight-color.diff
  189. patching file src/chatdlg.cpp
  190. Hunk #1 succeeded at 1126 (offset -1 lines).
  191. patching file src/groupchatdlg.cpp
  192. patching file src/tabs/tabbablewidget.h
  193. patching file src/tabs/tabdlg.cpp
  194. * Appling 0270-psi-set-window-icons.diff
  195. patching file src/aboutdlg.cpp
  196. patching file src/accountmanagedlg.cpp
  197. patching file src/activitydlg.cpp
  198. patching file src/avcall/calldlg.cpp
  199. patching file src/bookmarkmanagedlg.cpp
  200. patching file src/contactmanager/contactmanagerdlg.cpp
  201. patching file src/geolocationdlg.cpp
  202. patching file src/groupchatdlg.cpp
  203. patching file src/mooddlg.cpp
  204. patching file src/mucjoindlg.cpp
  205. patching file src/options/optionsdlg.cpp
  206. Hunk #1 succeeded at 513 (offset 4 lines).
  207. patching file src/privacy/privacydlg.cpp
  208. patching file src/profiledlg.cpp
  209. patching file src/psioptionseditor.cpp
  210. patching file src/statusdlg.cpp
  211. patching file src/tipdlg.cpp
  212. patching file src/xmlconsole.cpp
  213. Hunk #1 succeeded at 34 (offset 1 line).
  214. Hunk #2 succeeded at 43 (offset 1 line).
  215. * Appling 0280-psi-optionseditor-show-only-first-line.diff
  216. patching file src/tools/optionstree/optionstreemodel.cpp
  217. * Appling 0290-psi-custom-chat-window-caption.diff
  218. patching file options/default.xml
  219. patching file src/chatdlg.cpp
  220. Hunk #1 succeeded at 636 (offset -1 lines).
  221. patching file src/groupchatdlg.cpp
  222. patching file src/tabs/tabdlg.cpp
  223. * Appling 0300-psi-fix-trackbar.diff
  224. patching file src/tabs/tabbablewidget.cpp
  225. patching file src/tabs/tabbablewidget.h
  226. patching file src/tabs/tabdlg.cpp
  227. * Appling 0310-psi-fix-online-contacts-count-update.diff
  228. patching file src/psiaccount.cpp
  229. Hunk #1 succeeded at 450 (offset 2 lines).
  230. Hunk #2 succeeded at 481 (offset 1 line).
  231. Hunk #3 succeeded at 651 (offset 1 line).
  232. Hunk #4 succeeded at 668 (offset 1 line).
  233. * Appling 0320-psi-muc-highlight-events.diff
  234. patching file options/default.xml
  235. patching file src/chatdlg.cpp
  236. Hunk #1 succeeded at 448 (offset -1 lines).
  237. patching file src/groupchatdlg.cpp
  238. patching file src/groupchatdlg.h
  239. patching file src/psiaccount.cpp
  240. Hunk #1 succeeded at 2755 (offset -34 lines).
  241. Hunk #2 succeeded at 5024 (offset -52 lines).
  242. Hunk #3 succeeded at 5074 (offset -52 lines).
  243. Hunk #4 succeeded at 5138 (offset -52 lines).
  244. Hunk #5 succeeded at 5551 (offset -52 lines).
  245. Hunk #6 succeeded at 5573 (offset -52 lines).
  246. Hunk #7 succeeded at 5688 (offset -52 lines).
  247. Hunk #8 succeeded at 5723 (offset -52 lines).
  248. patching file src/psiaccount.h
  249. Hunk #1 succeeded at 449 (offset -2 lines).
  250. patching file src/psicon.cpp
  251. Hunk #1 succeeded at 82 (offset 1 line).
  252. Hunk #2 succeeded at 1734 (offset -4 lines).
  253. Hunk #3 succeeded at 1787 (offset -4 lines).
  254. patching file src/psievent.cpp
  255. patching file src/psiiconset.cpp
  256. Hunk #1 succeeded at 706 (offset 20 lines).
  257. * Appling 0330-iris-XEP-0083-nested-roster-groups.diff
  258. patching file iris/src/xmpp/xmpp-im/client.cpp
  259. Hunk #1 succeeded at 87 (offset -15 lines).
  260. Hunk #2 succeeded at 891 (offset 2 lines).
  261. Hunk #3 succeeded at 1346 (offset 62 lines).
  262. Hunk #4 succeeded at 1403 (offset 62 lines).
  263. patching file iris/src/xmpp/xmpp-im/types.cpp
  264. Hunk #1 succeeded at 3007 (offset 161 lines).
  265. Hunk #2 succeeded at 3058 (offset 161 lines).
  266. patching file iris/src/xmpp/xmpp-im/xmpp_client.h
  267. Hunk #1 succeeded at 81 (offset 2 lines).
  268. Hunk #2 succeeded at 137 (offset -1 lines).
  269. Hunk #3 succeeded at 171 (offset -1 lines).
  270. patching file iris/src/xmpp/xmpp-im/xmpp_liveroster.h
  271. patching file iris/src/xmpp/xmpp-im/xmpp_roster.h
  272. patching file iris/src/xmpp/xmpp-im/xmpp_task.cpp
  273. patching file iris/src/xmpp/xmpp-im/xmpp_task.h
  274. patching file iris/src/xmpp/xmpp-im/xmpp_tasks.cpp
  275. Hunk #1 succeeded at 369 (offset -4 lines).
  276. Hunk #2 succeeded at 411 (offset -4 lines).
  277. Hunk #3 succeeded at 419 (offset -4 lines).
  278. Hunk #4 succeeded at 469 (offset -4 lines).
  279. Hunk #5 succeeded at 482 (offset -4 lines).
  280. Hunk #6 succeeded at 555 (offset -4 lines).
  281. patching file iris/src/xmpp/xmpp-im/xmpp_tasks.h
  282. * Appling 0340-psi-multirows-tab.diff
  283. patching file options/default.xml
  284. patching file src/widgets/psitabbar.cpp
  285. patching file src/widgets/psitabbar.h
  286. patching file src/widgets/psitabwidget.cpp
  287. patching file src/widgets/psitabwidget.h
  288. patching file src/widgets/tabbar.cpp
  289. patching file src/widgets/tabbar.h
  290. patching file src/widgets/widgets.pri
  291. * Appling 8000-psi-extend-plugins-interface.diff
  292. patching file iris/src/xmpp/xmpp-im/client.cpp
  293. Hunk #1 succeeded at 630 (offset 11 lines).
  294. patching file iris/src/xmpp/xmpp-im/xmpp_client.h
  295. patching file src/applicationinfo.cpp
  296. patching file src/applicationinfo.h
  297. patching file src/chatdlg.cpp
  298. patching file src/chatdlg.h
  299. patching file src/common.cpp
  300. patching file src/common.h
  301. patching file src/contactlistaccountmenu.cpp
  302. patching file src/groupchatdlg.cpp
  303. patching file src/options/opt_plugins.cpp
  304. patching file src/options/opt_plugins.h
  305. patching file src/options/opt_plugins.ui
  306. patching file src/options/options.pri
  307. patching file src/options/optionsdlg.cpp
  308. Hunk #1 succeeded at 204 (offset 4 lines).
  309. Hunk #2 succeeded at 245 (offset 4 lines).
  310. Hunk #3 succeeded at 456 (offset 4 lines).
  311. Hunk #4 succeeded at 468 (offset 4 lines).
  312. patching file src/options/optionstab.cpp
  313. patching file src/options/optionstab.h
  314. patching file src/options/plugininfodialog.ui
  315. patching file src/options/pluginsettsdialog.ui
  316. patching file src/pluginhost.cpp
  317. patching file src/pluginhost.h
  318. patching file src/pluginmanager.cpp
  319. patching file src/pluginmanager.h
  320. patching file src/plugins/include/accountinfoaccessinghost.h
  321. patching file src/plugins/include/accountinfoaccessor.h
  322. patching file src/plugins/include/activetabaccessinghost.h
  323. patching file src/plugins/include/activetabaccessor.h
  324. patching file src/plugins/include/applicationinfoaccessinghost.h
  325. patching file src/plugins/include/applicationinfoaccessor.h
  326. patching file src/plugins/include/chattabaccessor.h
  327. patching file src/plugins/include/contactinfoaccessinghost.h
  328. patching file src/plugins/include/contactinfoaccessor.h
  329. patching file src/plugins/include/contactstateaccessinghost.h
  330. patching file src/plugins/include/contactstateaccessor.h
  331. patching file src/plugins/include/eventcreatinghost.h
  332. patching file src/plugins/include/eventcreator.h
  333. patching file src/plugins/include/eventfilter.h
  334. patching file src/plugins/include/gctoolbariconaccessor.h
  335. patching file src/plugins/include/iconfactoryaccessinghost.h
  336. patching file src/plugins/include/iconfactoryaccessor.h
  337. patching file src/plugins/include/iqfilteringhost.h
  338. patching file src/plugins/include/iqnamespacefilter.h
  339. patching file src/plugins/include/menuaccessor.h
  340. patching file src/plugins/include/optionaccessinghost.h
  341. patching file src/plugins/include/optionaccessor.h
  342. patching file src/plugins/include/plugininfoprovider.h
  343. patching file src/plugins/include/popupaccessinghost.h
  344. patching file src/plugins/include/popupaccessor.h
  345. patching file src/plugins/include/psiaccountcontroller.h
  346. patching file src/plugins/include/psiaccountcontrollinghost.h
  347. patching file src/plugins/include/psiplugin.h
  348. patching file src/plugins/include/shortcutaccessinghost.h
  349. patching file src/plugins/include/shortcutaccessor.h
  350. patching file src/plugins/include/soundaccessinghost.h
  351. patching file src/plugins/include/soundaccessor.h
  352. patching file src/plugins/include/stanzafilter.h
  353. patching file src/plugins/include/stanzasendinghost.h
  354. patching file src/plugins/include/toolbariconaccessor.h
  355. patching file src/plugins/plugins.pri
  356. patching file src/psi_profiles.cpp
  357. patching file src/psiaccount.cpp
  358. patching file src/psiaccount.h
  359. patching file src/psiactionlist.cpp
  360. patching file src/psichatdlg.cpp
  361. patching file src/psicon.cpp
  362. patching file src/psicontactmenu.cpp
  363. patching file src/psievent.cpp
  364. patching file src/psievent.h
  365. patching file src/psioptions.cpp
  366. patching file src/tabs/tabdlg.cpp
  367. patching file src/tabs/tabdlg.h
  368. * Appling 9970-psiplus-join-to-support-muc.diff
  369. patching file src/mainwin.cpp
  370. patching file src/psiactionlist.cpp
  371. * Appling 9980-psi-search-for-psimedia-in-all-plugins-dirs.diff
  372. patching file src/applicationinfo.cpp
  373. Hunk #1 succeeded at 128 (offset -6 lines).
  374. patching file src/applicationinfo.h
  375. Hunk #1 succeeded at 39 (offset -1 lines).
  376. patching file src/avcall/avcall.cpp
  377. Hunk #1 FAILED at 117.
  378. 1 out of 1 hunk FAILED -- saving rejects to file src/avcall/avcall.cpp.rej
  379. patching file src/pluginmanager.cpp
  380. ==> ERROR: A failure occurred in prepare().
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement