mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
calligra, add 64bit recipe for 25.12.0 (#13468)
This commit is contained in:
Schrijvers Luc
GitHub
331
app-office/calligra/calligra-25.12.0.recipe
Normal file
331
app-office/calligra/calligra-25.12.0.recipe
Normal file
@@ -0,0 +1,331 @@
|
||||
SUMMARY="The integrated work applications suite"
|
||||
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-2025 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2
|
||||
GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/calligra-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="0e1590961131c5ca7690f6d691131239b685403d14f346c0138dbc7e2f8a69fb"
|
||||
PATCHES="calligra-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
karbon.rdef.in
|
||||
sheets.rdef.in
|
||||
stage.rdef.in
|
||||
words.rdef.in
|
||||
"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="?x86"
|
||||
|
||||
PROVIDES="
|
||||
calligra$secondaryArchSuffix = $portVersion
|
||||
app:Karbon = $portVersion
|
||||
app:Words = $portVersion
|
||||
app:Sheets = $portVersion
|
||||
app:Stage = $portVersion
|
||||
cmd:calligraconverter = $portVersion
|
||||
cmd:visualimagecompare = $portVersion
|
||||
lib:libautocorrection$secondaryArchSuffix = $portVersion
|
||||
lib:libbasicflakes$secondaryArchSuffix = $portVersion
|
||||
lib:libcalligrasheetscore$secondaryArchSuffix = $portVersion
|
||||
lib:libcalligrasheetsengine$secondaryArchSuffix = $portVersion
|
||||
lib:libcalligrasheetspartlib$secondaryArchSuffix = $portVersion
|
||||
lib:libcalligrasheetsui$secondaryArchSuffix = $portVersion
|
||||
lib:libcalligrastageprivate$secondaryArchSuffix = $portVersion
|
||||
lib:libflake$secondaryArchSuffix = $portVersion
|
||||
lib:libkarboncommon$secondaryArchSuffix = $portVersion
|
||||
lib:libkarbonui$secondaryArchSuffix = $portVersion
|
||||
lib:libkoformula$secondaryArchSuffix = $portVersion
|
||||
lib:libkomain$secondaryArchSuffix = $portVersion
|
||||
lib:libkomsooxml$secondaryArchSuffix = $portVersion
|
||||
lib:libkoodf$secondaryArchSuffix = $portVersion
|
||||
lib:libkoodf2$secondaryArchSuffix = $portVersion
|
||||
lib:libkoodfreader$secondaryArchSuffix = $portVersion
|
||||
lib:libkookularGenerator_odp$secondaryArchSuffix = $portVersion
|
||||
lib:libkookularGenerator_odt$secondaryArchSuffix = $portVersion
|
||||
lib:libkopageapp$secondaryArchSuffix = $portVersion
|
||||
lib:libkoplugin$secondaryArchSuffix = $portVersion
|
||||
lib:libkostore$secondaryArchSuffix = $portVersion
|
||||
lib:libkotext$secondaryArchSuffix = $portVersion
|
||||
lib:libkotextlayout$secondaryArchSuffix = $portVersion
|
||||
lib:libkovectorimage$secondaryArchSuffix = $portVersion
|
||||
lib:libkowidgets$secondaryArchSuffix = $portVersion
|
||||
lib:libkowidgetutils$secondaryArchSuffix = $portVersion
|
||||
lib:libkowv2$secondaryArchSuffix = $portVersion
|
||||
lib:libkundo2$secondaryArchSuffix = $portVersion
|
||||
lib:libpigmentcms$secondaryArchSuffix = $portVersion
|
||||
lib:librtfreader$secondaryArchSuffix = $portVersion
|
||||
lib:libwordsprivate$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libboost_system$secondaryArchSuffix
|
||||
lib:libetonyek_0.1$secondaryArchSuffix
|
||||
lib:libfontconfig$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libGL$secondaryArchSuffix
|
||||
lib:libgsl$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libIex_3_2$secondaryArchSuffix
|
||||
lib:libIlmThread_3_2$secondaryArchSuffix
|
||||
lib:libImath_3_1$secondaryArchSuffix
|
||||
lib:libKChart6$secondaryArchSuffix
|
||||
lib:libKGantt6$secondaryArchSuffix
|
||||
lib:liblcms2$secondaryArchSuffix
|
||||
lib:libodfgen_0.1$secondaryArchSuffix
|
||||
lib:libOkular6Core$secondaryArchSuffix
|
||||
lib:libOpenEXR_3_2$secondaryArchSuffix
|
||||
lib:libOpenEXRUtil_3_2$secondaryArchSuffix
|
||||
lib:libphonon4qt6$secondaryArchSuffix
|
||||
lib:libpoppler$secondaryArchSuffix
|
||||
lib:libpoppler_qt6$secondaryArchSuffix
|
||||
lib:libqca_qt6$secondaryArchSuffix
|
||||
lib:librevenge_0.0$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libvisio_0.1$secondaryArchSuffix
|
||||
lib:libwpd_0.10$secondaryArchSuffix
|
||||
lib:libwpg_0.3$secondaryArchSuffix
|
||||
lib:libwps_0.4$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
# KF6
|
||||
lib:libKF6Archive$secondaryArchSuffix
|
||||
lib:libKF6AuthCore$secondaryArchSuffix
|
||||
lib:libKF6Bookmarks$secondaryArchSuffix
|
||||
lib:libKF6Codecs$secondaryArchSuffix
|
||||
lib:libKF6ColorScheme$secondaryArchSuffix
|
||||
lib:libKF6Completion$secondaryArchSuffix
|
||||
lib:libKF6ConfigCore$secondaryArchSuffix
|
||||
lib:libKF6ConfigGui$secondaryArchSuffix
|
||||
lib:libKF6ConfigWidgets$secondaryArchSuffix
|
||||
lib:libKF6CoreAddons$secondaryArchSuffix
|
||||
lib:libKF6Crash$secondaryArchSuffix
|
||||
lib:libKF6GuiAddons$secondaryArchSuffix
|
||||
lib:libKF6I18n$secondaryArchSuffix
|
||||
lib:libKF6IconThemes$secondaryArchSuffix
|
||||
lib:libKF6ItemModels$secondaryArchSuffix
|
||||
lib:libKF6ItemViews$secondaryArchSuffix
|
||||
lib:libKF6JobWidgets$secondaryArchSuffix
|
||||
lib:libKF6KCMUtils$secondaryArchSuffix
|
||||
lib:libKF6KCMUtilsCore$secondaryArchSuffix
|
||||
lib:libKF6KCMUtilsQuick$secondaryArchSuffix
|
||||
lib:libKF6KIOCore$secondaryArchSuffix
|
||||
lib:libKF6KIOGui$secondaryArchSuffix
|
||||
lib:libKF6KIOWidgets$secondaryArchSuffix
|
||||
lib:libKF6Notifications$secondaryArchSuffix
|
||||
lib:libKF6NotifyConfig$secondaryArchSuffix
|
||||
lib:libKF6Parts$secondaryArchSuffix
|
||||
lib:libKF6Service$secondaryArchSuffix
|
||||
lib:libKF6Solid$secondaryArchSuffix
|
||||
lib:libKF6SonnetUi$secondaryArchSuffix
|
||||
lib:libKF6TextWidgets$secondaryArchSuffix
|
||||
lib:libKF6ThreadWeaver$secondaryArchSuffix
|
||||
lib:libKF6UnitConversion$secondaryArchSuffix
|
||||
lib:libKF6Wallet$secondaryArchSuffix
|
||||
lib:libKF6WidgetsAddons$secondaryArchSuffix
|
||||
lib:libKF6WindowSystem$secondaryArchSuffix
|
||||
lib:libKF6XmlGui$secondaryArchSuffix
|
||||
# Qt6
|
||||
lib:libQt6Core$secondaryArchSuffix
|
||||
lib:libQt6Gui$secondaryArchSuffix
|
||||
lib:libQt6Keychain$secondaryArchSuffix
|
||||
lib:libQt6Network$secondaryArchSuffix
|
||||
lib:libQt6PrintSupport$secondaryArchSuffix
|
||||
lib:libQt6Qml$secondaryArchSuffix
|
||||
lib:libQt6Svg$secondaryArchSuffix
|
||||
lib:libQt6Widgets$secondaryArchSuffix
|
||||
lib:libQt6Xml$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:eigen$secondaryArchSuffix
|
||||
devel:libboost_system$secondaryArchSuffix >= 1.88.0
|
||||
devel:libetonyek_0.1$secondaryArchSuffix
|
||||
devel:libfontconfig$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libgsl$secondaryArchSuffix
|
||||
devel:libgit2$secondaryArchSuffix >= 1.8
|
||||
devel:libOkular6Core$secondaryArchSuffix
|
||||
# okular6
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libIex_3_2$secondaryArchSuffix
|
||||
devel:libIlmThread_3_2$secondaryArchSuffix
|
||||
devel:libImath_3_1$secondaryArchSuffix
|
||||
devel:libKChart6$secondaryArchSuffix
|
||||
devel:libKGantt6$secondaryArchSuffix
|
||||
devel:liblangtag$secondaryArchSuffix
|
||||
devel:liblcms2$secondaryArchSuffix
|
||||
devel:libodfgen_0.1$secondaryArchSuffix
|
||||
devel:libOpenEXR_3_2$secondaryArchSuffix
|
||||
devel:libOpenEXRUtil_3_2$secondaryArchSuffix
|
||||
devel:libphonon4qt6$secondaryArchSuffix
|
||||
devel:libpoppler$secondaryArchSuffix >= 148
|
||||
devel:libpoppler_qt6$secondaryArchSuffix >= 3.10
|
||||
devel:libqca_qt6$secondaryArchSuffix >= 2
|
||||
devel:librevenge_0.0$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libvisio_0.1$secondaryArchSuffix
|
||||
devel:libwpd_0.10$secondaryArchSuffix
|
||||
devel:libwpg_0.3$secondaryArchSuffix
|
||||
devel:libwps_0.4$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
# KF6
|
||||
extra_cmake_modules$secondaryArchSuffix
|
||||
devel:libKF6Archive$secondaryArchSuffix
|
||||
devel:libKF6AuthCore$secondaryArchSuffix
|
||||
devel:libKF6Bookmarks$secondaryArchSuffix
|
||||
devel:libKF6Codecs$secondaryArchSuffix
|
||||
devel:libKF6ColorScheme$secondaryArchSuffix
|
||||
devel:libKF6Completion$secondaryArchSuffix
|
||||
devel:libKF6ConfigCore$secondaryArchSuffix
|
||||
devel:libKF6ConfigGui$secondaryArchSuffix
|
||||
devel:libKF6ConfigWidgets$secondaryArchSuffix
|
||||
devel:libKF6CoreAddons$secondaryArchSuffix
|
||||
devel:libKF6Crash$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:libKF6KCMUtils$secondaryArchSuffix
|
||||
devel:libKF6KIOCore$secondaryArchSuffix
|
||||
devel:libKF6Notifications$secondaryArchSuffix
|
||||
devel:libKF6NotifyConfig$secondaryArchSuffix
|
||||
devel:libKF6Parts$secondaryArchSuffix
|
||||
devel:libKF6Service$secondaryArchSuffix
|
||||
devel:libKF6Solid$secondaryArchSuffix
|
||||
devel:libKF6SonnetCore$secondaryArchSuffix
|
||||
devel:libKF6TextWidgets$secondaryArchSuffix
|
||||
devel:libKF6ThreadWeaver$secondaryArchSuffix
|
||||
devel:libKF6UnitConversion$secondaryArchSuffix
|
||||
devel:libKF6Wallet$secondaryArchSuffix
|
||||
devel:libKF6WidgetsAddons$secondaryArchSuffix
|
||||
devel:libKF6WindowSystem$secondaryArchSuffix
|
||||
devel:libKF6XmlGui$secondaryArchSuffix
|
||||
# Qt6
|
||||
qt6_tools${secondaryArchSuffix}_devel
|
||||
devel:libQt6Core$secondaryArchSuffix
|
||||
devel:libQt6Keychain$secondaryArchSuffix
|
||||
devel:libQt6Qml$secondaryArchSuffix
|
||||
devel:libQt6Svg$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:gettext$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:perl
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
# disable docs generation
|
||||
sed -e 's|DocTools||' -i CMakeLists.txt
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cmake -B build -S . -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/Qt6 \
|
||||
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
|
||||
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/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" \
|
||||
-DCMAKE_AUTOGEN_PARALLEL=4 \
|
||||
-DRELEASE_BUILD=ON \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-Wno-dev
|
||||
|
||||
make -C build $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make -C build install
|
||||
|
||||
cd $appsDir/Calligra
|
||||
mv calligrasheets Sheets
|
||||
mv calligrawords Words
|
||||
mv calligrastage Stage
|
||||
mv karbon Karbon
|
||||
|
||||
mkdir $prefix/bin
|
||||
mv $appsDir/Calligra/{calligraconverter,visualimagecompare} $prefix/bin
|
||||
|
||||
rm -rf $appsDir/Calligra/{etc,calligralauncher,cstester,cstrunner}
|
||||
rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic}
|
||||
rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces}
|
||||
|
||||
mkdir -p "$dataDir/deskbar/menu/Applications/Calligra"
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.calligra-sheets"
|
||||
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/sheets.rdef.in > $sourceDir/build/sheets.rdef
|
||||
|
||||
addResourcesToBinaries $sourceDir/build/sheets.rdef $appsDir/Calligra/Sheets
|
||||
addAppDeskbarSymlink $appsDir/Calligra/Sheets "Calligra/Sheets"
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.calligra-words"
|
||||
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/words.rdef.in > $sourceDir/build/words.rdef
|
||||
|
||||
addResourcesToBinaries $sourceDir/build/words.rdef $appsDir/Calligra/Words
|
||||
addAppDeskbarSymlink $appsDir/Calligra/Words "Calligra/Words"
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.calligra-stage"
|
||||
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/stage.rdef.in > $sourceDir/build/stage.rdef
|
||||
|
||||
addResourcesToBinaries $sourceDir/build/stage.rdef $appsDir/Calligra/Stage
|
||||
addAppDeskbarSymlink $appsDir/Calligra/Stage "Calligra/Stage"
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.calligra-karbon"
|
||||
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/karbon.rdef.in > $sourceDir/build/karbon.rdef
|
||||
|
||||
addResourcesToBinaries $sourceDir/build/karbon.rdef $appsDir/Calligra/Karbon
|
||||
addAppDeskbarSymlink $appsDir/Calligra/Karbon "Calligra/Karbon"
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
ctest --test-dir build --output-on-failure
|
||||
}
|
||||
299
app-office/calligra/patches/calligra-25.12.0.patchset
Normal file
299
app-office/calligra/patches/calligra-25.12.0.patchset
Normal file
@@ -0,0 +1,299 @@
|
||||
From 3f86d0830e930086f9ad004a8cf1f7cbca83cc0f Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 16 Sep 2024 22:40:14 +1000
|
||||
Subject: Fix for Haiku
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 78e4b60..f97c1d3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -205,7 +205,7 @@ add_definitions(
|
||||
-DQT_DISABLE_DEPRECATED_BEFORE=0x050600
|
||||
)
|
||||
|
||||
-if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT CALLIGRA_FLATPAK)
|
||||
+if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU AND NOT CALLIGRA_FLATPAK)
|
||||
add_definitions(-DWITH_QTDBUS)
|
||||
find_package(Qt6 ${REQUIRED_KF6_VERSION} REQUIRED
|
||||
COMPONENTS
|
||||
@@ -957,7 +957,7 @@ if(SHOULD_BUILD_APP_BRAINDUMP)
|
||||
endif()
|
||||
|
||||
if(SHOULD_BUILD_DOC)
|
||||
- add_subdirectory(doc)
|
||||
+# add_subdirectory(doc)
|
||||
endif()
|
||||
|
||||
if(SHOULD_BUILD_PART_QTQUICK)
|
||||
@@ -1000,10 +1000,10 @@ if (BUILD_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif(BUILD_TESTING)
|
||||
|
||||
-ki18n_install(po)
|
||||
-if(KF6DocTools_FOUND)
|
||||
- kdoctools_install(po)
|
||||
-endif()
|
||||
+#ki18n_install(po)
|
||||
+#if(KF6DocTools_FOUND)
|
||||
+# kdoctools_install(po)
|
||||
+#endif()
|
||||
|
||||
file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
|
||||
kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
|
||||
diff --git a/filters/sheets/latex/export/latexexportAdaptor.cc b/filters/sheets/latex/export/latexexportAdaptor.cc
|
||||
index 25db7f8..d7cd7e4 100644
|
||||
--- a/filters/sheets/latex/export/latexexportAdaptor.cc
|
||||
+++ b/filters/sheets/latex/export/latexexportAdaptor.cc
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <latexexportAdaptor.h>
|
||||
#include "latexexportdialog.h"
|
||||
|
||||
+#ifdef WITH_QTDBUS
|
||||
LatexExportAdaptor::LatexExportAdaptor(LatexExportDialog* dia)
|
||||
: QDBusAbstractAdaptor(dia)
|
||||
{
|
||||
@@ -24,3 +25,4 @@ void LatexExportAdaptor::useDefaultConfig()
|
||||
{
|
||||
_dialog->accept();
|
||||
}
|
||||
+#endif
|
||||
diff --git a/filters/sheets/latex/export/latexexportAdaptor.h b/filters/sheets/latex/export/latexexportAdaptor.h
|
||||
index 8e43c55..fc64138 100644
|
||||
--- a/filters/sheets/latex/export/latexexportAdaptor.h
|
||||
+++ b/filters/sheets/latex/export/latexexportAdaptor.h
|
||||
@@ -8,6 +8,7 @@
|
||||
#ifndef __LATEXEXPORTADAPTOR_H__
|
||||
#define __LATEXEXPORTADAPTOR_H__
|
||||
|
||||
+#ifdef WITH_QTDBUS
|
||||
#include <QDBusAbstractAdaptor>
|
||||
#include <QObject>
|
||||
|
||||
@@ -29,5 +30,5 @@ public Q_SLOTS: // METHODS
|
||||
private:
|
||||
LatexExportDialog *_dialog;
|
||||
};
|
||||
-
|
||||
+#endif
|
||||
#endif /* __LATEXEXPORTADAPTOR_H__ */
|
||||
diff --git a/filters/sheets/latex/export/latexexportdialog.cc b/filters/sheets/latex/export/latexexportdialog.cc
|
||||
index f1feb3b..3f897f9 100644
|
||||
--- a/filters/sheets/latex/export/latexexportdialog.cc
|
||||
+++ b/filters/sheets/latex/export/latexexportdialog.cc
|
||||
@@ -9,7 +9,9 @@
|
||||
|
||||
#include <QDir>
|
||||
#include <QApplication>
|
||||
+#ifdef WITH_QTDBUS
|
||||
#include <QDBusConnection>
|
||||
+#endif
|
||||
#include <QButtonGroup>
|
||||
|
||||
#include <KLocalizedString>
|
||||
@@ -57,9 +59,10 @@ LatexExportDialog::LatexExportDialog(KoStore* inputStore, QWidget* parent)
|
||||
i = i + 1;
|
||||
}
|
||||
|
||||
+#ifdef WITH_QTDBUS
|
||||
new LatexExportAdaptor(this);
|
||||
QDBusConnection::sessionBus().registerObject("/filter/latex", this);
|
||||
-
|
||||
+#endif
|
||||
|
||||
/* All these items inserted must not be translated so they are inserted here
|
||||
* without i18n() method. */
|
||||
diff --git a/libs/main/KoApplicationAdaptor.cpp b/libs/main/KoApplicationAdaptor.cpp
|
||||
index 56044d1..4a68953 100644
|
||||
--- a/libs/main/KoApplicationAdaptor.cpp
|
||||
+++ b/libs/main/KoApplicationAdaptor.cpp
|
||||
@@ -18,6 +18,8 @@
|
||||
#include "KoPart.h"
|
||||
#include "KoView.h"
|
||||
|
||||
+#ifdef WITH_QTDBUS
|
||||
+
|
||||
KoApplicationAdaptor::KoApplicationAdaptor(KoApplication *parent)
|
||||
: QDBusAbstractAdaptor(parent)
|
||||
, m_application(parent)
|
||||
@@ -82,3 +84,4 @@ QStringList KoApplicationAdaptor::getWindows()
|
||||
}
|
||||
return lst;
|
||||
}
|
||||
+#endif
|
||||
diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
|
||||
index 7012a38..e4cde3e 100644
|
||||
--- a/libs/main/KoDocument.cpp
|
||||
+++ b/libs/main/KoDocument.cpp
|
||||
@@ -47,7 +47,7 @@
|
||||
#include <KLocalizedString>
|
||||
#include <KoNetAccess.h>
|
||||
#include <MainDebug.h>
|
||||
-#ifndef Q_OS_WIN
|
||||
+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
|
||||
#include <kdirnotify.h>
|
||||
#endif
|
||||
|
||||
@@ -412,7 +412,7 @@ public:
|
||||
m_file = m_originalFilePath;
|
||||
}
|
||||
} else {
|
||||
-#ifndef Q_OS_WIN
|
||||
+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
|
||||
::org::kde::KDirNotify::emitFilesAdded(QUrl::fromLocalFile(m_url.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash).path()));
|
||||
#endif
|
||||
|
||||
@@ -1154,7 +1154,7 @@ QString KoDocument::autoSaveFile(const QString &path) const
|
||||
|
||||
if (path.isEmpty()) {
|
||||
// Never saved?
|
||||
-#ifdef Q_OS_WIN
|
||||
+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
|
||||
// On Windows, use the temp location (https://bugs.kde.org/show_bug.cgi?id=314921)
|
||||
retval = QString("%1/.%2-%3-%4-autosave%5")
|
||||
.arg(QDir::tempPath())
|
||||
@@ -2594,7 +2594,7 @@ bool KoDocument::saveToUrl()
|
||||
d->m_originalFilePath.clear();
|
||||
return true; // Nothing to do
|
||||
}
|
||||
-#ifndef Q_OS_WIN
|
||||
+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
|
||||
else {
|
||||
if (d->m_uploadJob) {
|
||||
QFile::remove(d->m_uploadJob->srcUrl().toLocalFile());
|
||||
diff --git a/libs/main/KoPartAdaptor.cpp b/libs/main/KoPartAdaptor.cpp
|
||||
index 75dbdae..2bba73b 100644
|
||||
--- a/libs/main/KoPartAdaptor.cpp
|
||||
+++ b/libs/main/KoPartAdaptor.cpp
|
||||
@@ -15,6 +15,8 @@
|
||||
#include "KoView.h"
|
||||
#include <MainDebug.h>
|
||||
|
||||
+#ifdef WITH_QTDBUS
|
||||
+
|
||||
KoPartAdaptor::KoPartAdaptor(KoPart *doc)
|
||||
: QDBusAbstractAdaptor(doc)
|
||||
{
|
||||
@@ -242,3 +244,5 @@ void KoPartAdaptor::setDocumentInfoAbstract(const QString &text)
|
||||
{
|
||||
m_pDoc->document()->documentInfo()->setAboutInfo("comments", text);
|
||||
}
|
||||
+
|
||||
+#endif
|
||||
diff --git a/libs/main/KoViewAdaptor.cpp b/libs/main/KoViewAdaptor.cpp
|
||||
index 2dd5134..0ad42cb 100644
|
||||
--- a/libs/main/KoViewAdaptor.cpp
|
||||
+++ b/libs/main/KoViewAdaptor.cpp
|
||||
@@ -15,6 +15,8 @@
|
||||
#include <QAction>
|
||||
#include <QList>
|
||||
|
||||
+#ifdef WITH_QTDBUS
|
||||
+
|
||||
KoViewAdaptor::KoViewAdaptor(KoView *view)
|
||||
: QDBusAbstractAdaptor(view)
|
||||
{
|
||||
@@ -34,3 +36,5 @@ QStringList KoViewAdaptor::actions()
|
||||
}
|
||||
return tmp_actions;
|
||||
}
|
||||
+
|
||||
+#endif
|
||||
diff --git a/sheets/part/MapAdaptor.cpp b/sheets/part/MapAdaptor.cpp
|
||||
index 74e9e19..a00e070 100644
|
||||
--- a/sheets/part/MapAdaptor.cpp
|
||||
+++ b/sheets/part/MapAdaptor.cpp
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
using namespace Calligra::Sheets;
|
||||
|
||||
+#ifdef WITH_QTDBUS
|
||||
+
|
||||
MapAdaptor::MapAdaptor(Map *map)
|
||||
: QDBusAbstractAdaptor(map)
|
||||
{
|
||||
@@ -106,3 +108,5 @@ QString MapAdaptor::insertSheet(const QString &name)
|
||||
// out << DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
|
||||
// return true;
|
||||
// }
|
||||
+
|
||||
+#endif
|
||||
diff --git a/sheets/part/SheetAdaptor.cpp b/sheets/part/SheetAdaptor.cpp
|
||||
index 5d0d783..0166612 100644
|
||||
--- a/sheets/part/SheetAdaptor.cpp
|
||||
+++ b/sheets/part/SheetAdaptor.cpp
|
||||
@@ -33,6 +33,8 @@
|
||||
#include <KoPageFormat.h>
|
||||
#include <KoUnit.h>
|
||||
|
||||
+#ifdef WITH_QTDBUS
|
||||
+
|
||||
using namespace Calligra::Sheets;
|
||||
|
||||
SheetAdaptor::SheetAdaptor(Sheet *t)
|
||||
@@ -531,3 +533,5 @@ void SheetAdaptor::handleDamages(const QList<Damage *> &damages)
|
||||
}
|
||||
}
|
||||
}
|
||||
+
|
||||
+#endif
|
||||
diff --git a/sheets/part/ViewAdaptor.cpp b/sheets/part/ViewAdaptor.cpp
|
||||
index 0bad8c6..2f070f3 100644
|
||||
--- a/sheets/part/ViewAdaptor.cpp
|
||||
+++ b/sheets/part/ViewAdaptor.cpp
|
||||
@@ -31,6 +31,8 @@ using namespace Calligra::Sheets;
|
||||
*
|
||||
************************************************/
|
||||
|
||||
+#ifdef WITH_QTDBUS
|
||||
+
|
||||
ViewAdaptor::ViewAdaptor(View *t)
|
||||
: QDBusAbstractAdaptor(t)
|
||||
{
|
||||
@@ -239,3 +241,5 @@ void ViewAdaptor::setOutlineBorderColor(const QColor &color)
|
||||
command->add(*m_view->selection());
|
||||
command->execute();
|
||||
}
|
||||
+
|
||||
+#endif
|
||||
diff --git a/stage/part/KPrPresentationToolAdaptor.cpp b/stage/part/KPrPresentationToolAdaptor.cpp
|
||||
index ac035bb..9ea297b 100644
|
||||
--- a/stage/part/KPrPresentationToolAdaptor.cpp
|
||||
+++ b/stage/part/KPrPresentationToolAdaptor.cpp
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
#include <QMouseEvent>
|
||||
|
||||
+#ifdef WITH_QTDBUS
|
||||
+
|
||||
KPrPresentationToolAdaptor::KPrPresentationToolAdaptor(KPrPresentationTool *tool)
|
||||
: QDBusAbstractAdaptor(tool)
|
||||
, m_tool(tool)
|
||||
@@ -89,3 +91,5 @@ void KPrPresentationToolAdaptor::normalPresentation()
|
||||
{
|
||||
m_tool->normalPresentation();
|
||||
}
|
||||
+
|
||||
+#endif
|
||||
diff --git a/stage/part/KPrViewAdaptor.cpp b/stage/part/KPrViewAdaptor.cpp
|
||||
index cd42348..440b64a 100644
|
||||
--- a/stage/part/KPrViewAdaptor.cpp
|
||||
+++ b/stage/part/KPrViewAdaptor.cpp
|
||||
@@ -29,6 +29,8 @@
|
||||
#include <QTextDocument>
|
||||
#include <QUrl>
|
||||
|
||||
+#ifdef WITH_QTDBUS
|
||||
+
|
||||
KPrViewAdaptor::KPrViewAdaptor(KPrView *view)
|
||||
: KoViewAdaptor(view)
|
||||
, m_view(view)
|
||||
@@ -250,3 +252,5 @@ void KPrViewAdaptor::presentationActivated()
|
||||
{
|
||||
Q_EMIT presentationStarted(numPresentationPages());
|
||||
}
|
||||
+
|
||||
+#endif
|
||||
--
|
||||
2.48.1
|
||||
|
||||
Reference in New Issue
Block a user