calligraplan, bump to 4.0.1 (#13650)

This commit is contained in:
Schrijvers Luc
2026-01-20 14:59:49 +01:00
committed by GitHub
parent 1a596e3ddc
commit 4b875298a7
3 changed files with 242 additions and 298 deletions

View File

@@ -1,253 +0,0 @@
SUMMARY="A project management application of the Calligra Suite"
DESCRIPTION="Plan is a project management application. It is intended for \
managing moderately large projects with multiple resources.
To enable you to model your project adequately, Plan offers different \
types of task dependencies and timing constraints. The usual use case \
is to define your tasks, estimate the effort needed to perform each task, \
allocate resources and then let Plan schedule the tasks according to \
network and resource availability."
HOMEPAGE="https://www.calligra.org/"
COPYRIGHT="2010-2021 KDE Organisation"
LICENSE="GNU LGPL v2
GNU GPL v2"
REVISION="3"
SOURCE_URI="https://download.kde.org/stable/calligra/$portVersion/calligraplan-$portVersion.tar.xz"
CHECKSUM_SHA256="9a97414f2207941a70d93ff096617365d35379cc93a09cfc19ee532d2905a9d8"
SOURCE_FILENAME="calligraplan-$portVersion.tar.xz"
PATCHES="calligraplan-$portVersion.patchset"
ADDITIONAL_FILES="
calligraplan.rdef.in
calligraplanwork.rdef.in
"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion="17.0.0"
PROVIDES="
calligraplan$secondaryArchSuffix = $portVersion
lib:libkdeinit5_calligraplan$secondaryArchSuffix = $libVersion
lib:libkdeinit5_calligraplanwork$secondaryArchSuffix = $libVersion
lib:libplankernel$secondaryArchSuffix = $libVersion
lib:libplankundo2$secondaryArchSuffix = $libVersion
lib:libplanmain$secondaryArchSuffix = $libVersion
lib:libplanmodels$secondaryArchSuffix = $libVersion
lib:libplanodf$secondaryArchSuffix = $libVersion
lib:libplanplugin$secondaryArchSuffix = $libVersion
lib:libplanprivate$secondaryArchSuffix = $libVersion
lib:libplanstore$secondaryArchSuffix = $libVersion
lib:libplanui$secondaryArchSuffix = $libVersion
lib:libplanwidgets$secondaryArchSuffix = $libVersion
lib:libplanwidgetutils$secondaryArchSuffix = $libVersion
lib:libplanworkfactory$secondaryArchSuffix = $libVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libetonyek_0.1$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libKChart$secondaryArchSuffix
lib:libkdeinit5_kded5$secondaryArchSuffix
lib:libkdeinit5_klauncher$secondaryArchSuffix
lib:libKF5Activities$secondaryArchSuffix
lib:libKF5Archive$secondaryArchSuffix
lib:libKF5Auth$secondaryArchSuffix
lib:libKF5Bookmarks$secondaryArchSuffix
lib:libKF5Codecs$secondaryArchSuffix
lib:libKF5Completion$secondaryArchSuffix
lib:libKF5ConfigCore$secondaryArchSuffix
lib:libKF5ConfigGui$secondaryArchSuffix
lib:libKF5ConfigWidgets$secondaryArchSuffix
lib:libKF5CoreAddons$secondaryArchSuffix
lib:libKF5Crash$secondaryArchSuffix
lib:libKF5DBusAddons$secondaryArchSuffix
lib:libKF5DocTools$secondaryArchSuffix
lib:libKF5Emoticons$secondaryArchSuffix
lib:libKF5GuiAddons$secondaryArchSuffix
lib:libKF5Holidays$secondaryArchSuffix
lib:libKF5I18n$secondaryArchSuffix
lib:libKF5IconThemes$secondaryArchSuffix
lib:libKF5ItemModels$secondaryArchSuffix
lib:libKF5ItemViews$secondaryArchSuffix
lib:libKF5JobWidgets$secondaryArchSuffix
lib:libKF5JS$secondaryArchSuffix
lib:libKF5JSApi$secondaryArchSuffix
lib:libKF5KCMUtils$secondaryArchSuffix
lib:libKF5KDELibs4Support$secondaryArchSuffix
lib:libKF5KHtml$secondaryArchSuffix
lib:libKF5KIOCore$secondaryArchSuffix
lib:libKF5KrossCore$secondaryArchSuffix
lib:libKF5Notifications$secondaryArchSuffix
lib:libKF5NotifyConfig$secondaryArchSuffix
lib:libKF5Parts$secondaryArchSuffix
lib:libKF5Service$secondaryArchSuffix
lib:libKF5Solid$secondaryArchSuffix
lib:libKF5SonnetCore$secondaryArchSuffix
lib:libKF5TextWidgets$secondaryArchSuffix
lib:libKF5ThreadWeaver$secondaryArchSuffix
lib:libKF5UnitConversion$secondaryArchSuffix
lib:libKF5Wallet$secondaryArchSuffix
lib:libKF5WidgetsAddons$secondaryArchSuffix
lib:libKF5WindowSystem$secondaryArchSuffix
lib:libKF5XmlGui$secondaryArchSuffix
lib:libKGantt$secondaryArchSuffix
lib:libKPropertyCore3$secondaryArchSuffix
lib:libKPropertyWidgets3$secondaryArchSuffix
lib:libKReport3$secondaryArchSuffix
lib:libqca_qt5$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5WebKitWidgets$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix
devel:eigen$secondaryArchSuffix
devel:libboost_system$secondaryArchSuffix >= 1.69.0
devel:libetonyek_0.1$secondaryArchSuffix
devel:libfontconfig$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libKChart$secondaryArchSuffix
devel:libkdeinit5_kded5$secondaryArchSuffix
devel:libkdeinit5_klauncher$secondaryArchSuffix
devel:libKF5Activities$secondaryArchSuffix
devel:libKF5Archive$secondaryArchSuffix
devel:libKF5Auth$secondaryArchSuffix
devel:libKF5Bookmarks$secondaryArchSuffix
devel:libKF5Codecs$secondaryArchSuffix
devel:libKF5Completion$secondaryArchSuffix
devel:libKF5ConfigCore$secondaryArchSuffix
devel:libKF5ConfigGui$secondaryArchSuffix
devel:libKF5ConfigWidgets$secondaryArchSuffix
devel:libKF5CoreAddons$secondaryArchSuffix
devel:libKF5Crash$secondaryArchSuffix
devel:libKF5DBusAddons$secondaryArchSuffix
devel:libKF5DesignerPlugin$secondaryArchSuffix
devel:libKF5DocTools$secondaryArchSuffix
devel:libKF5Emoticons$secondaryArchSuffix
devel:libKF5GuiAddons$secondaryArchSuffix
devel:libKF5Holidays$secondaryArchSuffix
devel:libKF5I18n$secondaryArchSuffix
devel:libKF5IconThemes$secondaryArchSuffix
devel:libKF5ItemModels$secondaryArchSuffix
devel:libKF5ItemViews$secondaryArchSuffix
devel:libKF5JobWidgets$secondaryArchSuffix
devel:libKF5JSApi$secondaryArchSuffix
devel:libKF5KCMUtils$secondaryArchSuffix
devel:libKF5KDELibs4Support$secondaryArchSuffix
devel:libKF5KHtml$secondaryArchSuffix
devel:libKF5KIOCore$secondaryArchSuffix
devel:libKF5KrossCore$secondaryArchSuffix
devel:libKF5Notifications$secondaryArchSuffix
devel:libKF5NotifyConfig$secondaryArchSuffix
devel:libKF5Parts$secondaryArchSuffix
devel:libKF5Service$secondaryArchSuffix
devel:libKF5Solid$secondaryArchSuffix
devel:libKF5SonnetCore$secondaryArchSuffix
devel:libKF5TextWidgets$secondaryArchSuffix
devel:libKF5ThreadWeaver$secondaryArchSuffix
devel:libKF5UnitConversion$secondaryArchSuffix
devel:libKF5Wallet$secondaryArchSuffix
devel:libKF5WidgetsAddons$secondaryArchSuffix
devel:libKF5WindowSystem$secondaryArchSuffix
devel:libKF5XmlGui$secondaryArchSuffix
devel:libKGantt$secondaryArchSuffix
devel:libKPropertyCore3$secondaryArchSuffix
devel:libKReport3$secondaryArchSuffix
devel:liblangtag$secondaryArchSuffix
devel:liblcms2$secondaryArchSuffix
devel:libqca_qt5$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5WebKitWidgets$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:lrelease$secondaryArchSuffix >= 5
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
# cmd:python
"
BUILD()
{
# disable docs generation
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
mkdir -p build
cd build
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$appsDir/Calligra \
-DCMAKE_INSTALL_BINDIR=$appsDir/Calligra \
-DCMAKE_INSTALL_LIBDIR=$libDir \
-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
-DKDE_INSTALL_INCLUDEDIR=$includeDir \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DICONV_INCLUDE_DIR=/system/$relativeIncludeDir \
-DKDE_INSTALL_DATAROOTDIR=$dataDir \
-DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT" \
-DRELEASE_BUILD=ON
make $jobArgs
}
INSTALL()
{
cd build
make install
cd $appsDir/Calligra
mv calligraplan Plan
mv calligraplanwork PlanWork
rm -rf $appsDir/Calligra/etc
mkdir -p "$dataDir/deskbar/menu/Applications/Calligra"
local APP_SIGNATURE="application/x-vnd.calligra-plan"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
local LONG_INFO="$SUMMARY"
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/calligraplan.rdef.in > $sourceDir/build/calligraplan.rdef
addResourcesToBinaries $sourceDir/build/calligraplan.rdef $appsDir/Calligra/Plan
addAppDeskbarSymlink $appsDir/Calligra/Plan "Calligra/Plan"
local APP_SIGNATURE="application/x-vnd.calligra-planwork"
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/calligraplanwork.rdef.in > $sourceDir/build/calligraplanwork.rdef
addResourcesToBinaries $sourceDir/build/calligraplanwork.rdef $appsDir/Calligra/PlanWork
addAppDeskbarSymlink $appsDir/Calligra/PlanWork "Calligra/PlanWork"
}
TEST()
{
cd build
make test
}

View File

@@ -0,0 +1,224 @@
SUMMARY="A project management application of the Calligra Suite"
DESCRIPTION="Plan is a project management application. It is intended for \
managing moderately large projects with multiple resources.
To enable you to model your project adequately, Plan offers different \
types of task dependencies and timing constraints. The usual use case \
is to define your tasks, estimate the effort needed to perform each task, \
allocate resources and then let Plan schedule the tasks according to \
network and resource availability."
HOMEPAGE="https://www.calligra.org/"
COPYRIGHT="2010-2026 KDE Organisation"
LICENSE="GNU LGPL v2
GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/calligraplan/calligraplan-$portVersion.tar.xz"
CHECKSUM_SHA256="9267ea174c04466014343927f73757bb3047dab36a74fc8f38b891e8d8833a39"
SOURCE_FILENAME="calligraplan-$portVersion.tar.gz"
PATCHES="calligraplan-$portVersion.patchset"
ADDITIONAL_FILES="
calligraplan.rdef.in
calligraplanportfolio.rdef.in
calligraplanwork.rdef.in
"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion="$portVersion"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
GLOBAL_WRITABLE_FILES="
settings/xdg directory keep-old
"
PROVIDES="
calligraplan$secondaryArchSuffix = $portVersion
app:Plan = $portVersion
app:PlanWork = $portVersion
app:PlanPortfolio = $portVersion
lib:libcalligraplankernel$secondaryArchSuffix = $libVersion
lib:libcalligraplankundo2$secondaryArchSuffix = $libVersion
lib:libcalligraplanmain$secondaryArchSuffix = $libVersion
lib:libcalligraplanmodels$secondaryArchSuffix = $libVersion
lib:libcalligraplanodf$secondaryArchSuffix = $libVersion
lib:libcalligraplanplugin$secondaryArchSuffix = $libVersion
lib:libcalligraplanportfolioprivate$secondaryArchSuffix = $libVersion
lib:libcalligraplanprivate$secondaryArchSuffix = $libVersion
lib:libcalligraplanstore$secondaryArchSuffix = $libVersion
lib:libcalligraplantjscheduler$secondaryArchSuffix
lib:libcalligraplanui$secondaryArchSuffix = $libVersion
lib:libcalligraplanwidgets$secondaryArchSuffix = $libVersion
lib:libcalligraplanwidgetutils$secondaryArchSuffix = $libVersion
lib:libcalligraplanworkprivate$secondaryArchSuffix = $libVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libKChart6$secondaryArchSuffix
lib:libKGantt6$secondaryArchSuffix
lib:libqca_qt6$secondaryArchSuffix
# KF6
lib:libKF6Archive$secondaryArchSuffix
lib:libKF6Bookmarks$secondaryArchSuffix
lib:libKF6ColorScheme$secondaryArchSuffix
lib:libKF6Completion$secondaryArchSuffix
lib:libKF6ConfigCore$secondaryArchSuffix
lib:libKF6ConfigWidgets$secondaryArchSuffix
lib:libKF6CoreAddons$secondaryArchSuffix
lib:libKF6DBusAddons$secondaryArchSuffix
lib:libKF6GuiAddons$secondaryArchSuffix
lib:libKF6Holidays$secondaryArchSuffix
lib:libKF6I18n$secondaryArchSuffix
lib:libKF6IconThemes$secondaryArchSuffix
lib:libKF6ItemModels$secondaryArchSuffix
lib:libKF6ItemViews$secondaryArchSuffix
lib:libKF6JobWidgets$secondaryArchSuffix
lib:libKF6KIOCore$secondaryArchSuffix
lib:libKF6Notifications$secondaryArchSuffix
lib:libKF6Parts$secondaryArchSuffix
lib:libKF6Service$secondaryArchSuffix
lib:libKF6Solid$secondaryArchSuffix
lib:libKF6SonnetCore$secondaryArchSuffix
lib:libKF6TextWidgets$secondaryArchSuffix
lib:libKF6ThreadWeaver$secondaryArchSuffix
lib:libKF6Wallet$secondaryArchSuffix
lib:libKF6WidgetsAddons$secondaryArchSuffix
lib:libKF6WindowSystem$secondaryArchSuffix
lib:libKF6XmlGui$secondaryArchSuffix
# Plasma6
lib:libPlasmaActivities$secondaryArchSuffix
# Qt6
lib:libQt6Core$secondaryArchSuffix
# lib:libQt6WebKitWidgets$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libKChart6$secondaryArchSuffix
devel:libKGantt6$secondaryArchSuffix
devel:libqca_qt6$secondaryArchSuffix
# KF6
extra_cmake_modules$secondaryArchSuffix
devel:libKF6Archive$secondaryArchSuffix
devel:libKF6CalendarCore$secondaryArchSuffix
devel:libKF6ConfigCore$secondaryArchSuffix
devel:libKF6ConfigWidgets$secondaryArchSuffix
devel:libKF6CoreAddons$secondaryArchSuffix
devel:libKF6DBusAddons$secondaryArchSuffix
devel:libKF6GuiAddons$secondaryArchSuffix
devel:libKF6Holidays$secondaryArchSuffix
devel:libKF6I18n$secondaryArchSuffix
devel:libKF6IconThemes$secondaryArchSuffix
devel:libKF6ItemModels$secondaryArchSuffix
devel:libKF6ItemViews$secondaryArchSuffix
devel:libKF6JobWidgets$secondaryArchSuffix
devel:libKF6KIOCore$secondaryArchSuffix
devel:libKF6Notifications$secondaryArchSuffix
devel:libKF6Parts$secondaryArchSuffix
devel:libKF6SonnetCore$secondaryArchSuffix
devel:libKF6TextWidgets$secondaryArchSuffix
devel:libKF6ThreadWeaver$secondaryArchSuffix
devel:libKF6Wallet$secondaryArchSuffix
devel:libKF6WidgetsAddons$secondaryArchSuffix
devel:libKF6WindowSystem$secondaryArchSuffix
devel:libKF6XmlGui$secondaryArchSuffix
# Plasma6
devel:libPlasmaActivities$secondaryArchSuffix
# Qt 6
devel:libQt6Core$secondaryArchSuffix
# devel:libQt6WebKitWidgets$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:make
cmd:msgfmt$secondaryArchSuffix
cmd:msgmerge$secondaryArchSuffix
cmd:perl
cmd:pkg_config$secondaryArchSuffix
# cmd:python3.10
"
TEST_REQUIRES="
cmd:awk
"
BUILD()
{
# disable docs generation
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT" \
-Wno-dev
make -C build $jobArgs
}
INSTALL()
{
make -C build install
# don't mess with shared_mime_info files
rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic}
rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces}
cd $appsDir
mv calligraplan Plan
mv calligraplanwork PlanWork
mv calligraplanportfolio PlanPortfolio
# rm -rf $appsDir/Calligra/etc
mkdir -p "$dataDir/deskbar/menu/Applications/Calligra"
local APP_SIGNATURE="application/x-vnd.calligra-plan"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
local LONG_INFO="$SUMMARY"
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/calligraplan.rdef.in > $sourceDir/build/calligraplan.rdef
addResourcesToBinaries $sourceDir/build/calligraplan.rdef $appsDir/Plan
addAppDeskbarSymlink $appsDir/Plan "Calligra/Plan"
local APP_SIGNATURE="application/x-vnd.calligra-planportfolio"
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/calligraplanportfolio.rdef.in > $sourceDir/build/calligraplanportfolio.rdef
addResourcesToBinaries $sourceDir/build/calligraplanportfolio.rdef $appsDir/PlanPortfolio
addAppDeskbarSymlink $appsDir/PlanPortfolio "Calligra/PlanPortfolio"
local APP_SIGNATURE="application/x-vnd.calligra-planwork"
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/calligraplanwork.rdef.in > $sourceDir/build/calligraplanwork.rdef
addResourcesToBinaries $sourceDir/build/calligraplanwork.rdef $appsDir/PlanWork
addAppDeskbarSymlink $appsDir/PlanWork "Calligra/PlanWork"
}
TEST()
{
# 84% tests passed, 10 tests failed out of 63
ctest --test-dir build --output-on-failure
}

View File

@@ -1,14 +1,14 @@
From 6a50f9dcbba929feaaa1c62579fe881a3fbfe280 Mon Sep 17 00:00:00 2001
From 3cf981fe43e2711cb416001ae002bac442bb27a1 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 5 May 2020 00:13:32 +1000
Subject: Disable dbus for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46c5c75..9f96b0a 100644
index 1f22e20..3ced4aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,6 +202,12 @@ add_definitions(
@@ -218,6 +218,12 @@ add_definitions(
-DQT_NO_CAST_TO_ASCII
)
@@ -22,62 +22,35 @@ index 46c5c75..9f96b0a 100644
# TODO: check if this can be moved to only those places which make use of it,
# to reduce global compiler definitions that would trigger a recompile of
diff --git a/src/libs/main/CMakeLists.txt b/src/libs/main/CMakeLists.txt
index 5a27cca..8a7f2ea 100644
index 094917e..6bfc2ee 100644
--- a/src/libs/main/CMakeLists.txt
+++ b/src/libs/main/CMakeLists.txt
@@ -51,7 +51,7 @@ set(komain_LIB_SRCS
Calligra2Migration.cpp
@@ -55,7 +55,7 @@ set(komain_LIB_SRCS
MainDebug.cpp
)
-if( Qt5DBus_FOUND )
+if( Qt5DBus_FOUND AND NOT HAIKU )
-if( Qt6DBus_FOUND )
+if( Qt6DBus_FOUND AND NOT HAIKU )
set(komain_LIB_SRCS ${komain_LIB_SRCS}
KoApplicationAdaptor.cpp
KoViewAdaptor.cpp
diff --git a/src/libs/main/KoDocument.cpp b/src/libs/main/KoDocument.cpp
index 76ecad0..490f549 100644
--- a/src/libs/main/KoDocument.cpp
+++ b/src/libs/main/KoDocument.cpp
@@ -58,7 +58,9 @@
#include <MainDebug.h>
#include <kconfiggroup.h>
#include <kio/job.h>
+#ifndef QT_NO_DBUS
#include <kdirnotify.h>
+#endif
#include <KBackup>
#include <QMimeDatabase>
@@ -418,8 +420,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/src/workpackage/main.cpp b/src/workpackage/main.cpp
index 12af06e..03ca223 100644
index e598a19..f0bf5b6 100644
--- a/src/workpackage/main.cpp
+++ b/src/workpackage/main.cpp
@@ -20,9 +20,9 @@
@@ -8,7 +8,9 @@
// clazy:excludeall=qstring-arg
#include "commandlineparser.h"
-
+#ifndef QT_NO_DBUS
#include <KDBusService>
-
+#endif
#include <KLocalizedString>
#include <QApplication>
#include <QLoggingCategory>
#include <QDir>
@@ -38,7 +38,9 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
@@ -25,7 +27,9 @@ int main(int argc, char **argv)
// service name, so reset the application name:
app.setApplicationName("calligraplanwork");
app.setApplicationName(QLatin1String("calligraplanwork"));
#endif
+#ifndef QT_NO_DBUS
KDBusService service(KDBusService::Unique);
@@ -85,8 +58,8 @@ index 12af06e..03ca223 100644
// we come here only once...
/**
@@ -60,7 +62,9 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
m.migrate();
@@ -41,7 +45,9 @@ int main(int argc, char **argv)
"calligra.plan*.warning=true"));
CommandLineParser cmd;
+#ifndef QT_NO_DBUS
@@ -96,5 +69,5 @@ index 12af06e..03ca223 100644
return app.exec();
}
--
2.26.0
2.50.1