- fix moc parsing

- rel 12

diff --git a/akonadi.spec b/akonadi.spec
index 381bbefbcfd8bc895aed8d770dfa6066e1d7ab23..caa385681e08e8a446b5eb0ab5fa4b6698c7d7fc 100644 (file)
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -4,7 +4,7 @@ Summary:        Akonadi - The PIM Storage Service
 Summary(pl.UTF-8):     Akonadi - usługa przechowywania danych dla aplikacji PIM
 Name:          akonadi
 Version:       1.13.0
-Release:       11
+Release:       12
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       ftp://ftp.kde.org/pub/kde/stable/akonadi/src/%{name}-%{version}.tar.bz2
@@ -41,6 +41,7 @@ Patch27:      0027-Minor-improvements-in-StatisticsCache-as-suggested-b.patch
 Patch28:       0028-Extend-imapparser-benchmark-and-keep-static-data-aro.patch
 Patch29:       0029-Reduce-the-amount-of-allocations-by-preallocating-a-.patch
 Patch30:       0030-Preallocate-a-capacity-of-16-for-the-returned-list.patch
+Patch31:       moc.patch
 URL:           http://pim.kde.org/akonadi/
 BuildRequires: QtCore-devel >= %{qtver}
 BuildRequires: QtDBus-devel >= %{qtver}
@@ -138,6 +139,7 @@ Biblioteki Akonadi.
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 %build
 install -d build

diff --git a/moc.patch b/moc.patch
new file mode 100644 (file)
index 0000000..2c73db2
--- /dev/null
+++ b/moc.patch
@@ -0,0 +1,14 @@
+diff -ur akonadi-1.13.0/server/control/agentmanager.h akonadi-1.13.0.build/server/control/agentmanager.h
+--- akonadi-1.13.0/server/control/agentmanager.h       2014-08-10 12:38:58.000000000 +0200
++++ akonadi-1.13.0.build/server/control/agentmanager.h 2017-04-13 13:24:52.690247851 +0200
+@@ -25,8 +25,10 @@
+ #include <QtCore/QMap>
+ #include <QtCore/QStringList>
+ 
++#ifndef Q_MOC_RUN
+ #include "agenttype.h"
+ #include "agentinstance.h"
++#endif
+ 
+ class QDir;
+ #ifndef QT_NO_DEBUG