[akonadi] hack around boost/automoc FTBFS

[Rex Dieter]

commit 42653564a50e52e99d5acd33761cb82016d0a80a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 10 15:20:59 2013 -0600

    hack around boost/automoc FTBFS

 akonadi-1.9.0-boost153.patch |   15 +++++++++++++++
 akonadi.spec                 |    5 +++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/akonadi-1.9.0-boost153.patch b/akonadi-1.9.0-boost153.patch
new file mode 100644
index 0000000..ee11748
--- /dev/null
+++ b/akonadi-1.9.0-boost153.patch
@@ -0,0 +1,15 @@
+diff -up akonadi-1.9.0/shared/akapplication.h.boost153 akonadi-1.9.0/shared/akapplication.h
+--- akonadi-1.9.0/shared/akapplication.h.boost153	2012-12-23 04:11:44.000000000 -0600
++++ akonadi-1.9.0/shared/akapplication.h	2013-02-10 15:19:42.115689459 -0600
+@@ -22,9 +22,11 @@
+ 
+ #include <QtCore/QObject>
+ 
++#ifndef Q_MOC_RUN
+ #ifndef _WIN32_WCE
+ #include <boost/program_options.hpp>
+ #endif
++#endif
+ 
+ class QCoreApplication;
+ class QApplication;
diff --git a/akonadi.spec b/akonadi.spec
index b02e9a3..64cf4c7 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -21,6 +21,10 @@ Source0: http://download.kde.org/stable/akonadi/src/akonadi-%{version}.tar.bz2
 ## mysql config
 Source10: akonadiserverrc.mysql
 
+## upstreamable patches
+# hack around boost/automoc FTBFS, see also https://bugreports.qt-project.org/browse/QTBUG-22829
+Patch50: akonadi-1.9.0-boost153.patch
+
 ## upstream patches
 Patch101: 0001-disable-the-cache-for-the-SQlite-backend.patch
 Patch102: 0002-Don-t-try-to-start-akonadiserver-if-mysqld-is-not-in.patch
@@ -79,6 +83,7 @@ See also: %{_sysconfdir}/akonadi/mysql-global.conf
 %prep
 %setup -q -n akonadi-%{version}
 
+%patch50 -p1 -b .boost153
 %patch101 -p1 -b .0001
 %patch102 -p1 -b .0002
 %patch103 -p1 -b .0003