Calligra: bump version

app-office/calligra/patches/calligra-3.0.1.patchset

@@ -1,107 +0,0 @@
-From a9f3c1f7ddc3bb007a080f118490bf95c5f0eb68 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 11 Oct 2017 20:56:45 +1000
-Subject: Fix Haiku build
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13ac88f..34696fb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -303,6 +303,9 @@ endif()
- 
- set(HAVE_OPENGL ${Qt5OpenGL_FOUND})
- 
-+if(HAIKU)
-+    unset(Qt5DBus_FOUND)
-+endif()
- 
- if (GHNS)
-     find_package(Attica 3.0)
-diff --git a/filters/sheets/CMakeLists.txt b/filters/sheets/CMakeLists.txt
-index e84a1f3..90e708a 100644
---- a/filters/sheets/CMakeLists.txt
-+++ b/filters/sheets/CMakeLists.txt
-@@ -21,8 +21,9 @@ if(SHOULD_BUILD_FILTER_QUATTROPRO_TO_SHEETS)
- endif()
- 
- add_subdirectory( html )
-+if(NOT HAIKU)
- add_subdirectory( latex )
--
-+endif()
- add_subdirectory( excel )
- 
- if(SHOULD_BUILD_FILTER_XLSX_TO_ODS)
-diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
-index 52f2c12..89907b0 100644
---- a/libs/CMakeLists.txt
-+++ b/libs/CMakeLists.txt
-@@ -21,7 +21,7 @@ if (SHOULD_BUILD_LIB_KOMAIN)
-     add_subdirectory( main )
- endif ()
- 
--if (SHOULD_BUILD_FEATURE_SCRIPTING)
-+if (SHOULD_BUILD_FEATURE_SCRIPTING AND NOT HAIKU)
-     add_subdirectory( kross )
- endif ()
- 
-diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
-index 7bda1d3..20acbb0 100644
---- a/libs/main/KoDocument.cpp
-+++ b/libs/main/KoDocument.cpp
-@@ -57,7 +57,9 @@
- #include <MainDebug.h>
- #include <kconfiggroup.h>
- #include <kio/job.h>
-+#ifndef QT_NO_DBUS
- #include <kdirnotify.h>
-+#endif
- #include <KBackup>
- 
- #include <QMimeDatabase>
-@@ -416,8 +418,9 @@ public:
-         }
-         else
-         {
-+#ifndef QT_NO_DBUS
-             ::org::kde::KDirNotify::emitFilesAdded(QUrl::fromLocalFile(m_url.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()));
--
-+#endif
-             m_uploadJob = 0;
-             document->setModified( false );
-             emit document->completed();
-diff --git a/sheets/plugins/CMakeLists.txt b/sheets/plugins/CMakeLists.txt
-index b18b166..c576b92 100644
---- a/sheets/plugins/CMakeLists.txt
-+++ b/sheets/plugins/CMakeLists.txt
-@@ -1,5 +1,5 @@
- add_subdirectory( calendar )
- add_subdirectory( solver )
--if (SHOULD_BUILD_FEATURE_SCRIPTING)
-+if (SHOULD_BUILD_FEATURE_SCRIPTING AND NOT HAIKU)
-   add_subdirectory( scripting )
- endif ()
--- 
-2.15.0
-
-
-From 3b7289ae7fd0a75a3d19f577e7f70e02960ed5e1 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Mon, 20 Nov 2017 15:11:16 +1000
-Subject: Disable scripting for Plan
-
-
-diff --git a/plan/plugins/CMakeLists.txt b/plan/plugins/CMakeLists.txt
-index 883b3b0..e43bd7d 100644
---- a/plan/plugins/CMakeLists.txt
-+++ b/plan/plugins/CMakeLists.txt
-@@ -1,4 +1,4 @@
--if(SHOULD_BUILD_FEATURE_SCRIPTING)
-+if(SHOULD_BUILD_FEATURE_SCRIPTING AND NOT HAIKU)
-   add_subdirectory(scripting)
- endif()
- 
--- 
-2.15.0
-

app-office/calligra/patches/calligra-3.1.0.patchset

@@ -0,0 +1,345 @@
+From 96633406ef031a9ab0f4c3b745be693eb339b29b Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 11 Oct 2017 20:56:45 +1000
+Subject: Fix Haiku build
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 65d0cb1..a27044f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -324,6 +324,9 @@ endif()
+ 
+ set(HAVE_OPENGL ${Qt5OpenGL_FOUND})
+ 
++if(HAIKU)
++    unset(Qt5DBus_FOUND)
++endif()
+ 
+ if (GHNS)
+     find_package(Attica 3.0)
+diff --git a/filters/sheets/CMakeLists.txt b/filters/sheets/CMakeLists.txt
+index e84a1f3..90e708a 100644
+--- a/filters/sheets/CMakeLists.txt
++++ b/filters/sheets/CMakeLists.txt
+@@ -21,8 +21,9 @@ if(SHOULD_BUILD_FILTER_QUATTROPRO_TO_SHEETS)
+ endif()
+ 
+ add_subdirectory( html )
++if(NOT HAIKU)
+ add_subdirectory( latex )
+-
++endif()
+ add_subdirectory( excel )
+ 
+ if(SHOULD_BUILD_FILTER_XLSX_TO_ODS)
+diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
+index 52f2c12..89907b0 100644
+--- a/libs/CMakeLists.txt
++++ b/libs/CMakeLists.txt
+@@ -21,7 +21,7 @@ if (SHOULD_BUILD_LIB_KOMAIN)
+     add_subdirectory( main )
+ endif ()
+ 
+-if (SHOULD_BUILD_FEATURE_SCRIPTING)
++if (SHOULD_BUILD_FEATURE_SCRIPTING AND NOT HAIKU)
+     add_subdirectory( kross )
+ endif ()
+ 
+diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
+index 68a9b3d..a6cc484 100644
+--- a/libs/main/KoDocument.cpp
++++ b/libs/main/KoDocument.cpp
+@@ -57,7 +57,9 @@
+ #include <MainDebug.h>
+ #include <kconfiggroup.h>
+ #include <kio/job.h>
++#ifndef QT_NO_DBUS
+ #include <kdirnotify.h>
++#endif
+ #include <KBackup>
+ 
+ #include <QMimeDatabase>
+@@ -417,8 +419,9 @@ public:
+         }
+         else
+         {
++#ifndef QT_NO_DBUS
+             ::org::kde::KDirNotify::emitFilesAdded(QUrl::fromLocalFile(m_url.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()));
+-
++#endif
+             m_uploadJob = 0;
+             document->setModified( false );
+             emit document->completed();
+diff --git a/sheets/plugins/CMakeLists.txt b/sheets/plugins/CMakeLists.txt
+index b18b166..c576b92 100644
+--- a/sheets/plugins/CMakeLists.txt
++++ b/sheets/plugins/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ add_subdirectory( calendar )
+ add_subdirectory( solver )
+-if (SHOULD_BUILD_FEATURE_SCRIPTING)
++if (SHOULD_BUILD_FEATURE_SCRIPTING AND NOT HAIKU)
+   add_subdirectory( scripting )
+ endif ()
+-- 
+2.16.2
+
+
+From 5bccfdd83a76b02dbb30a413e79cc37dffc65892 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 20 Nov 2017 15:11:16 +1000
+Subject: Disable scripting for Plan
+
+
+diff --git a/plan/src/plugins/CMakeLists.txt b/plan/src/plugins/CMakeLists.txt
+index bb8a192..3b7ad36 100644
+--- a/plan/src/plugins/CMakeLists.txt
++++ b/plan/src/plugins/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if(SHOULD_BUILD_FEATURE_SCRIPTING)
++if(SHOULD_BUILD_FEATURE_SCRIPTING AND NOT HAIKU)
+ #   add_subdirectory(scripting)
+ endif()
+ 
+-- 
+2.16.2
+
+
+From c550bb67db39f26c47d9ecb5de2dad506f5f4e56 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 18 Apr 2018 19:46:33 +1000
+Subject: Disable DBUS
+
+
+diff --git a/libs/main/KoApplication.cpp b/libs/main/KoApplication.cpp
+index fae530f..c2e3e7b 100644
+--- a/libs/main/KoApplication.cpp
++++ b/libs/main/KoApplication.cpp
+@@ -23,6 +23,10 @@
+ 
+ #include "KoGlobal.h"
+ 
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ #ifndef QT_NO_DBUS
+ #include "KoApplicationAdaptor.h"
+ #include <QDBusConnection>
+diff --git a/libs/main/KoPart.cpp b/libs/main/KoPart.cpp
+index 27dc8e2..3db2923 100644
+--- a/libs/main/KoPart.cpp
++++ b/libs/main/KoPart.cpp
+@@ -46,6 +46,10 @@
+ #include <QGraphicsProxyWidget>
+ #include <QMimeDatabase>
+ 
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ #ifndef QT_NO_DBUS
+ #include <QDBusConnection>
+ #include "KoPartAdaptor.h"
+diff --git a/libs/main/KoView.cpp b/libs/main/KoView.cpp
+index f72766d..ffef082 100644
+--- a/libs/main/KoView.cpp
++++ b/libs/main/KoView.cpp
+@@ -29,6 +29,10 @@
+ #include "KoDocument.h"
+ #include "KoMainWindow.h"
+ 
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ #ifndef QT_NO_DBUS
+ #include "KoViewAdaptor.h"
+ #include <QDBusConnection>
+diff --git a/plan/src/libs/main/KoApplication.cpp b/plan/src/libs/main/KoApplication.cpp
+index edb86fc..3f5ad2d 100644
+--- a/plan/src/libs/main/KoApplication.cpp
++++ b/plan/src/libs/main/KoApplication.cpp
+@@ -23,6 +23,10 @@
+ 
+ #include "KoGlobal.h"
+ 
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ #ifndef QT_NO_DBUS
+ #include "KoApplicationAdaptor.h"
+ #include <QDBusConnection>
+diff --git a/plan/src/libs/main/KoPart.cpp b/plan/src/libs/main/KoPart.cpp
+index c513528..ae5dd17 100644
+--- a/plan/src/libs/main/KoPart.cpp
++++ b/plan/src/libs/main/KoPart.cpp
+@@ -45,6 +45,10 @@
+ #include <QGraphicsProxyWidget>
+ #include <QMimeDatabase>
+ 
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ #ifndef QT_NO_DBUS
+ #include <QDBusConnection>
+ #include "KoPartAdaptor.h"
+diff --git a/plan/src/libs/main/KoView.cpp b/plan/src/libs/main/KoView.cpp
+index 2ab3b70..c99ff64 100644
+--- a/plan/src/libs/main/KoView.cpp
++++ b/plan/src/libs/main/KoView.cpp
+@@ -30,6 +30,10 @@
+ #include "KoDocument.h"
+ #include "KoMainWindow.h"
+ 
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ #ifndef QT_NO_DBUS
+ #include "KoViewAdaptor.h"
+ #include <QDBusConnection>
+diff --git a/sheets/part/Doc.cpp b/sheets/part/Doc.cpp
+index 60a8557..4165552 100644
+--- a/sheets/part/Doc.cpp
++++ b/sheets/part/Doc.cpp
+@@ -92,6 +92,10 @@
+ #include "SheetAccessModel.h"
+ #include "BindingModel.h"
+ 
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ // D-Bus
+ #ifndef QT_NO_DBUS
+ #include "interfaces/MapAdaptor.h"
+diff --git a/sheets/part/View.cpp b/sheets/part/View.cpp
+index b85064b..fc6e8fe 100644
+--- a/sheets/part/View.cpp
++++ b/sheets/part/View.cpp
+@@ -147,6 +147,10 @@
+ #include "ui/SheetView.h"
+ #include "ui/PixmapCachingSheetView.h"
+ 
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ // D-Bus
+ #ifndef QT_NO_DBUS
+ #include "interfaces/ViewAdaptor.h"
+diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
+index ae743da..2e39f59 100644
+--- a/stage/part/KPrPresentationTool.cpp
++++ b/stage/part/KPrPresentationTool.cpp
+@@ -49,6 +49,10 @@
+ #include "KPrPresentationBlackStrategy.h"
+ #include "ui/KPrPresentationToolWidget.h"
+ 
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ #ifndef QT_NO_DBUS
+ #include "KPrPresentationToolAdaptor.h"
+ #endif
+diff --git a/stage/part/KPrView.cpp b/stage/part/KPrView.cpp
+index b750f5e..7a03f00 100644
+--- a/stage/part/KPrView.cpp
++++ b/stage/part/KPrView.cpp
+@@ -50,6 +50,10 @@
+ #include "KPrMasterPage.h"
+ #include "KPrPageApplicationData.h"
+ 
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ #ifndef QT_NO_DBUS
+ #include "KPrViewAdaptor.h"
+ #endif
+diff --git a/stage/part/KPrView.h b/stage/part/KPrView.h
+index bebcc9a..eaccffa 100644
+--- a/stage/part/KPrView.h
++++ b/stage/part/KPrView.h
+@@ -28,6 +28,10 @@
+ class KPrDocument;
+ class KPrPart;
+ 
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ #ifndef QT_NO_DBUS
+ class KPrViewAdaptor;
+ #endif
+-- 
+2.16.2
+
+
+From 21a19b5d4e2dbb96e4d793e5f5cb021095ded757 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 18 Apr 2018 22:44:32 +1000
+Subject: Disable DBUS for plan
+
+
+diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
+index a6cc484..d3fc6e1 100644
+--- a/libs/main/KoDocument.cpp
++++ b/libs/main/KoDocument.cpp
+@@ -57,6 +57,11 @@
+ #include <MainDebug.h>
+ #include <kconfiggroup.h>
+ #include <kio/job.h>
++
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ #ifndef QT_NO_DBUS
+ #include <kdirnotify.h>
+ #endif
+diff --git a/plan/src/libs/main/KoDocument.cpp b/plan/src/libs/main/KoDocument.cpp
+index 03ad374..aa7281e 100644
+--- a/plan/src/libs/main/KoDocument.cpp
++++ b/plan/src/libs/main/KoDocument.cpp
+@@ -57,7 +57,9 @@
+ #include <MainDebug.h>
+ #include <kconfiggroup.h>
+ #include <kio/job.h>
++#ifndef Q_OS_HAIKU
+ #include <kdirnotify.h>
++#endif
+ #include <KBackup>
+ 
+ #include <QMimeDatabase>
+@@ -69,6 +71,11 @@
+ #include <QFileInfo>
+ #include <QPainter>
+ #include <QTimer>
++
++#ifdef Q_OS_HAIKU
++#define QT_NO_DBUS
++#endif
++
+ #ifndef QT_NO_DBUS
+ #include <KJobWidgets>
+ #include <QDBusConnection>
+@@ -417,8 +424,9 @@ public:
+         }
+         else
+         {
++#ifndef QT_NO_DBUS
+             ::org::kde::KDirNotify::emitFilesAdded(QUrl::fromLocalFile(m_url.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()));
+-
++#endif
+             m_uploadJob = 0;
+             document->setModified( false );
+             emit document->completed();
+-- 
+2.16.2
+