- up to 2.9.11, the 3.x line supports only kde5

diff --git a/calligra-boost.patch b/calligra-boost.patch
index c0a69d621ce1364b46f65a1cfad7a83f005152c5..4f2b2e503723516f019cd6cb1a87dd43e08d45a4 100644 (file)
--- a/calligra-boost.patch
+++ b/calligra-boost.patch
@@ -6,6 +6,16 @@
  
 -#include <boost/config/posix_features.hpp>
 -
- #include <KoMainWindow.h>
- #include <KoFilterManager.h>
+ #include <KisMainWindow.h>
+ #include <KisImportExportManager.h>
  #include <KoFileDialog.h>
+--- calligra-2.9.11/gemini/desktopviewproxy.cpp~       2016-02-02 20:53:13.000000000 +0100
++++ calligra-2.9.11/gemini/desktopviewproxy.cpp        2019-10-04 11:33:00.482062671 +0200
+@@ -31,7 +31,6 @@
+ #include <krecentfilesaction.h>
+ #include <kactioncollection.h>
+ 
+-#include <boost/config/posix_features.hpp>
+ #include <KConfigGroup>
+ 
+ #include <KoMainWindow.h>

diff --git a/calligra-exiv2.patch b/calligra-exiv2.patch
index 04e4c486bd37417541ab62d8c6a29c2327c3a101..d7adeca987c9b0237f088613e451c825cfc16870 100644 (file)
--- a/calligra-exiv2.patch
+++ b/calligra-exiv2.patch
@@ -15,18 +15,6 @@ diff -ruNp calligra-2.8.7.orig/CMakeLists.txt calligra-2.8.7/CMakeLists.txt
  
  ##
  ## Test for soprano
-@@ -937,9 +937,9 @@
-     calligra_disable_product(SHEETS_PART "Eigen devel not found")
- endif(NOT EIGEN2_FOUND)
- 
--if(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
-+if(NOT EIGEN2_FOUND OR NOT exiv2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
-     calligra_disable_product(KRITA_APP "SharedMimeInfo|libeigen2|libexiv2|lcms devel not found ")
--endif(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
-+endif(NOT EIGEN2_FOUND OR NOT exiv2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
- 
- if(NOT APPLE AND NOT REQUIRED_Xinput_FOUND)
-     calligra_disable_product(KRITA_APP "Xinput devel not found ")
 --- calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp.orig       2014-11-30 15:01:15.000000000 +0100
 +++ calligra-2.8.7/krita/ui/kisexiv2/kis_xmp_io.cpp    2019-03-04 23:08:54.941391753 +0100
 @@ -17,7 +17,7 @@

diff --git a/kde4-calligra.spec b/kde4-calligra.spec
index 42c9137c69aeeaed50a1b6b855ddfade760c68f7..446ec7eaa6de5703a55a204fab276f4f907a7992 100644 (file)
--- a/kde4-calligra.spec
+++ b/kde4-calligra.spec
@@ -27,13 +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:       30
+Version:       2.9.11
+Release:       1
 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
+Source0:       https://download.kde.org/Attic/%{orgname}-%{version}/%{orgname}-%{version}.tar.xz
+# Source0-md5: a1a4935debae64724cd4c0d17d61ae4e
 Patch1:                %{orgname}-exiv2.patch
 Patch2:                %{orgname}-icu.patch
 Patch3:                %{orgname}-boost.patch
@@ -351,7 +350,6 @@ finalną publikację.
 
 %prep
 %setup -q -n %{orgname}-%{version}
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1

diff --git a/moc.patch b/moc.patch
deleted file mode 100644 (file)
index 5b42fde..0000000
--- a/moc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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~