commit 605380e24fc0ff26929a945854b84fe22ffa0b10
Author: Jan Rękorajski <[email protected]>
Date: Sat Apr 22 14:32:08 2017 +0200
- fix moc parsing
- rel 18
kde4-calligra.spec | 4 +++-
moc.patch | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/kde4-calligra.spec b/kde4-calligra.spec
index a92bf65..fbe5244 100644
--- a/kde4-calligra.spec
+++ b/kde4-calligra.spec
@@ -27,11 +27,12 @@ Summary: Calligra - powerful office suite for KDE
Summary(pl.UTF-8): Calligra - potężny pakiet biurowy dla KDE
Name: kde4-calligra
Version: 2.8.7
-Release: 17
+Release: 18
License: GPL/LGPL
Group: X11/Applications
Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{orgname}-%{version}/%{orgname}-%{version}.tar.xz
# Source0-md5: 5ba4b76e3f81daffb28d3ed545908736
+Patch0: moc.patch
URL: http://www.calligra-suite.org/
BuildRequires: GraphicsMagick-devel
BuildRequires: OpenEXR-devel
@@ -346,6 +347,7 @@ finalną publikację.
%prep
%setup -q -n %{orgname}-%{version}
+%patch0 -p1
%build
install -d build
diff --git a/moc.patch b/moc.patch
new file mode 100644
index 0000000..5b42fde
--- /dev/null
+++ b/moc.patch
@@ -0,0 +1,40 @@
+diff -ur calligra-2.8.7/kexi/migration/mdb/src/keximdb/mdbmigrate.h
calligra-2.8.7-moc/kexi/migration/mdb/src/keximdb/mdbmigrate.h
+--- calligra-2.8.7/kexi/migration/mdb/src/keximdb/mdbmigrate.h 2014-11-30
15:02:18.000000000 +0100
++++ calligra-2.8.7-moc/kexi/migration/mdb/src/keximdb/mdbmigrate.h
2017-04-22 12:39:35.348672097 +0200
+@@ -21,7 +21,9 @@
+ #ifndef MDBMIGRATE_H
+ #define MDBMIGRATE_H
+
++#ifndef Q_MOC_RUN
+ #include <mdbtools.h>
++#endif
+
+ #include <migration/keximigrate.h>
+ #include <db/field.h>
+diff -ur
calligra-2.8.7/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
calligra-2.8.7-moc/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
+--- calligra-2.8.7/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
2014-11-30 15:02:18.000000000 +0100
++++
calligra-2.8.7-moc/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
2017-04-22 12:31:24.932008982 +0200
+@@ -21,7 +21,9 @@
+ #ifndef MAPBROWSERWIDGET_H
+ #define MAPBROWSERWIDGET_H
+
++#ifndef Q_MOC_RUN
+ #include <marble/MarbleWidget.h>
++#endif
+
+ #include "widgetfactory.h"
+ #include "container.h"
+diff -ur calligra-2.8.7/plugins/reporting/maps/KoReportItemMaps.h
calligra-2.8.7-moc/plugins/reporting/maps/KoReportItemMaps.h
+--- calligra-2.8.7/plugins/reporting/maps/KoReportItemMaps.h 2014-11-30
15:02:20.000000000 +0100
++++ calligra-2.8.7-moc/plugins/reporting/maps/KoReportItemMaps.h
2017-04-22 13:52:08.408640585 +0200
+@@ -29,7 +29,9 @@
+ #include <kdebug.h>
+ #include <klocalizedstring.h>
+ #include <kglobalsettings.h>
++#ifndef Q_MOC_RUN
+ #include <marble/MarbleWidget.h>
++#endif
+ #include <QMap>
+
+ class QImage;
+Only in calligra-2.8.7-moc/plugins/reporting/maps: KoReportItemMaps.h~
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-calligra.git/commitdiff/605380e24fc0ff26929a945854b84fe22ffa0b10
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
