Guest User

makepkg psi-plus-git

a guest
Nov 25th, 2014
254
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 51.02 KB | None | 0 0
  1. florian@horus ~/scratch % tar xzf psi-plus-git.tar.gz
  2. florian@horus ~/scratch % cd psi-plus-git
  3. florian@horus ~/scratch/psi-plus-git % ls
  4. PKGBUILD
  5. florian@horus ~/scratch/psi-plus-git % makepkg PKGBUILD
  6. ==> Erstelle Paket: psi-plus-git 0.16.424-1 (Di 25. Nov 22:02:16 CET 2014)
  7. ==> Prüfe Laufzeit-Abhängigkeiten...
  8. ==> Prüfe Buildtime-Abhängigkeiten...
  9. ==> Empfange Quellen...
  10. -> Klone das psi git Repo...
  11. Klone in Bare-Repository '/home/florian/scratch/psi-plus-git/psi'...
  12. remote: Counting objects: 18488, done.
  13. remote: Compressing objects: 100% (291/291), done.
  14. remote: Total 18488 (delta 208), reused 326 (delta 150)
  15. Empfange Objekte: 100% (18488/18488), 12.87 MiB | 638.00 KiB/s, Fertig.
  16. Löse Unterschiede auf: 100% (12766/12766), Fertig.
  17. Prüfe Konnektivität... Fertig.
  18. -> Klone das psi-plus git Repo...
  19. Klone in Bare-Repository '/home/florian/scratch/psi-plus-git/psi-plus'...
  20. remote: Counting objects: 5573, done.
  21. remote: Compressing objects: 100% (41/41), done.
  22. remote: Total 5573 (delta 14), reused 23 (delta 8)
  23. Empfange Objekte: 100% (5573/5573), 4.63 MiB | 990.00 KiB/s, Fertig.
  24. Löse Unterschiede auf: 100% (3186/3186), Fertig.
  25. Prüfe Konnektivität... Fertig.
  26. -> Klone das iris git Repo...
  27. Klone in Bare-Repository '/home/florian/scratch/psi-plus-git/iris'...
  28. remote: Counting objects: 4494, done.
  29. remote: Compressing objects: 100% (54/54), done.
  30. remote: Total 4494 (delta 15), reused 22 (delta 1)
  31. Empfange Objekte: 100% (4494/4494), 2.08 MiB | 549.00 KiB/s, Fertig.
  32. Löse Unterschiede auf: 100% (2412/2412), Fertig.
  33. Prüfe Konnektivität... Fertig.
  34. -> Klone das libpsi git Repo...
  35. Klone in Bare-Repository '/home/florian/scratch/psi-plus-git/libpsi'...
  36. remote: Counting objects: 511, done.
  37. remote: Compressing objects: 100% (7/7), done.
  38. remote: Total 511 (delta 1), reused 5 (delta 1)
  39. Empfange Objekte: 100% (511/511), 210.25 KiB | 193.00 KiB/s, Fertig.
  40. Löse Unterschiede auf: 100% (264/264), Fertig.
  41. Prüfe Konnektivität... Fertig.
  42. ==> Überprüfe Gültigkeit der Quell-Dateien mit md5sums...
  43. psi ... Übersprungen
  44. psi-plus ... Übersprungen
  45. iris ... Übersprungen
  46. libpsi ... Übersprungen
  47. ==> Entpacke Quellen ...
  48. -> Erstelle Arbeitskopie des psi git Repos...
  49. Klone nach 'psi'...
  50. Fertig.
  51. -> Erstelle Arbeitskopie des main git Repos...
  52. Klone nach 'psi-plus'...
  53. Fertig.
  54. -> Erstelle Arbeitskopie des iris git Repos...
  55. Klone nach 'iris'...
  56. Fertig.
  57. -> Erstelle Arbeitskopie des libpsi git Repos...
  58. Klone nach 'libpsi'...
  59. Fertig.
  60. ==> Beginne pkgver()...
  61. ==> Aktualisierte Version: psi-plus-git 0.16.439-1
  62. ==> Beginne prepare()...
  63. Submodul 'iris' (git://github.com/psi-im/iris.git) für Pfad 'iris' in die Konfiguration eingetragen.
  64. Submodul 'src/libpsi' (git://github.com/psi-im/libpsi.git) für Pfad 'src/libpsi' in die Konfiguration eingetragen.
  65. Klone nach 'iris'...
  66. Fertig.
  67. Submodul-Pfad: 'iris': '659712301d602f25997e171a9a1473a4c5126086' ausgecheckt
  68. Klone nach 'src/libpsi'...
  69. Fertig.
  70. Submodul-Pfad: 'src/libpsi': '6bdd75f9ff506a1ee3582d160092bbaabb39a271' ausgecheckt
  71. patching file options/default.xml
  72. Hunk #1 succeeded at 453 (offset 2 lines).
  73. patching file src/chatdlg.cpp
  74. patching file src/options/opt_advanced.cpp
  75. patching file src/options/opt_advanced.ui
  76. patching file iconsets/system/default/icondef.xml
  77. patching file iconsets.qrc
  78. patching file src/entitytimetask.cpp
  79. patching file src/entitytimetask.h
  80. patching file src/infodlg.cpp
  81. Hunk #2 succeeded at 244 (offset 1 line).
  82. Hunk #3 succeeded at 778 (offset 1 line).
  83. Hunk #4 succeeded at 816 (offset 1 line).
  84. Hunk #5 succeeded at 858 (offset 1 line).
  85. patching file src/infodlg.h
  86. patching file src/psiaccount.cpp
  87. patching file src/src.pri
  88. patching file src/systeminfo.cpp
  89. patching file src/timeserver.cpp
  90. patching file src/timeserver.h
  91. patching file src/userlist.cpp
  92. patching file src/userlist.h
  93. patching file src/moodcatalog.cpp
  94. patching file src/moodcatalog.h
  95. patching file src/mood.cpp
  96. patching file src/mooddlg.cpp
  97. patching file src/mood.h
  98. patching file src/options/opt_appearance.cpp
  99. patching file src/options/opt_iconset.cpp
  100. patching file src/options/opt_iconset.h
  101. patching file src/options/opt_iconset_mood.ui
  102. patching file src/options/options.pri
  103. patching file src/psiaccount.cpp
  104. Hunk #1 succeeded at 5514 (offset 6 lines).
  105. patching file src/psiaccount.h
  106. patching file src/psiiconset.cpp
  107. patching file src/psiiconset.h
  108. patching file src/userlist.cpp
  109. patching file src/gcuserview.cpp
  110. patching file src/groupchatdlg.cpp
  111. Hunk #1 succeeded at 1687 (offset 16 lines).
  112. Hunk #2 succeeded at 1706 (offset 16 lines).
  113. patching file src/chatview_te.cpp
  114. patching file src/chatview_te.h
  115. patching file src/chatview_webkit.cpp
  116. patching file src/chatview_webkit.h
  117. patching file src/desktoputil.cpp
  118. patching file src/gcuserview.cpp
  119. patching file src/gcuserview.h
  120. patching file src/groupchatdlg.cpp
  121. patching file src/groupchatdlg.h
  122. patching file src/psiaccount.cpp
  123. Hunk #1 succeeded at 4273 (offset 6 lines).
  124. patching file src/webview.cpp
  125. patching file src/widgets/urlobject.cpp
  126. patching file themes/chatview/psi/classic/index.html
  127. patching file src/psiaccount.cpp
  128. Hunk #2 succeeded at 2281 (offset 6 lines).
  129. patching file options/default.xml
  130. Hunk #1 succeeded at 364 (offset 1 line).
  131. patching file src/psiactionlist.cpp
  132. patching file src/chatdlg.cpp
  133. patching file src/chatdlg.h
  134. patching file src/common.cpp
  135. patching file src/common.h
  136. patching file src/psiaccount.cpp
  137. Hunk #1 succeeded at 3936 (offset 6 lines).
  138. Hunk #2 succeeded at 3970 (offset 6 lines).
  139. Hunk #3 succeeded at 4276 (offset 6 lines).
  140. Hunk #4 succeeded at 5257 (offset 6 lines).
  141. Hunk #5 succeeded at 5273 (offset 6 lines).
  142. patching file src/psiaccount.h
  143. patching file src/psicon.cpp
  144. patching file src/tabs/tabdlg.cpp
  145. patching file src/tabs/tabdlg.h
  146. patching file src/activitycatalog.cpp
  147. patching file src/activitycatalog.h
  148. patching file src/activity.cpp
  149. patching file src/activitydlg.cpp
  150. patching file src/activitydlg.h
  151. patching file src/activity.h
  152. patching file src/activity.ui
  153. patching file src/contactlistaccountmenu.cpp
  154. patching file src/contactview.cpp
  155. patching file src/contactview.h
  156. patching file src/psiaccount.cpp
  157. Hunk #4 succeeded at 2253 (offset 6 lines).
  158. Hunk #5 succeeded at 3431 (offset 6 lines).
  159. Hunk #6 succeeded at 3489 (offset 6 lines).
  160. Hunk #7 succeeded at 3812 (offset 6 lines).
  161. patching file src/psiaccount.h
  162. patching file src/psicon.cpp
  163. patching file src/src.pri
  164. patching file src/userlist.cpp
  165. patching file src/userlist.h
  166. patching file options/default.xml
  167. Hunk #1 succeeded at 354 (offset 1 line).
  168. patching file src/chatdlg.cpp
  169. patching file src/groupchatdlg.cpp
  170. Hunk #1 succeeded at 759 (offset 8 lines).
  171. Hunk #2 succeeded at 1060 (offset 8 lines).
  172. Hunk #3 succeeded at 1153 (offset 8 lines).
  173. Hunk #4 succeeded at 1207 (offset 8 lines).
  174. Hunk #5 succeeded at 1483 (offset 7 lines).
  175. Hunk #6 succeeded at 1791 (offset 7 lines).
  176. patching file src/groupchatdlg.h
  177. patching file src/psichatdlg.cpp
  178. Hunk #2 succeeded at 415 (offset 1 line).
  179. patching file src/tabs/tabbablewidget.cpp
  180. patching file src/tabs/tabbablewidget.h
  181. patching file src/tabs/tabdlg.cpp
  182. patching file src/tabs/tabdlg.h
  183. patching file src/widgets/psitabwidget.cpp
  184. patching file src/widgets/psitabwidget.h
  185. patching file options/default.xml
  186. Hunk #1 succeeded at 427 (offset 1 line).
  187. patching file src/chatdlg.cpp
  188. Hunk #1 succeeded at 684 (offset -9 lines).
  189. patching file src/groupchatdlg.cpp
  190. Hunk #1 succeeded at 944 (offset 8 lines).
  191. patching file src/msgmle.cpp
  192. Hunk #1 succeeded at 59 (offset 1 line).
  193. Hunk #2 succeeded at 272 (offset 1 line).
  194. patching file src/msgmle.h
  195. patching file src/mainwin_p.cpp
  196. patching file options/default.xml
  197. patching file options/macosx.xml
  198. patching file options/windows.xml
  199. patching file src/psioptions.cpp
  200. patching file src/psi_profiles.cpp
  201. patching file options/default.xml
  202. patching file src/options/opt_application.cpp
  203. patching file src/options/opt_application.ui
  204. patching file src/options/optionsdlg.cpp
  205. Hunk #2 succeeded at 277 (offset 6 lines).
  206. patching file src/options/options.pri
  207. patching file src/options/opt_roster.cpp
  208. patching file src/options/opt_roster.h
  209. patching file src/options/opt_roster.ui
  210. patching file options/default.xml
  211. patching file src/options/opt_appearance.cpp
  212. patching file src/options/opt_iconset_client.ui
  213. patching file src/options/opt_iconset.cpp
  214. patching file src/options/opt_iconset.h
  215. patching file src/options/options.pri
  216. patching file src/options/opt_roster.cpp
  217. patching file src/options/opt_roster.ui
  218. patching file src/psiiconset.cpp
  219. patching file src/psiiconset.h
  220. patching file src/userlist.cpp
  221. patching file src/userlist.h
  222. patching file src/contactlistgroupmenu.cpp
  223. patching file src/psicontactmenu.cpp
  224. patching file src/statusdlg.cpp
  225. patching file src/statusdlg.h
  226. patching file options/default.xml
  227. patching file src/mainwin.cpp
  228. patching file src/mainwin.h
  229. patching file src/options/opt_chat.cpp
  230. patching file src/options/opt_chat.ui
  231. patching file src/psicon.cpp
  232. patching file src/psicon.h
  233. patching file src/psitoolbar.cpp
  234. Hunk #1 succeeded at 55 (offset 1 line).
  235. Hunk #2 succeeded at 82 (offset 1 line).
  236. Hunk #3 succeeded at 123 (offset 10 lines).
  237. patching file src/psitoolbar.h
  238. patching file src/tabs/tabdlg.cpp
  239. patching file options/default.xml
  240. patching file src/options/opt_chat.cpp
  241. patching file src/options/opt_chat.ui
  242. patching file src/psicon.cpp
  243. patching file src/tabs/tabdlg.cpp
  244. patching file src/widgets/psitabwidget.cpp
  245. patching file qcm/plugins.qcm
  246. patching file psi.qc
  247. patching file src/chatdlg.ui
  248. patching file src/gcuserview.cpp
  249. patching file src/groupchatdlg.cpp
  250. Hunk #1 succeeded at 1678 (offset 3 lines).
  251. patching file src/psichatdlg.cpp
  252. patching file src/psicontactmenu.cpp
  253. patching file options/default.xml
  254. patching file src/chatdlg.ui
  255. patching file src/groupchatdlg.cpp
  256. Hunk #3 succeeded at 680 (offset 4 lines).
  257. Hunk #4 succeeded at 693 (offset 4 lines).
  258. Hunk #5 succeeded at 705 (offset 4 lines).
  259. Hunk #6 succeeded at 764 (offset 4 lines).
  260. Hunk #7 succeeded at 1793 (offset 3 lines).
  261. Hunk #8 succeeded at 1826 (offset 3 lines).
  262. patching file src/groupchatdlg.h
  263. patching file src/groupchatdlg.ui
  264. patching file src/psichatdlg.cpp
  265. patching file src/psichatdlg.h
  266. patching file src/sendbuttonmenu.cpp
  267. patching file src/sendbuttonmenu.h
  268. patching file src/sendbuttontemplateseditor.ui
  269. patching file src/src.pri
  270. patching file src/tabs/tabbablewidget.cpp
  271. patching file src/tabs/tabbablewidget.h
  272. patching file options/default.xml
  273. patching file src/mainwin.cpp
  274. patching file src/options/opt_application.cpp
  275. patching file src/options/opt_application.h
  276. patching file src/options/opt_application.ui
  277. patching file src/contactlistaccountmenu.cpp
  278. patching file src/contactview.cpp
  279. patching file src/options/opt_avcall.cpp
  280. patching file src/options/opt_plugins.cpp
  281. patching file src/options/opt_tree.cpp
  282. patching file src/psichatdlg.cpp
  283. patching file src/psicontactmenu.cpp
  284. patching file iris/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
  285. patching file src/discodlg.cpp
  286. patching file src/psiaccount.cpp
  287. Hunk #1 succeeded at 3285 (offset 6 lines).
  288. Hunk #2 succeeded at 3786 (offset 6 lines).
  289. patching file src/psiaccount.h
  290. patching file src/psiaccount.cpp
  291. patching file iris/src/xmpp/xmpp-im/xmpp_features.cpp
  292. patching file iris/src/xmpp/xmpp-im/xmpp_features.h
  293. patching file options/default.xml
  294. patching file src/chatview_te.cpp
  295. patching file themes/chatview/psi/classic/index.html
  296. patching file src/options/opt_appearance.cpp
  297. Hunk #1 succeeded at 250 (offset 2 lines).
  298. patching file src/options/opt_appearance.ui
  299. patching file src/bookmarkmanager.cpp
  300. patching file src/bookmarkmanager.h
  301. patching file src/groupchatdlg.cpp
  302. Hunk #4 succeeded at 689 (offset 4 lines).
  303. Hunk #5 succeeded at 904 (offset 4 lines).
  304. Hunk #6 succeeded at 1832 (offset 3 lines).
  305. Hunk #7 succeeded at 1891 (offset 3 lines).
  306. patching file src/groupchatdlg.h
  307. patching file src/groupchatdlg.ui
  308. patching file options/default.xml
  309. patching file src/textutil.cpp
  310. patching file src/psiaccount.cpp
  311. Hunk #4 succeeded at 5921 (offset 6 lines).
  312. Hunk #5 succeeded at 5929 (offset 6 lines).
  313. patching file src/rc.cpp
  314. patching file src/rc.h
  315. patching file options/default.xml
  316. patching file src/tabs/tabdlg.cpp
  317. patching file src/tabs/tabdlg.h
  318. patching file src/widgets/psitabbar.cpp
  319. patching file src/widgets/psitabbar.h
  320. patching file src/widgets/psitabwidget.cpp
  321. patching file src/widgets/psitabwidget.h
  322. patching file src/contactlistaccountmenu.cpp
  323. patching file src/groupchatdlg.cpp
  324. Hunk #1 succeeded at 2002 (offset 1 line).
  325. patching file options/default.xml
  326. patching file src/groupchatdlg.cpp
  327. Hunk #2 succeeded at 747 (offset 4 lines).
  328. Hunk #3 succeeded at 785 (offset 4 lines).
  329. Hunk #4 succeeded at 809 (offset 4 lines).
  330. Hunk #5 succeeded at 827 (offset 4 lines).
  331. Hunk #6 succeeded at 2008 (offset 3 lines).
  332. patching file src/groupchatdlg.h
  333. patching file src/AutoUpdater/AutoUpdater.pri
  334. patching file src/AutoUpdater/QDChangeLog.ui
  335. patching file src/AutoUpdater/QDChecker.cpp
  336. patching file src/AutoUpdater/QDChecker.h
  337. patching file src/psicon.cpp
  338. patching file src/src.pri
  339. patching file src/gcuserview.cpp
  340. patching file src/psiaccount.cpp
  341. Hunk #1 succeeded at 2410 (offset 6 lines).
  342. Hunk #2 succeeded at 2481 (offset 6 lines).
  343. Hunk #3 succeeded at 2997 (offset 6 lines).
  344. patching file options/default.xml
  345. patching file src/chatview_te.cpp
  346. patching file src/chatview_te.h
  347. patching file src/chatview_webkit.cpp
  348. patching file src/chatview_webkit.h
  349. patching file src/groupchatdlg.cpp
  350. Hunk #6 succeeded at 663 (offset 4 lines).
  351. Hunk #7 succeeded at 717 (offset 4 lines).
  352. Hunk #8 succeeded at 1128 (offset 4 lines).
  353. Hunk #9 succeeded at 1139 (offset 4 lines).
  354. Hunk #10 succeeded at 1153 (offset 4 lines).
  355. Hunk #11 succeeded at 1162 (offset 4 lines).
  356. Hunk #12 succeeded at 1752 (offset 3 lines).
  357. patching file src/groupchatdlg.h
  358. patching file src/groupchatdlg.ui
  359. patching file src/psichatdlg.cpp
  360. patching file src/psichatdlg.h
  361. patching file src/widgets/typeaheadfind.cpp
  362. patching file src/widgets/typeaheadfind.h
  363. patching file src/widgets/widgets.pri
  364. patching file src/mainwin.cpp
  365. patching file src/mainwin.h
  366. patching file src/psitrayicon.cpp
  367. patching file src/psitrayicon.h
  368. patching file options/default.xml
  369. patching file src/activity.cpp
  370. patching file src/activitydlg.cpp
  371. patching file src/activity.h
  372. patching file src/options/opt_appearance.cpp
  373. patching file src/options/opt_iconset_activity.ui
  374. patching file src/options/opt_iconset.cpp
  375. patching file src/options/opt_iconset.h
  376. patching file src/options/options.pri
  377. patching file src/options/opt_roster.cpp
  378. patching file src/options/opt_roster.ui
  379. patching file src/psiaccount.cpp
  380. Hunk #1 succeeded at 5582 (offset 6 lines).
  381. patching file src/psiaccount.h
  382. patching file src/psiiconset.cpp
  383. patching file src/psiiconset.h
  384. patching file src/userlist.cpp
  385. Hunk #1 succeeded at 863 (offset 2 lines).
  386. patching file src/mainwin.cpp
  387. patching file options/default.xml
  388. patching file src/contactlistaccountmenu.cpp
  389. patching file src/geolocation.cpp
  390. patching file src/geolocationdlg.cpp
  391. patching file src/geolocationdlg.h
  392. patching file src/geolocation.h
  393. patching file src/geolocation.ui
  394. patching file src/options/opt_roster.cpp
  395. patching file src/options/opt_roster.ui
  396. patching file src/physicallocation.cpp
  397. patching file src/physicallocation.h
  398. patching file src/psiaccount.cpp
  399. Hunk #3 succeeded at 2259 (offset 6 lines).
  400. Hunk #4 succeeded at 3454 (offset 6 lines).
  401. Hunk #5 succeeded at 3514 (offset 6 lines).
  402. Hunk #6 succeeded at 3522 (offset 6 lines).
  403. Hunk #7 succeeded at 3846 (offset 6 lines).
  404. Hunk #8 succeeded at 5593 (offset 6 lines).
  405. patching file src/psiaccount.h
  406. patching file src/psicon.cpp
  407. patching file src/src.pri
  408. patching file src/userlist.cpp
  409. Hunk #3 succeeded at 708 (offset 2 lines).
  410. Hunk #4 succeeded at 716 (offset 2 lines).
  411. Hunk #5 succeeded at 891 (offset 2 lines).
  412. Hunk #6 succeeded at 981 (offset 2 lines).
  413. patching file src/userlist.h
  414. patching file src/options/opt_iconset.cpp
  415. patching file src/psiiconset.cpp
  416. patching file src/contactlistaccountmenu.cpp
  417. patching file options/default.xml
  418. patching file src/contactlistmodel.cpp
  419. patching file src/contactlistmodel.h
  420. patching file src/contactlistviewdelegate.cpp
  421. patching file src/psicontactlistviewdelegate.cpp
  422. patching file src/psicontactlistviewdelegate.h
  423. patching file src/contactlistaccountmenu.cpp
  424. patching file src/contactmanager/contactmanager.pri
  425. patching file src/contactmanager/contactmanagerdlg.cpp
  426. patching file src/contactmanager/contactmanagerdlg.h
  427. patching file src/contactmanager/contactmanagerdlg.ui
  428. patching file src/contactmanager/contactmanagermodel.cpp
  429. patching file src/contactmanager/contactmanagermodel.h
  430. patching file src/contactmanager/contactmanagerview.cpp
  431. patching file src/contactmanager/contactmanagerview.h
  432. patching file src/src.pri
  433. patching file src/avcall/avcall.cpp
  434. patching file options/default.xml
  435. patching file src/widgets/psitiplabel.cpp
  436. patching file src/widgets/psitiplabel.h
  437. patching file src/mainwin.cpp
  438. patching file src/mainwin.h
  439. patching file options/default.xml
  440. patching file src/contactlistitemmenu.cpp
  441. patching file src/gcuserview.cpp
  442. patching file src/groupchatdlg.cpp
  443. Hunk #1 succeeded at 1706 (offset 3 lines).
  444. patching file src/mainwin.cpp
  445. patching file src/psichatdlg.cpp
  446. patching file src/psicon.cpp
  447. patching file src/tabs/tabdlg.cpp
  448. patching file src/widgets/fancypopup.cpp
  449. patching file src/widgets/iconaction.cpp
  450. patching file src/widgets/psitabwidget.cpp
  451. patching file src/widgets/psitabwidget.h
  452. patching file src/widgets/psitiplabel.cpp
  453. patching file src/widgets/urlobject.cpp
  454. patching file options/default.xml
  455. patching file src/mainwin.cpp
  456. patching file src/mainwin.h
  457. patching file src/psiactionlist.cpp
  458. patching file src/psirosterwidget.cpp
  459. patching file options/default.xml
  460. patching file src/chatdlg.cpp
  461. Hunk #2 succeeded at 197 (offset -9 lines).
  462. patching file src/chatdlg.h
  463. patching file src/contactlistgroup.h
  464. patching file src/contactlistgroupmenu.cpp
  465. patching file src/contactlistmodel.cpp
  466. patching file src/contactlistmodel.h
  467. patching file src/contactlistnestedgroup.cpp
  468. Hunk #1 succeeded at 312 (offset 14 lines).
  469. patching file src/contactlistspecialgroup.cpp
  470. patching file src/eventdlg.cpp
  471. patching file src/groupchatdlg.cpp
  472. Hunk #4 succeeded at 742 (offset 4 lines).
  473. Hunk #5 succeeded at 874 (offset 4 lines).
  474. Hunk #6 succeeded at 893 (offset 4 lines).
  475. Hunk #7 succeeded at 910 (offset 4 lines).
  476. Hunk #8 succeeded at 1331 (offset 4 lines).
  477. Hunk #9 succeeded at 1618 (offset 3 lines).
  478. Hunk #10 succeeded at 1690 (offset 3 lines).
  479. patching file src/historydlg.cpp
  480. Hunk #1 succeeded at 234 (offset 9 lines).
  481. patching file src/mucjoindlg.cpp
  482. Hunk #1 succeeded at 159 (offset -2 lines).
  483. Hunk #2 succeeded at 200 (offset -2 lines).
  484. patching file src/psiaccount.cpp
  485. Hunk #2 succeeded at 3874 (offset 6 lines).
  486. Hunk #3 succeeded at 4846 (offset 6 lines).
  487. Hunk #4 succeeded at 5034 (offset 6 lines).
  488. Hunk #5 succeeded at 5050 (offset 6 lines).
  489. Hunk #6 succeeded at 5079 (offset 6 lines).
  490. Hunk #7 succeeded at 5185 (offset 6 lines).
  491. Hunk #8 succeeded at 5381 (offset 6 lines).
  492. Hunk #9 succeeded at 5405 (offset 6 lines).
  493. Hunk #10 succeeded at 5444 (offset 6 lines).
  494. patching file src/psiaccount.h
  495. patching file src/psicontact.cpp
  496. patching file src/psicontact.h
  497. patching file src/psicontactlistviewdelegate.cpp
  498. patching file src/psicontactmenu.cpp
  499. patching file src/tabs/tabbablewidget.cpp
  500. patching file src/tabs/tabbablewidget.h
  501. patching file src/tabs/tabdlg.cpp
  502. patching file src/tabs/tabdlg.h
  503. patching file src/userlist.cpp
  504. Hunk #2 succeeded at 742 (offset 2 lines).
  505. Hunk #3 succeeded at 884 (offset 2 lines).
  506. Hunk #4 succeeded at 988 (offset 2 lines).
  507. patching file src/userlist.h
  508. patching file src/avcall/jinglertp.cpp
  509. patching file src/contactlistgroupmenu.cpp
  510. patching file src/gcuserview.cpp
  511. patching file src/chatdlg.ui
  512. patching file src/psichatdlg.cpp
  513. patching file src/contactlistaccountmenu.cpp
  514. patching file options/default.xml
  515. patching file src/activitydlg.cpp
  516. patching file src/activitydlg.h
  517. patching file src/geolocationdlg.cpp
  518. patching file src/geolocationdlg.h
  519. patching file src/mainwin.cpp
  520. patching file src/mainwin.h
  521. patching file src/mooddlg.cpp
  522. patching file src/mooddlg.h
  523. patching file src/psiaccount.cpp
  524. Hunk #1 succeeded at 3837 (offset 6 lines).
  525. patching file src/psiactionlist.cpp
  526. patching file options/default.xml
  527. patching file src/mainwin.cpp
  528. patching file src/mainwin.h
  529. patching file src/options/opt_roster.cpp
  530. patching file src/options/opt_roster.ui
  531. patching file src/psicon.cpp
  532. patching file src/psicon.h
  533. patching file src/rosteravatarframe.cpp
  534. patching file src/rosteravatarframe.h
  535. patching file src/rosteravatarframe.ui
  536. patching file src/src.pri
  537. patching file src/dbus.cpp
  538. patching file options/default.xml
  539. patching file src/mainwin.cpp
  540. patching file src/mainwin.h
  541. patching file src/options/opt_roster.cpp
  542. patching file src/options/opt_roster.ui
  543. patching file psi.desktop
  544. patching file src/src.pro
  545. patching file iris/src/xmpp/xmpp-im/types.cpp
  546. patching file iris/src/xmpp/xmpp-im/xmpp_status.h
  547. patching file options/default.xml
  548. patching file src/accountmodifydlg.cpp
  549. Hunk #1 succeeded at 84 (offset -2 lines).
  550. Hunk #2 succeeded at 120 (offset -2 lines).
  551. Hunk #3 succeeded at 145 (offset -2 lines).
  552. Hunk #4 succeeded at 154 (offset -2 lines).
  553. Hunk #5 succeeded at 258 (offset -2 lines).
  554. Hunk #6 succeeded at 318 (offset -2 lines).
  555. Hunk #7 succeeded at 333 (offset -2 lines).
  556. Hunk #8 succeeded at 521 (offset -2 lines).
  557. Hunk #9 succeeded at 533 (offset -2 lines).
  558. Hunk #10 succeeded at 661 (offset -2 lines).
  559. patching file src/accountmodifydlg.h
  560. patching file src/accountmodify.ui
  561. patching file src/accountstatusmenu.cpp
  562. patching file src/accountstatusmenu.h
  563. patching file src/chatdlg.cpp
  564. Hunk #1 succeeded at 383 (offset -9 lines).
  565. Hunk #2 succeeded at 401 (offset -9 lines).
  566. Hunk #3 succeeded at 411 (offset -9 lines).
  567. Hunk #4 succeeded at 449 (offset -9 lines).
  568. Hunk #5 succeeded at 469 (offset -9 lines).
  569. patching file src/chatdlg.h
  570. patching file src/chatview_te.cpp
  571. patching file src/common.cpp
  572. patching file src/common.h
  573. patching file src/contactlistaccountmenu.cpp
  574. patching file src/contactlistgroupmenu.cpp
  575. patching file src/globalstatusmenu.cpp
  576. patching file src/globalstatusmenu.h
  577. patching file src/groupchatdlg.cpp
  578. Hunk #1 succeeded at 1362 (offset 4 lines).
  579. Hunk #2 succeeded at 1382 (offset 4 lines).
  580. Hunk #3 succeeded at 1415 (offset 4 lines).
  581. patching file src/libpsi/tools/priorityvalidator.cpp
  582. patching file src/libpsi/tools/priorityvalidator.h
  583. patching file src/libpsi/tools/tools.pri
  584. patching file src/mainwin.cpp
  585. patching file src/mainwin.h
  586. patching file src/mainwin_p.cpp
  587. patching file src/messageview.cpp
  588. patching file src/messageview.h
  589. patching file src/options/optionsdlg.cpp
  590. Hunk #1 succeeded at 182 (offset 6 lines).
  591. Hunk #2 succeeded at 432 (offset 6 lines).
  592. patching file src/options/options.pri
  593. patching file src/options/optionstab.cpp
  594. patching file src/options/optionstab.h
  595. patching file src/options/opt_statusauto.cpp
  596. patching file src/options/opt_statusauto.h
  597. patching file src/options/opt_statusauto.ui
  598. patching file src/options/opt_status.cpp
  599. patching file src/options/opt_statusgeneral.cpp
  600. patching file src/options/opt_statusgeneral.h
  601. patching file src/options/opt_statusgeneral.ui
  602. patching file src/options/opt_status.h
  603. patching file src/options/opt_status.ui
  604. patching file src/profiles.h
  605. patching file src/psiaccount.cpp
  606. Hunk #5 succeeded at 1576 (offset 6 lines).
  607. Hunk #6 succeeded at 1741 (offset 6 lines).
  608. Hunk #7 succeeded at 2850 (offset 6 lines).
  609. Hunk #8 succeeded at 2858 (offset 6 lines).
  610. Hunk #9 succeeded at 2935 (offset 6 lines).
  611. Hunk #10 succeeded at 3746 (offset 6 lines).
  612. Hunk #11 succeeded at 5547 (offset 6 lines).
  613. patching file src/psiaccount.h
  614. patching file src/psiactionlist.cpp
  615. patching file src/psicon.cpp
  616. patching file src/psicon.h
  617. patching file src/psicontactmenu.cpp
  618. patching file src/psiiconset.cpp
  619. patching file src/psiiconset.h
  620. patching file src/psi_profiles.cpp
  621. patching file src/src.pri
  622. patching file src/statuscombobox.cpp
  623. patching file src/statusdlg.cpp
  624. patching file src/statusdlg.h
  625. patching file src/statusmenu.cpp
  626. patching file src/statusmenu.h
  627. patching file src/statuspreset.cpp
  628. patching file src/statuspreset.h
  629. patching file src/tools/optionstree/optionstree.cpp
  630. patching file src/tools/optionstree/optionstree.h
  631. patching file src/widgets/iconaction.cpp
  632. patching file src/widgets/iconaction.h
  633. patching file options/default.xml
  634. patching file src/mainwin.cpp
  635. patching file src/mainwin.h
  636. patching file src/src.pri
  637. patching file src/x11windowsystem.cpp
  638. patching file src/x11windowsystem.h
  639. patching file src/discodlg.cpp
  640. patching file src/groupchatdlg.cpp
  641. patching file src/options/optionsdlg.cpp
  642. patching file src/psichatdlg.cpp
  643. patching file src/psicontactlistviewdelegate.cpp
  644. patching file src/psicontactlistviewdelegate.h
  645. patching file src/psiiconset.cpp
  646. patching file src/psiiconset.h
  647. patching file src/psitoolbar.cpp
  648. patching file src/tools/iconset/iconset.cpp
  649. patching file src/tools/iconset/iconset.h
  650. patching file src/options/opt_application.cpp
  651. patching file src/options/opt_application.ui
  652. patching file src/userlist.cpp
  653. Hunk #2 succeeded at 865 (offset 2 lines).
  654. Hunk #3 succeeded at 920 (offset 2 lines).
  655. Hunk #4 succeeded at 929 (offset 2 lines).
  656. Hunk #5 succeeded at 939 (offset 2 lines).
  657. Hunk #6 succeeded at 949 (offset 2 lines).
  658. Hunk #7 succeeded at 974 (offset 2 lines).
  659. Hunk #8 succeeded at 1005 (offset 2 lines).
  660. Hunk #9 succeeded at 1063 (offset 2 lines).
  661. Hunk #10 succeeded at 1096 (offset 2 lines).
  662. patching file options/default.xml
  663. patching file src/groupchatdlg.cpp
  664. Hunk #2 succeeded at 699 (offset 4 lines).
  665. Hunk #3 succeeded at 841 (offset 4 lines).
  666. Hunk #4 succeeded at 888 (offset 4 lines).
  667. patching file src/groupchatdlg.h
  668. patching file src/psichatdlg.cpp
  669. patching file src/psichatdlg.h
  670. patching file src/chatdlg.cpp
  671. Hunk #1 succeeded at 681 (offset -9 lines).
  672. patching file src/groupchatdlg.cpp
  673. Hunk #2 succeeded at 680 (offset 4 lines).
  674. Hunk #3 succeeded at 729 (offset 4 lines).
  675. Hunk #4 succeeded at 1079 (offset 4 lines).
  676. Hunk #5 succeeded at 1764 (offset 3 lines).
  677. patching file src/htmltextcontroller.cpp
  678. patching file src/htmltextcontroller.h
  679. patching file src/messageview.cpp
  680. patching file src/msgmle.cpp
  681. Hunk #1 succeeded at 38 (offset 1 line).
  682. Hunk #2 succeeded at 50 (offset 1 line).
  683. Hunk #3 succeeded at 73 (offset 1 line).
  684. Hunk #4 succeeded at 113 (offset 1 line).
  685. Hunk #5 succeeded at 367 (offset 1 line).
  686. patching file src/msgmle.h
  687. patching file src/psichatdlg.cpp
  688. patching file src/psichatdlg.h
  689. patching file src/src.pri
  690. patching file src/registrationdlg.cpp
  691. patching file src/searchdlg.cpp
  692. Hunk #3 succeeded at 186 (offset -2 lines).
  693. patching file src/search.ui
  694. patching file src/xdata_widget.cpp
  695. patching file src/miniclient.cpp
  696. patching file src/passdialog.cpp
  697. patching file src/passdialog.h
  698. patching file src/psiaccount.cpp
  699. Hunk #2 succeeded at 1971 (offset 6 lines).
  700. Hunk #3 succeeded at 2110 (offset 6 lines).
  701. Hunk #4 succeeded at 2130 (offset 6 lines).
  702. Hunk #5 succeeded at 2140 (offset 6 lines).
  703. Hunk #6 succeeded at 2189 (offset 6 lines).
  704. Hunk #7 succeeded at 2201 (offset 6 lines).
  705. Hunk #8 succeeded at 2903 (offset 6 lines).
  706. Hunk #9 succeeded at 2958 (offset 6 lines).
  707. patching file src/psiaccount.h
  708. patching file src/src.pri
  709. patching file src/mucjoindlg.cpp
  710. Hunk #2 succeeded at 65 (offset -2 lines).
  711. Hunk #3 succeeded at 73 (offset -2 lines).
  712. Hunk #4 succeeded at 117 (offset -2 lines).
  713. Hunk #5 succeeded at 147 (offset -2 lines).
  714. Hunk #6 succeeded at 227 (offset -2 lines).
  715. patching file src/mucjoindlg.h
  716. patching file src/mucjoin.ui
  717. patching file src/chatdlg.cpp
  718. Hunk #2 succeeded at 367 (offset -9 lines).
  719. Hunk #3 succeeded at 636 (offset -9 lines).
  720. patching file src/chatdlg.h
  721. patching file src/psiaccount.cpp
  722. Hunk #1 succeeded at 3601 (offset 6 lines).
  723. patching file src/psiaccount.h
  724. patching file src/psichatdlg.cpp
  725. patching file src/psichatdlg.h
  726. patching file options/default.xml
  727. patching file src/tabs/tabdlg.cpp
  728. patching file src/contactlistmodel.cpp
  729. patching file src/contactlistmodel.h
  730. patching file src/privacy/privacydlg.cpp
  731. Hunk #1 succeeded at 46 (offset -2 lines).
  732. Hunk #2 succeeded at 250 (offset -2 lines).
  733. patching file src/privacy/privacydlg.h
  734. patching file src/privacy/privacylist.cpp
  735. patching file src/privacy/privacylist.h
  736. patching file src/privacy/privacymanager.h
  737. patching file src/privacy/psiprivacymanager.cpp
  738. patching file src/privacy/psiprivacymanager.h
  739. patching file src/psiaccount.cpp
  740. patching file src/psicontact.cpp
  741. patching file src/psicontactlistviewdelegate.cpp
  742. patching file src/psicontactmenu.cpp
  743. patching file src/ahcexecutetask.cpp
  744. patching file src/ahcformdlg.cpp
  745. patching file options/default.xml
  746. patching file src/groupchatdlg.cpp
  747. Hunk #4 succeeded at 2119 (offset 3 lines).
  748. patching file src/groupchatdlg.h
  749. patching file src/mainwin.cpp
  750. patching file src/mainwin.h
  751. patching file src/options/opt_application.cpp
  752. patching file src/options/opt_application.ui
  753. patching file src/psichatdlg.cpp
  754. patching file src/psichatdlg.h
  755. patching file src/tabs/tabdlg.cpp
  756. patching file src/tabs/tabdlg.h
  757. patching file src/tools/advwidget/advwidget.h
  758. patching file src/widgets/psiwindowheader.cpp
  759. patching file src/widgets/psiwindowheader.h
  760. patching file src/widgets/psiwindowheader.ui
  761. patching file src/widgets/widgets.pri
  762. patching file options/default.xml
  763. patching file src/tabs/tabdlg.cpp
  764. patching file src/avcall/avcall.cpp
  765. patching file src/options/opt_avcall.cpp
  766. patching file src/options/opt_avcall.ui
  767. patching file src/chatview_te.cpp
  768. patching file src/chatview_te.h
  769. patching file src/groupchatdlg.cpp
  770. patching file src/msgmle.cpp
  771. patching file src/msgmle.h
  772. patching file src/psichatdlg.cpp
  773. patching file src/webview.cpp
  774. patching file src/webview.h
  775. patching file src/widgets/psitextview.cpp
  776. patching file src/widgets/psitextview.h
  777. patching file src/adduserdlg.cpp
  778. Hunk #1 succeeded at 327 (offset -2 lines).
  779. patching file src/xmlconsole.cpp
  780. patching file src/xmlconsole.ui
  781. patching file src/libpsi/tools/systemwatch/systemwatch_unix.cpp
  782. patching file src/libpsi/tools/systemwatch/systemwatch_unix.h
  783. patching file src/chatdlg.cpp
  784. Hunk #3 succeeded at 323 (offset -9 lines).
  785. Hunk #4 succeeded at 339 (offset -9 lines).
  786. Hunk #5 succeeded at 841 (offset -9 lines).
  787. patching file src/chatdlg.h
  788. patching file options/default.xml
  789. patching file src/chatsplitter.cpp
  790. patching file src/chatsplitter.h
  791. patching file src/groupchatdlg.cpp
  792. Hunk #2 succeeded at 789 (offset 4 lines).
  793. Hunk #3 succeeded at 807 (offset 4 lines).
  794. Hunk #4 succeeded at 862 (offset 4 lines).
  795. patching file src/groupchatdlg.h
  796. patching file src/psichatdlg.cpp
  797. patching file src/psichatdlg.h
  798. patching file src/tabs/tabbablewidget.h
  799. patching file src/tabs/tabdlg.cpp
  800. patching file src/tabs/tabdlg.h
  801. patching file src/accountmanagedlg.cpp
  802. Hunk #1 succeeded at 255 (offset -2 lines).
  803. Hunk #2 succeeded at 285 (offset -2 lines).
  804. Hunk #3 succeeded at 337 (offset -2 lines).
  805. Hunk #4 succeeded at 345 (offset -2 lines).
  806. patching file src/accountmanagedlg.h
  807. patching file src/accountmanage.ui
  808. patching file src/psicon.cpp
  809. patching file src/psicon.h
  810. patching file src/psicontactlist.cpp
  811. patching file src/psicontactlist.h
  812. patching file options/default.xml
  813. patching file src/mucjoindlg.cpp
  814. Hunk #1 succeeded at 46 (offset -2 lines).
  815. Hunk #2 succeeded at 176 (offset -2 lines).
  816. Hunk #3 succeeded at 248 (offset -2 lines).
  817. patching file src/mucjoindlg.h
  818. patching file src/psiaccount.cpp
  819. Hunk #2 succeeded at 2346 (offset 6 lines).
  820. Hunk #3 succeeded at 3388 (offset 6 lines).
  821. Hunk #4 succeeded at 3397 (offset 6 lines).
  822. Hunk #5 succeeded at 5534 (offset 6 lines).
  823. Hunk #6 succeeded at 5626 (offset 6 lines).
  824. patching file src/psiaccount.h
  825. patching file src/tabs/tabbablewidget.cpp
  826. patching file options/default.xml
  827. patching file src/msgmle.cpp
  828. Hunk #1 succeeded at 41 (offset 1 line).
  829. Hunk #2 succeeded at 172 (offset 1 line).
  830. Hunk #3 succeeded at 189 (offset 1 line).
  831. Hunk #4 succeeded at 197 (offset 1 line).
  832. Hunk #5 succeeded at 229 (offset 1 line).
  833. Hunk #6 succeeded at 241 (offset 1 line).
  834. Hunk #7 succeeded at 431 (offset 1 line).
  835. Hunk #8 succeeded at 642 (offset 1 line).
  836. patching file src/msgmle.h
  837. patching file options/default.xml
  838. patching file src/chatdlg.cpp
  839. Hunk #1 succeeded at 481 (offset -9 lines).
  840. patching file src/applicationinfo.cpp
  841. patching file src/applicationinfo.h
  842. patching file src/options/opt_application.cpp
  843. patching file src/options/opt_application.ui
  844. patching file options/default.xml
  845. patching file src/options/options.pri
  846. patching file src/options/opt_status.cpp
  847. patching file src/options/opt_statuspep.cpp
  848. patching file src/options/opt_statuspep.h
  849. patching file src/options/opt_statuspep.ui
  850. patching file src/src.pri
  851. patching file src/tools/tunecontroller/aimptunecontroller.cpp
  852. patching file src/tools/tunecontroller/aimptunecontroller.h
  853. patching file src/tools/tunecontroller/itunestunecontroller.cpp
  854. patching file src/tools/tunecontroller/itunestunecontroller.h
  855. patching file src/tools/tunecontroller/plugins/aimp/aimpplugin.cpp
  856. patching file src/tools/tunecontroller/plugins/aimp/third-party/apiRemote.h
  857. patching file src/tools/tunecontroller/plugins/itunes/itunescontroller.cpp
  858. patching file src/tools/tunecontroller/plugins/itunes/itunescontroller.h
  859. patching file src/tools/tunecontroller/plugins/itunes/itunesplugin.cpp
  860. patching file src/tools/tunecontroller/plugins/winamp/winampcontroller.cpp
  861. patching file src/tools/tunecontroller/plugins/winamp/winampcontroller.h
  862. patching file src/tools/tunecontroller/plugins/winamp/winampplugin.cpp
  863. patching file src/tools/tunecontroller/plugins/winamp/winampplugin.h
  864. patching file src/tools/tunecontroller/tunecontrollermanager.cpp
  865. patching file src/tools/tunecontroller/tunecontroller.pri
  866. patching file src/tools/tunecontroller/winamptunecontroller.cpp
  867. patching file src/tools/tunecontroller/winamptunecontroller.h
  868. patching file src/widgets/psitooltip.cpp
  869. patching file src/psioptions.cpp
  870. patching file src/psioptions.h
  871. patching file src/psioptionseditor.cpp
  872. patching file src/psioptionseditor.h
  873. patching file src/activity.cpp
  874. patching file src/activity.h
  875. patching file src/activitycatalog.cpp
  876. patching file src/activitydlg.cpp
  877. patching file src/avatars.cpp
  878. patching file src/avatars.h
  879. patching file src/geolocation.cpp
  880. patching file src/geolocation.h
  881. patching file src/geolocationdlg.cpp
  882. patching file src/mood.cpp
  883. patching file src/mood.h
  884. patching file src/moodcatalog.cpp
  885. patching file src/mooddlg.cpp
  886. patching file src/pepmanager.cpp
  887. patching file src/pepmanager.h
  888. patching file src/groupchatdlg.cpp
  889. Hunk #2 succeeded at 699 (offset 4 lines).
  890. Hunk #3 succeeded at 746 (offset 4 lines).
  891. Hunk #4 succeeded at 1967 (offset 3 lines).
  892. patching file options/default.xml
  893. patching file src/chatview_te.cpp
  894. patching file src/contactlistmodel.cpp
  895. patching file src/contactlistmodel.h
  896. patching file src/psicontactlistviewdelegate.cpp
  897. patching file src/userlist.cpp
  898. Hunk #1 succeeded at 1122 (offset 2 lines).
  899. patching file src/userlist.h
  900. patching file src/passphrasedlg.cpp
  901. patching file src/passphrasedlg.h
  902. patching file src/passphrase.ui
  903. patching file src/pgputil.cpp
  904. patching file src/pgputil.h
  905. patching file src/profiles.h
  906. patching file src/psiaccount.cpp
  907. Hunk #2 succeeded at 5824 (offset 6 lines).
  908. Hunk #3 succeeded at 5864 (offset 6 lines).
  909. patching file src/psiaccount.h
  910. patching file src/psi_profiles.cpp
  911. patching file src/mucreasonseditor.cpp
  912. patching file src/mucreasonseditor.h
  913. patching file src/mucreasonseditor.ui
  914. patching file options/default.xml
  915. patching file src/chatdlg.cpp
  916. Hunk #2 succeeded at 397 (offset -9 lines).
  917. Hunk #3 succeeded at 456 (offset -9 lines).
  918. Hunk #4 succeeded at 507 (offset -9 lines).
  919. patching file src/chatdlg.h
  920. patching file src/chatdlg.ui
  921. patching file src/psiaccount.cpp
  922. Hunk #1 succeeded at 2726 (offset 6 lines).
  923. Hunk #2 succeeded at 2760 (offset 6 lines).
  924. Hunk #3 succeeded at 3221 (offset 6 lines).
  925. Hunk #4 succeeded at 3762 (offset 6 lines).
  926. Hunk #5 succeeded at 3781 (offset 6 lines).
  927. Hunk #6 succeeded at 4960 (offset 6 lines).
  928. Hunk #7 succeeded at 4974 (offset 6 lines).
  929. Hunk #8 succeeded at 4992 (offset 6 lines).
  930. Hunk #9 succeeded at 5464 (offset 6 lines).
  931. patching file src/psiaccount.h
  932. patching file src/psichatdlg.cpp
  933. patching file src/psichatdlg.h
  934. patching file src/psicon.cpp
  935. patching file src/chatdlg.cpp
  936. Hunk #1 succeeded at 1122 (offset -9 lines).
  937. patching file src/groupchatdlg.cpp
  938. Hunk #1 succeeded at 1994 (offset 3 lines).
  939. patching file src/tabs/tabbablewidget.h
  940. patching file src/tabs/tabdlg.cpp
  941. patching file options/default.xml
  942. patching file src/avatars.cpp
  943. patching file src/avatars.h
  944. patching file src/contactlistmodel.cpp
  945. patching file src/gcuserview.cpp
  946. patching file src/gcuserview.h
  947. patching file src/groupchatdlg.cpp
  948. Hunk #2 succeeded at 818 (offset 4 lines).
  949. Hunk #3 succeeded at 1485 (offset 4 lines).
  950. Hunk #4 succeeded at 1581 (offset 4 lines).
  951. Hunk #5 succeeded at 1861 (offset 3 lines).
  952. patching file src/groupchatdlg.h
  953. patching file src/options/opt_appearance.cpp
  954. patching file src/options/opt_iconset_affiliation.ui
  955. patching file src/options/opt_iconset.cpp
  956. patching file src/options/opt_iconset.h
  957. patching file src/options/options.pri
  958. patching file src/psiaccount.cpp
  959. Hunk #1 succeeded at 6219 (offset 6 lines).
  960. patching file src/psichatdlg.cpp
  961. patching file src/psicontactlistviewdelegate.cpp
  962. patching file src/psiiconset.cpp
  963. patching file src/psiiconset.h
  964. patching file src/userlist.cpp
  965. Hunk #1 succeeded at 879 (offset 2 lines).
  966. patching file src/avatars.cpp
  967. patching file src/contactlistgroup.cpp
  968. patching file src/contactlistproxymodel.cpp
  969. patching file src/profiles.h
  970. patching file src/psiaccount.cpp
  971. Hunk #3 succeeded at 1378 (offset 6 lines).
  972. patching file src/psiaccount.h
  973. patching file src/psicontact.cpp
  974. patching file src/psicontact.h
  975. patching file src/psicontactmenu.cpp
  976. patching file src/psi_profiles.cpp
  977. patching file src/contactlistgroup.cpp
  978. patching file src/contactlistgroup.h
  979. patching file src/contactlistgroupmenu.cpp
  980. patching file src/contactlistgroupstate.cpp
  981. patching file src/contactlistgroupstate.h
  982. patching file src/contactlistproxymodel.cpp
  983. patching file src/aboutdlg.cpp
  984. patching file src/accountmanagedlg.cpp
  985. patching file src/activitydlg.cpp
  986. patching file src/avcall/calldlg.cpp
  987. patching file src/bookmarkmanagedlg.cpp
  988. patching file src/contactmanager/contactmanagerdlg.cpp
  989. patching file src/geolocationdlg.cpp
  990. patching file src/groupchatdlg.cpp
  991. patching file src/mooddlg.cpp
  992. patching file src/mucjoindlg.cpp
  993. patching file src/options/optionsdlg.cpp
  994. patching file src/privacy/privacydlg.cpp
  995. patching file src/profiledlg.cpp
  996. patching file src/psioptionseditor.cpp
  997. patching file src/statusdlg.cpp
  998. patching file src/tipdlg.cpp
  999. patching file src/xmlconsole.cpp
  1000. patching file src/tools/optionstree/optionstreemodel.cpp
  1001. patching file options/default.xml
  1002. patching file src/chatdlg.cpp
  1003. Hunk #1 succeeded at 636 (offset -9 lines).
  1004. patching file src/groupchatdlg.cpp
  1005. Hunk #1 succeeded at 1805 (offset 3 lines).
  1006. patching file src/tabs/tabdlg.cpp
  1007. patching file src/groupchatdlg.cpp
  1008. Hunk #3 succeeded at 734 (offset 4 lines).
  1009. Hunk #4 succeeded at 2127 (offset 3 lines).
  1010. patching file src/groupchatdlg.h
  1011. patching file src/infodlg.cpp
  1012. Hunk #1 succeeded at 159 (offset -2 lines).
  1013. patching file src/psichatdlg.cpp
  1014. patching file src/psichatdlg.h
  1015. patching file src/groupchatdlg.cpp
  1016. Hunk #1 succeeded at 1466 (offset 4 lines).
  1017. Hunk #2 succeeded at 1474 (offset 4 lines).
  1018. Hunk #3 succeeded at 1933 (offset 3 lines).
  1019. Hunk #4 succeeded at 1999 (offset 3 lines).
  1020. patching file src/mucreasonseditor.cpp
  1021. patching file src/mucreasonseditor.h
  1022. patching file src/discodlg.cpp
  1023. patching file src/disco.ui
  1024. patching file src/mucjoindlg.cpp
  1025. patching file src/mucjoindlg.h
  1026. patching file src/bookmarkmanagedlg.cpp
  1027. Hunk #2 succeeded at 48 (offset -2 lines).
  1028. Hunk #3 succeeded at 227 (offset -2 lines).
  1029. patching file src/bookmarkmanagedlg.h
  1030. patching file src/bookmarkmanage.ui
  1031. patching file src/groupchatdlg.cpp
  1032. patching file src/discodlg.cpp
  1033. patching file src/psiaccount.cpp
  1034. Hunk #1 succeeded at 3428 (offset 6 lines).
  1035. Hunk #2 succeeded at 4467 (offset 6 lines).
  1036. Hunk #3 succeeded at 4852 (offset 6 lines).
  1037. patching file src/psiaccount.h
  1038. patching file options/default.xml
  1039. patching file src/psiaccount.cpp
  1040. patching file src/psicon.cpp
  1041. patching file src/psicon.h
  1042. patching file src/mucaffiliationsmodel.cpp
  1043. patching file src/mucaffiliationsview.cpp
  1044. patching file src/chatdlg.ui
  1045. patching file src/psichatdlg.cpp
  1046. patching file src/privacy/privacydlg.cpp
  1047. Hunk #1 succeeded at 57 (offset -2 lines).
  1048. Hunk #2 succeeded at 356 (offset -2 lines).
  1049. patching file src/privacy/privacydlg.h
  1050. patching file src/privacy/privacy.ui
  1051. patching file src/gcuserview.cpp
  1052. patching file src/groupchatdlg.cpp
  1053. Hunk #1 succeeded at 2037 (offset 3 lines).
  1054. patching file options/default.xml
  1055. patching file src/activecontactsmenu.cpp
  1056. patching file src/activecontactsmenu.h
  1057. patching file src/mainwin.cpp
  1058. patching file src/mainwin.h
  1059. patching file src/psiaccount.cpp
  1060. Hunk #1 succeeded at 3336 (offset 6 lines).
  1061. patching file src/psiaccount.h
  1062. patching file src/psiactionlist.cpp
  1063. patching file src/psichatdlg.cpp
  1064. patching file src/psichatdlg.h
  1065. patching file src/psicontact.cpp
  1066. patching file src/psicontact.h
  1067. patching file src/src.pri
  1068. patching file src/chatview_te.cpp
  1069. patching file src/chatview_te.h
  1070. patching file src/chatview_webkit.cpp
  1071. patching file src/chatview_webkit.h
  1072. patching file src/psichatdlg.cpp
  1073. patching file themes/chatview/psi/classic/index.html
  1074. patching file src/options/opt_groupchat.cpp
  1075. patching file src/options/opt_groupchat.h
  1076. patching file options/default.xml
  1077. patching file src/psichatdlg.cpp
  1078. patching file src/psichatdlg.h
  1079. patching file src/tabs/tabbablewidget.cpp
  1080. patching file src/tabs/tabbablewidget.h
  1081. patching file src/tabs/tabdlg.cpp
  1082. patching file src/groupchatdlg.cpp
  1083. Hunk #1 succeeded at 1732 (offset 4 lines).
  1084. patching file src/psidbusnotifier.cpp
  1085. patching file src/psigrowlnotifier.cpp
  1086. patching file src/psipopup.cpp
  1087. patching file src/accountstatusmenu.cpp
  1088. patching file src/accountstatusmenu.h
  1089. patching file src/mainwin.cpp
  1090. patching file src/profiles.h
  1091. patching file src/psiaccount.cpp
  1092. Hunk #1 succeeded at 4096 (offset 6 lines).
  1093. patching file src/psiaccount.h
  1094. patching file src/psicon.cpp
  1095. patching file src/psi_profiles.cpp
  1096. patching file options/default.xml
  1097. patching file src/libpsi/tools/spellchecker/aspellchecker.cpp
  1098. patching file src/libpsi/tools/spellchecker/aspellchecker.h
  1099. patching file src/libpsi/tools/spellchecker/spellchecker.h
  1100. patching file src/psicon.cpp
  1101. patching file src/psiaccount.cpp
  1102. Hunk #1 succeeded at 4276 (offset 6 lines).
  1103. Hunk #2 succeeded at 4284 (offset 6 lines).
  1104. Hunk #3 succeeded at 4622 (offset 6 lines).
  1105. patching file src/libpsi/tools/spellchecker/spellhighlighter.cpp
  1106. patching file src/msgmle.cpp
  1107. Hunk #1 succeeded at 349 (offset 1 line).
  1108. patching file src/psiaccount.cpp
  1109. patching file src/psiaccount.cpp
  1110. Hunk #1 succeeded at 4690 (offset 6 lines).
  1111. patching file src/widgets/psirichtext.cpp
  1112. patching file src/psiaccount.cpp
  1113. Hunk #2 succeeded at 1564 (offset 6 lines).
  1114. Hunk #3 succeeded at 2766 (offset 6 lines).
  1115. Hunk #4 succeeded at 5196 (offset 6 lines).
  1116. patching file src/psiaccount.h
  1117. patching file src/psicon.cpp
  1118. patching file src/psievent.h
  1119. patching file src/sxe/sxemanager.cpp
  1120. patching file src/sxe/sxemanager.h
  1121. patching file src/whiteboarding/wbmanager.cpp
  1122. patching file src/whiteboarding/wbmanager.h
  1123. patching file src/userlist.cpp
  1124. Hunk #2 succeeded at 962 (offset 2 lines).
  1125. patching file src/contactlistnestedgroup.cpp
  1126. Hunk #1 succeeded at 69 (offset 14 lines).
  1127. Hunk #2 succeeded at 144 (offset 14 lines).
  1128. patching file src/accountmodifydlg.cpp
  1129. Hunk #2 succeeded at 152 (offset -2 lines).
  1130. Hunk #3 succeeded at 487 (offset -2 lines).
  1131. Hunk #4 succeeded at 569 (offset -2 lines).
  1132. patching file src/accountmodifydlg.h
  1133. patching file src/accountmodify.ui
  1134. patching file src/profiles.h
  1135. patching file src/psiaccount.cpp
  1136. patching file src/psi_profiles.cpp
  1137. patching file src/contactlistmodel.h
  1138. patching file src/psicontactlistmodel.cpp
  1139. patching file src/psicontactlistviewdelegate.cpp
  1140. patching file options/default.xml
  1141. patching file src/chatdlg.cpp
  1142. Hunk #1 succeeded at 924 (offset -9 lines).
  1143. patching file src/options/opt_chat.cpp
  1144. patching file src/options/opt_chat.ui
  1145. patching file options/default.xml
  1146. patching file src/groupchatdlg.cpp
  1147. Hunk #6 succeeded at 737 (offset 4 lines).
  1148. Hunk #7 succeeded at 798 (offset 4 lines).
  1149. Hunk #8 succeeded at 817 (offset 4 lines).
  1150. Hunk #9 succeeded at 858 (offset 4 lines).
  1151. Hunk #10 succeeded at 873 (offset 4 lines).
  1152. Hunk #11 succeeded at 886 (offset 4 lines).
  1153. Hunk #12 succeeded at 987 (offset 4 lines).
  1154. Hunk #13 succeeded at 1471 (offset 4 lines).
  1155. Hunk #14 succeeded at 1916 (offset 4 lines).
  1156. Hunk #15 succeeded at 1944 (offset 4 lines).
  1157. Hunk #16 succeeded at 1973 (offset 4 lines).
  1158. Hunk #17 succeeded at 2099 (offset 4 lines).
  1159. Hunk #18 succeeded at 2164 (offset 4 lines).
  1160. Hunk #19 succeeded at 2242 (offset 4 lines).
  1161. patching file src/groupchatdlg.h
  1162. patching file src/mainwin.cpp
  1163. patching file src/options/opt_lookfeel_toolbars.ui
  1164. patching file src/options/opt_toolbars.cpp
  1165. patching file src/psiactionlist.cpp
  1166. patching file src/psiactionlist.h
  1167. patching file src/psichatdlg.cpp
  1168. patching file src/psichatdlg.h
  1169. patching file src/psioptions.cpp
  1170. patching file src/psi_profiles.cpp
  1171. patching file src/widgets/iconaction.cpp
  1172. patching file src/mainwin.cpp
  1173. patching file src/mainwin.h
  1174. patching file src/options/opt_toolbars.cpp
  1175. patching file src/chatview_te.cpp
  1176. patching file src/chatview_te.h
  1177. patching file src/chatview_webkit.cpp
  1178. patching file src/chatview_webkit.h
  1179. patching file src/groupchatdlg.cpp
  1180. Hunk #2 succeeded at 887 (offset 4 lines).
  1181. patching file src/psichatdlg.cpp
  1182. patching file src/libpsi/tools/spellchecker/enchantchecker.cpp
  1183. patching file src/libpsi/tools/spellchecker/enchantchecker.h
  1184. patching file options/default.xml
  1185. patching file src/chatdlg.cpp
  1186. patching file src/groupchatdlg.cpp
  1187. patching file src/groupchatdlg.h
  1188. patching file src/psiaccount.cpp
  1189. patching file src/psiaccount.h
  1190. patching file src/psicon.cpp
  1191. patching file src/psievent.cpp
  1192. patching file src/psiiconset.cpp
  1193. patching file iris/src/xmpp/xmpp-im/client.cpp
  1194. Hunk #2 succeeded at 889 (offset 2 lines).
  1195. Hunk #3 succeeded at 1284 (offset 2 lines).
  1196. Hunk #4 succeeded at 1341 (offset 2 lines).
  1197. patching file iris/src/xmpp/xmpp-im/types.cpp
  1198. patching file iris/src/xmpp/xmpp-im/xmpp_client.h
  1199. patching file iris/src/xmpp/xmpp-im/xmpp_liveroster.h
  1200. patching file iris/src/xmpp/xmpp-im/xmpp_roster.h
  1201. patching file iris/src/xmpp/xmpp-im/xmpp_task.cpp
  1202. patching file iris/src/xmpp/xmpp-im/xmpp_task.h
  1203. patching file iris/src/xmpp/xmpp-im/xmpp_tasks.cpp
  1204. patching file iris/src/xmpp/xmpp-im/xmpp_tasks.h
  1205. patching file src/chatdlg.cpp
  1206. patching file src/groupchatdlg.cpp
  1207. patching file options/default.xml
  1208. patching file src/widgets/psitabbar.cpp
  1209. patching file src/widgets/psitabbar.h
  1210. patching file src/widgets/psitabwidget.cpp
  1211. patching file src/widgets/psitabwidget.h
  1212. patching file src/widgets/tabbar.cpp
  1213. patching file src/widgets/tabbar.h
  1214. patching file src/widgets/widgets.pri
  1215. patching file iris/src/xmpp/xmpp-im/client.cpp
  1216. Hunk #1 succeeded at 628 (offset 2 lines).
  1217. patching file iris/src/xmpp/xmpp-im/xmpp_client.h
  1218. patching file src/applicationinfo.cpp
  1219. patching file src/applicationinfo.h
  1220. patching file src/chatdlg.h
  1221. patching file src/contactlistaccountmenu.cpp
  1222. patching file src/groupchatdlg.cpp
  1223. Hunk #2 succeeded at 907 (offset 5 lines).
  1224. Hunk #3 succeeded at 1973 (offset 4 lines).
  1225. Hunk #4 succeeded at 2142 (offset 4 lines).
  1226. patching file src/options/options.pri
  1227. patching file src/options/opt_plugins.cpp
  1228. patching file src/options/opt_plugins.h
  1229. patching file src/options/opt_plugins.ui
  1230. patching file src/options/plugininfodialog.ui
  1231. patching file src/pluginhost.cpp
  1232. patching file src/pluginhost.h
  1233. patching file src/pluginmanager.cpp
  1234. patching file src/pluginmanager.h
  1235. patching file src/plugins/include/accountinfoaccessinghost.h
  1236. patching file src/plugins/include/accountinfoaccessor.h
  1237. patching file src/plugins/include/activetabaccessinghost.h
  1238. patching file src/plugins/include/activetabaccessor.h
  1239. patching file src/plugins/include/applicationinfoaccessinghost.h
  1240. patching file src/plugins/include/applicationinfoaccessor.h
  1241. patching file src/plugins/include/chattabaccessor.h
  1242. patching file src/plugins/include/contactinfoaccessinghost.h
  1243. patching file src/plugins/include/contactinfoaccessor.h
  1244. patching file src/plugins/include/contactstateaccessinghost.h
  1245. patching file src/plugins/include/contactstateaccessor.h
  1246. patching file src/plugins/include/eventcreatinghost.h
  1247. patching file src/plugins/include/eventcreator.h
  1248. patching file src/plugins/include/eventfilter.h
  1249. patching file src/plugins/include/gctoolbariconaccessor.h
  1250. patching file src/plugins/include/iconfactoryaccessinghost.h
  1251. patching file src/plugins/include/iconfactoryaccessor.h
  1252. patching file src/plugins/include/iqfilteringhost.h
  1253. patching file src/plugins/include/iqnamespacefilter.h
  1254. patching file src/plugins/include/menuaccessor.h
  1255. patching file src/plugins/include/optionaccessinghost.h
  1256. patching file src/plugins/include/optionaccessor.h
  1257. patching file src/plugins/include/plugininfoprovider.h
  1258. patching file src/plugins/include/popupaccessinghost.h
  1259. patching file src/plugins/include/popupaccessor.h
  1260. patching file src/plugins/include/psiaccountcontroller.h
  1261. patching file src/plugins/include/psiaccountcontrollinghost.h
  1262. patching file src/plugins/include/psiplugin.h
  1263. patching file src/plugins/include/shortcutaccessinghost.h
  1264. patching file src/plugins/include/shortcutaccessor.h
  1265. patching file src/plugins/include/soundaccessinghost.h
  1266. patching file src/plugins/include/soundaccessor.h
  1267. patching file src/plugins/include/stanzafilter.h
  1268. patching file src/plugins/include/stanzasendinghost.h
  1269. patching file src/plugins/include/toolbariconaccessor.h
  1270. patching file src/plugins/plugins.pri
  1271. patching file src/psiaccount.cpp
  1272. patching file src/psiaccount.h
  1273. patching file src/psiactionlist.cpp
  1274. patching file src/psichatdlg.cpp
  1275. patching file src/psicon.cpp
  1276. patching file src/psicontactmenu.cpp
  1277. patching file src/psievent.cpp
  1278. patching file src/psievent.h
  1279. patching file src/psioptions.cpp
  1280. patching file src/psi_profiles.cpp
  1281. patching file src/mainwin.cpp
  1282. patching file src/psiactionlist.cpp
  1283. patching file src/applicationinfo.cpp
  1284. patching file src/applicationinfo.h
  1285. patching file src/avcall/avcall.cpp
  1286. patching file src/pluginmanager.cpp
  1287. patching file src/aboutdlg.cpp
  1288. patching file src/about.ui
  1289. patching file certs/README
  1290. patching file psi.desktop
  1291. patching file qcm/conf.qcm
  1292. patching file src/applicationinfo.cpp
  1293. patching file src/homedirmigration.ui
  1294. patching file src/plugins/psiplugin.pri
  1295. patching file src/src.pro
  1296. ==> Beginne build()...
  1297. Project name: Psi
  1298. Profile: psi.pro
  1299. Deps: qt4* buildmodeapp* idn* qca* zlib* qjdns* x11* universal qdbus webkit growl whiteboarding xss aspell enchant spell* plugins conf* recursiveprl*
  1300.  
  1301. 'configure' written.
  1302. Configuring Psi ...
  1303. Verifying Qt 4 build environment ... ok
  1304. Checking for Qt >= 4.7.0 ... yes
  1305. Checking for LibIDN ... no
  1306.  
  1307. Error: need LibIDN!
  1308.  
  1309. ==> FEHLER: Ein Fehler geschah in build().
  1310. Breche ab ...
  1311. makepkg PKGBUILD 7,23s user 1,79s system 21% cpu 42,151 total
  1312. 2 florian@horus ~/scratch/psi-plus-git %
Advertisement
Add Comment
Please, Sign In to add comment