[Kde-pim] Review Request 128264: Fix build w/ xapian-1.3

[Andreas Sturmlechner]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/128264/
-----------------------------------------------------------

(Updated June 21, 2016, 10:50 a.m.)


Status
------

This change has been marked as submitted.


Review request for KDEPIM, Laurent Montel and Vishesh Handa.


Changes
-------

Submitted with commit 298e1a828befab267065230686b354f58d1c381f by Andreas Sturmlechner to branch master.


Repository: akonadi-search


Description
-------

Caused by upstream change:
http://code.metager.de/source/xref/xapian/xapian-core/ChangeLog#3875

In file included from lib/indexeditems.cpp:28:0:
/usr/include/xapian-1.3/xapian/error.h:27:3: error:
 # error "Never use <xapian/error.h> directly; include <xapian.h> instead."

This change is backwards compatible with xapian-1.2


Diffs
-----

  agent/collectionindexer.cpp 7a8c9a57216d55a54da8a1ded7b6e02966a4b63e 
  agent/index.cpp b4227bd2d2c364437ed7232af23380e636c38148 
  lib/indexeditems.cpp 53dad193af1ef8183a20b4a24481bf4b0a4c6198 

Diff: https://git.reviewboard.kde.org/r/128264/diff/


Testing
-------


Thanks,

Andreas Sturmlechner

_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/