mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
Calligra: bump version
This commit is contained in:
@@ -3,17 +3,16 @@ DESCRIPTION="Calligra Suite is a collection of office applications linked \
|
||||
together by a common base. This common base assures that all office \
|
||||
application can work together and also share a common look and feel."
|
||||
HOMEPAGE="https://www.calligra.org/"
|
||||
COPYRIGHT="2010-2017 KDE Organisation"
|
||||
COPYRIGHT="2010-2018 KDE Organisation"
|
||||
LICENSE="
|
||||
GNU LGPL v2
|
||||
GNU GPL v2
|
||||
"
|
||||
REVISION="4"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/KDE/calligra/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="7a796d0f1f8dc6fa5e03a1774eee3cc677d81cf5c7bf2edd08fc1b07cd93980c"
|
||||
CHECKSUM_SHA256="33054f2309a3e3d274100d1485a46f50ca227cfafa66c34a3483c550ccc84ef4"
|
||||
PATCHES="calligra-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
braindump.rdef.in
|
||||
karbon.rdef.in
|
||||
plan.rdef.in
|
||||
sheets.rdef.in
|
||||
@@ -32,10 +31,16 @@ REQUIRES="
|
||||
cmd:dbus_launch
|
||||
lib:libboost_system$secondaryArchSuffix
|
||||
lib:libetonyek_0.1$secondaryArchSuffix
|
||||
lib:liblcms2$secondaryArchSuffix
|
||||
lib:libfontconfig$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libgsl$secondaryArchSuffix
|
||||
lib:libhalf$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libiex_2_2$secondaryArchSuffix
|
||||
lib:libiexmath_2_2$secondaryArchSuffix
|
||||
lib:libilmimf$secondaryArchSuffix
|
||||
lib:libilmthread_2_2$secondaryArchSuffix
|
||||
lib:libimath_2_2$secondaryArchSuffix
|
||||
lib:libKChart$secondaryArchSuffix
|
||||
lib:libKF5Activities$secondaryArchSuffix
|
||||
lib:libKF5Auth$secondaryArchSuffix
|
||||
@@ -52,6 +57,7 @@ REQUIRES="
|
||||
lib:libKF5DocTools$secondaryArchSuffix
|
||||
lib:libKF5Emoticons$secondaryArchSuffix
|
||||
lib:libKF5GuiAddons$secondaryArchSuffix
|
||||
lib:libkf5Holidays$secondaryArchSuffix
|
||||
lib:libKF5I18n$secondaryArchSuffix
|
||||
lib:libKF5IconThemes$secondaryArchSuffix
|
||||
lib:libkdeinit5_klauncher$secondaryArchSuffix
|
||||
@@ -82,10 +88,12 @@ REQUIRES="
|
||||
lib:libKGantt$secondaryArchSuffix
|
||||
lib:libKPropertyCore3$secondaryArchSuffix
|
||||
lib:libKPropertyWidgets3$secondaryArchSuffix
|
||||
lib:libKReport3$secondaryArchSuffix
|
||||
lib:libKReport3$secondaryArchSuffix
|
||||
lib:liblcms2$secondaryArchSuffix
|
||||
lib:libodfgen_0.1$secondaryArchSuffix
|
||||
lib:libpoppler${secondaryArchSuffix}_qt5
|
||||
lib:libphonon4qt5$secondaryArchSuffix
|
||||
lib:libqca_qt5$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5WebKitWidgets$secondaryArchSuffix
|
||||
lib:librevenge_0.0$secondaryArchSuffix
|
||||
@@ -97,16 +105,22 @@ REQUIRES="
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
extra_cmake_modules >= 5.39
|
||||
extra_cmake_modules >= 5.45
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
poppler${secondaryArchSuffix}_qt5
|
||||
devel:eigen$secondaryArchSuffix
|
||||
devel:libboost_system$secondaryArchSuffix
|
||||
devel:libetonyek_0.1$secondaryArchSuffix
|
||||
devel:liblcms2$secondaryArchSuffix
|
||||
devel:libfontconfig$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libgsl$secondaryArchSuffix
|
||||
devel:libhalf$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libiex$secondaryArchSuffix
|
||||
devel:libiexMath$secondaryArchSuffix
|
||||
devel:libilmimf$secondaryArchSuffix
|
||||
devel:libilmthread$secondaryArchSuffix
|
||||
devel:libimath$secondaryArchSuffix
|
||||
devel:libKChart$secondaryArchSuffix
|
||||
devel:libKF5Activities$secondaryArchSuffix
|
||||
devel:libKF5Auth$secondaryArchSuffix
|
||||
@@ -124,6 +138,7 @@ BUILD_REQUIRES="
|
||||
devel:libKF5DocTools$secondaryArchSuffix
|
||||
devel:libKF5Emoticons$secondaryArchSuffix
|
||||
devel:libKF5GuiAddons$secondaryArchSuffix
|
||||
devel:libKF5Holidays$secondaryArchSuffix
|
||||
devel:libKF5I18n$secondaryArchSuffix
|
||||
devel:libKF5IconThemes$secondaryArchSuffix
|
||||
devel:libkdeinit5_klauncher$secondaryArchSuffix
|
||||
@@ -153,9 +168,14 @@ BUILD_REQUIRES="
|
||||
devel:libKGantt$secondaryArchSuffix
|
||||
devel:libKPropertyCore3$secondaryArchSuffix
|
||||
devel:libKReport3$secondaryArchSuffix
|
||||
devel:liblangtag$secondaryArchSuffix
|
||||
devel:liblcms2$secondaryArchSuffix
|
||||
devel:libodfgen_0.1$secondaryArchSuffix
|
||||
devel:libphonon4qt5$secondaryArchSuffix
|
||||
devel:libpoppler$secondaryArchSuffix
|
||||
devel:libqca$secondaryArchSuffix >= 2
|
||||
devel:libQt5Core$secondaryArchSuffix >= 5.7
|
||||
devel:libQt5DBus$secondaryArchSuffix
|
||||
devel:libQt5WebKitWidgets$secondaryArchSuffix
|
||||
devel:librevenge_0.0$secondaryArchSuffix
|
||||
devel:libvisio_0.1$secondaryArchSuffix
|
||||
@@ -181,14 +201,14 @@ BUILD()
|
||||
|
||||
cmake .. \
|
||||
-DKDE_INSTALL_INCLUDEDIR=$includeDir \
|
||||
-DPLUGIN_INSTALL_DIR=$addOnsDir/Qt5 \
|
||||
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
|
||||
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
|
||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
|
||||
-DICONV_INCLUDE_DIR=/system/develop/headers \
|
||||
-DCMAKE_INSTALL_PREFIX=$appsDir/Calligra \
|
||||
-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
|
||||
-DSHARE_INSTALL_PREFIX=$dataDir \
|
||||
-DPRODUCTSET="karbon plan sheets words stage braindump" \
|
||||
-DKDE_INSTALL_DATAROOTDIR=$dataDir \
|
||||
-DPRODUCTSET="karbon plan sheets words stage" \
|
||||
-DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT -DQT_NO_DBUS=1" \
|
||||
-DRELEASE_BUILD=ON \
|
||||
-DBUILD_UNMAINTAINED=ON
|
||||
@@ -204,7 +224,6 @@ INSTALL()
|
||||
mkdir -p $binDir
|
||||
|
||||
cd $appsDir/Calligra
|
||||
mv bin/braindump BrainDump
|
||||
mv bin/calligrasheets Sheets
|
||||
mv bin/calligrawords Words
|
||||
mv bin/calligrastage Stage
|
||||
@@ -213,7 +232,7 @@ INSTALL()
|
||||
|
||||
rm -rf bin
|
||||
|
||||
mkdir -p "${dataDir}/deskbar/menu/Applications/Calligra"
|
||||
mkdir -p "$dataDir/deskbar/menu/Applications/Calligra"
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.calligra-sheets"
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
@@ -278,18 +297,6 @@ INSTALL()
|
||||
|
||||
addResourcesToBinaries $sourceDir/build/plan.rdef $appsDir/Calligra/Plan
|
||||
addAppDeskbarSymlink $appsDir/Calligra/Plan "Calligra/Plan"
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.calligra-braindump"
|
||||
sed \
|
||||
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
|
||||
-e "s|@MAJOR@|$MAJOR|" \
|
||||
-e "s|@MIDDLE@|$MIDDLE|" \
|
||||
-e "s|@MINOR@|$MINOR|" \
|
||||
-e "s|@LONG_INFO@|$LONG_INFO|" \
|
||||
$portDir/additional-files/braindump.rdef.in > $sourceDir/build/braindump.rdef
|
||||
|
||||
addResourcesToBinaries $sourceDir/build/braindump.rdef $appsDir/Calligra/BrainDump
|
||||
addAppDeskbarSymlink $appsDir/Calligra/BrainDump "Calligra/BrainDump"
|
||||
}
|
||||
|
||||
TEST()
|
||||
@@ -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
|
||||
|
||||
345
app-office/calligra/patches/calligra-3.1.0.patchset
Normal file
345
app-office/calligra/patches/calligra-3.1.0.patchset
Normal file
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user