- fix moc parsing

- rel 8

diff --git a/kde4-kdebase-runtime.spec b/kde4-kdebase-runtime.spec
index 0796ea4cfb081fef92c8747e9f6c97ec5abe7199..32f77e8fce4891e98c885a9001f2762c7fdc62b1 100644 (file)
--- a/kde4-kdebase-runtime.spec
+++ b/kde4-kdebase-runtime.spec
@@ -12,7 +12,7 @@ Summary:      KDE 4 base runtime components
 Summary(pl.UTF-8):     Komponenty uruchomieniowe podstawowej części KDE 4
 Name:          kde4-kdebase-runtime
 Version:       4.14.3
-Release:       7
+Release:       8
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
@@ -22,6 +22,7 @@ Source1:      kdebase-searchproviders.tar.bz2
 Source2:       l10n-iso639-1
 Patch100:      %{name}-branch.diff
 Patch0:                %{name}-rpc.patch
+Patch1:                moc.patch
 URL:           http://www.kde.org/
 BuildRequires: NetworkManager-devel >= 0.7.0
 BuildRequires: OpenEXR-devel
@@ -112,6 +113,7 @@ Wtyczki KDE 4 dla Phonona.
 %setup -q -n %{orgname}-%{version} -a1
 #%patch100 -p1
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build

diff --git a/moc.patch b/moc.patch
new file mode 100644 (file)
index 0000000..cf4cf7e
--- /dev/null
+++ b/moc.patch
@@ -0,0 +1,43 @@
+diff -ur kde-runtime-4.14.3/kwalletd/backend/kwalletbackend.h kde-runtime-4.14.3-moc/kwalletd/backend/kwalletbackend.h
+--- kde-runtime-4.14.3/kwalletd/backend/kwalletbackend.h       2014-10-30 23:50:20.000000000 +0000
++++ kde-runtime-4.14.3-moc/kwalletd/backend/kwalletbackend.h   2017-04-25 10:42:34.751952357 +0000
+@@ -30,9 +30,11 @@
+ #include "kwalletentry.h"
+ #include "backendpersisthandler.h"
+ 
++#ifndef Q_MOC_RUN
+ #ifdef HAVE_QGPGME
+ #include <gpgme++/key.h>
+ #endif // HAVE_QGPGME
++#endif
+ 
+ #define PBKDF2_SHA512_KEYSIZE 56
+ #define PBKDF2_SHA512_SALTSIZE 56
+diff -ur kde-runtime-4.14.3/kwalletd/knewwalletdialog.h kde-runtime-4.14.3-moc/kwalletd/knewwalletdialog.h
+--- kde-runtime-4.14.3/kwalletd/knewwalletdialog.h     2014-10-30 23:50:20.000000000 +0000
++++ kde-runtime-4.14.3-moc/kwalletd/knewwalletdialog.h 2017-04-25 10:40:54.701953082 +0000
+@@ -23,7 +23,9 @@
+ 
+ #include "ui_knewwalletdialogintro.h"
+ #include "ui_knewwalletdialoggpg.h"
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ 
+ namespace GpgME {
+ class Key;
+diff -ur kde-runtime-4.14.3/kwalletd/kwalletwizard.h kde-runtime-4.14.3-moc/kwalletd/kwalletwizard.h
+--- kde-runtime-4.14.3/kwalletd/kwalletwizard.h        2014-10-30 23:50:20.000000000 +0000
++++ kde-runtime-4.14.3-moc/kwalletd/kwalletwizard.h    2017-04-25 10:40:33.235286570 +0000
+@@ -20,9 +20,11 @@
+ #define KWALLETWIZARD_H
+ 
+ #include <QWizard>
++#ifndef Q_MOC_RUN
+ #ifdef HAVE_QGPGME
+ #include <gpgme++/key.h>
+ #endif
++#endif
+ 
+ class PageGpgKey;
+ class PagePassword;