From e9dbfd4ab9cef854d7fc84794ddab5b5fd30b316 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 26 Oct 2019 00:18:31 +1000 Subject: [PATCH] Calligra: enable build for Okular plugins * add patch for poppler-076 --- app-office/calligra/calligra-3.1.0.recipe | 118 ++++- .../calligra/patches/calligra-3.1.0.patchset | 430 ++++++------------ .../calligra/patches/poppler-76.patchset | 275 +++++++++++ 3 files changed, 508 insertions(+), 315 deletions(-) create mode 100644 app-office/calligra/patches/poppler-76.patchset diff --git a/app-office/calligra/calligra-3.1.0.recipe b/app-office/calligra/calligra-3.1.0.recipe index ee3a27019..630a76737 100644 --- a/app-office/calligra/calligra-3.1.0.recipe +++ b/app-office/calligra/calligra-3.1.0.recipe @@ -6,11 +6,14 @@ HOMEPAGE="https://www.calligra.org/" COPYRIGHT="2010-2018 KDE Organisation" LICENSE="GNU LGPL v2 GNU GPL v2" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/KDE/calligra/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="33054f2309a3e3d274100d1485a46f50ca227cfafa66c34a3483c550ccc84ef4" SOURCE_FILENAME="calligra-$portVersion.tar.gz" -PATCHES="calligra-$portVersion.patchset" +PATCHES=" + calligra-$portVersion.patchset + poppler-76.patchset + " ADDITIONAL_FILES=" karbon.rdef.in plan.rdef.in @@ -22,12 +25,58 @@ ADDITIONAL_FILES=" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="16.0.0" + PROVIDES=" calligra$secondaryArchSuffix = $portVersion + lib:libbasicflakes$secondaryArchSuffix = $libVersion + lib:libcalligrasheetscommon$secondaryArchSuffix = $libVersion + lib:libcalligrasheetsodf$secondaryArchSuffix = $libVersion + lib:libcalligrastageprivate$secondaryArchSuffix = $libVersion + lib:libflake$secondaryArchSuffix = $libVersion + lib:libkarboncommon$secondaryArchSuffix = $libVersion + lib:libkarbonui$secondaryArchSuffix = $libVersion + lib:libkdeinit5_calligraplan$secondaryArchSuffix = $libVersion + lib:libkdeinit5_calligraplanwork$secondaryArchSuffix = $libVersion + lib:libkdeinit5_calligrasheets$secondaryArchSuffix = $libVersion + lib:libkdeinit5_calligrastage$secondaryArchSuffix = $libVersion + lib:libkdeinit5_calligrawords$secondaryArchSuffix = $libVersion + lib:libkdeinit5_karbon$secondaryArchSuffix = $libVersion + lib:libkoformula$secondaryArchSuffix = $libVersion + lib:libkomain$secondaryArchSuffix = $libVersion + lib:libkomsooxml$secondaryArchSuffix = $libVersion + lib:libkoodf$secondaryArchSuffix = $libVersion + lib:libkoodf2$secondaryArchSuffix = $libVersion + lib:libkoodfreader$secondaryArchSuffix = $libVersion + lib:libkopageapp$secondaryArchSuffix = $libVersion + lib:libkoplugin$secondaryArchSuffix = $libVersion + lib:libkostore$secondaryArchSuffix = $libVersion + lib:libkotext$secondaryArchSuffix = $libVersion + lib:libkotextlayout$secondaryArchSuffix = $libVersion + lib:libkovectorimage$secondaryArchSuffix = $libVersion + lib:libkoversion$secondaryArchSuffix = $libVersion + lib:libkowidgets$secondaryArchSuffix = $libVersion + lib:libkowidgetutils$secondaryArchSuffix = $libVersion + lib:libkowv2$secondaryArchSuffix = $libVersion + lib:libkplatokernel$secondaryArchSuffix = $libVersion + lib:libkplatomodels$secondaryArchSuffix = $libVersion + lib:libkplatoui$secondaryArchSuffix = $libVersion + lib:libkundo2$secondaryArchSuffix = $libVersion + lib:libpigmentcms$secondaryArchSuffix = $libVersion + lib:libplankundo2$secondaryArchSuffix = $libVersion + lib:libplanmain$secondaryArchSuffix = $libVersion + lib:libplanodf$secondaryArchSuffix = $libVersion + lib:libplanplugin$secondaryArchSuffix = $libVersion + lib:libplanprivate$secondaryArchSuffix = $libVersion + lib:libplanstore$secondaryArchSuffix = $libVersion + lib:libplanwidgets$secondaryArchSuffix = $libVersion + lib:libplanwidgetutils$secondaryArchSuffix = $libVersion + lib:libplanworkfactory$secondaryArchSuffix = $libVersion + lib:librtfreader$secondaryArchSuffix = $libVersion + lib:libwordsprivate$secondaryArchSuffix = $libVersion " REQUIRES=" haiku$secondaryArchSuffix - cmd:dbus_launch lib:libboost_system$secondaryArchSuffix lib:libetonyek_0.1$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix @@ -91,7 +140,7 @@ REQUIRES=" lib:liblcms2$secondaryArchSuffix lib:libodfgen_0.1$secondaryArchSuffix lib:libphonon4qt5$secondaryArchSuffix - lib:libpoppler${secondaryArchSuffix}_qt5 + lib:libpoppler_qt5$secondaryArchSuffix >= 1.19 lib:libqca_qt5$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5WebKitWidgets$secondaryArchSuffix @@ -103,10 +152,21 @@ REQUIRES=" lib:libz$secondaryArchSuffix " +PROVIDES_okular_plugins=" + calligra${secondaryArchSuffix}_okular_plugins = $portVersion + lib:libkookulargenerator_odp$secondaryArchSuffix = $libVersion + lib:libkookulargenerator_odt$secondaryArchSuffix = $libVersion + " + +REQUIRES_okular_plugins=" + calligra$secondaryArchSuffix == $portVersion base + lib:libOkular5Core$secondaryArchSuffix + $REQUIRES + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules >= 5.45 - poppler${secondaryArchSuffix}_qt5 + extra_cmake_modules >= 5.55 devel:eigen$secondaryArchSuffix devel:libboost_system$secondaryArchSuffix devel:libetonyek_0.1$secondaryArchSuffix @@ -170,11 +230,12 @@ BUILD_REQUIRES=" devel:liblangtag$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix devel:libodfgen_0.1$secondaryArchSuffix + devel:libOkular5Core$secondaryArchSuffix devel:libphonon4qt5$secondaryArchSuffix - devel:libpoppler$secondaryArchSuffix + devel:libpoppler$secondaryArchSuffix >= 87 + devel:libpoppler_qt5$secondaryArchSuffix >= 1.19 devel:libqca$secondaryArchSuffix >= 2 - devel:libQt5Core$secondaryArchSuffix >= 5.7 - devel:libQt5DBus$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix >= 5.13 devel:libQt5WebKitWidgets$secondaryArchSuffix devel:librevenge_0.0$secondaryArchSuffix devel:libvisio_0.1$secondaryArchSuffix @@ -186,6 +247,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix >= 5 cmd:make cmd:perl cmd:pkg_config$secondaryArchSuffix @@ -198,18 +260,21 @@ BUILD() cd build cmake .. \ + -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/develop/headers \ - -DCMAKE_INSTALL_PREFIX=$appsDir/Calligra \ - -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ + -DICONV_INCLUDE_DIR=/system/$relativeIncludeDir \ -DKDE_INSTALL_DATAROOTDIR=$dataDir \ - -DPRODUCTSET="karbon plan sheets words stage" \ - -DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT -DQT_NO_DBUS=1" \ + -DPRODUCTSET="karbon plan sheets words stage okular" \ + -DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT" \ -DRELEASE_BUILD=ON \ - -DBUILD_UNMAINTAINED=ON + -DBUILD_UNMAINTAINED=ON \ + -DWITH_Okular5=ON make $jobArgs } @@ -219,16 +284,14 @@ INSTALL() cd build make install - mkdir -p $binDir - cd $appsDir/Calligra - mv bin/calligrasheets Sheets - mv bin/calligrawords Words - mv bin/calligrastage Stage - mv bin/calligraplan Plan - mv bin/karbon Karbon + mv calligrasheets Sheets + mv calligrawords Words + mv calligrastage Stage + mv calligraplan Plan + mv karbon Karbon - rm -rf bin + rm -rf $appsDir/Calligra/{etc,calligraplanwork} mkdir -p "$dataDir/deskbar/menu/Applications/Calligra" @@ -295,6 +358,15 @@ INSTALL() addResourcesToBinaries $sourceDir/build/plan.rdef $appsDir/Calligra/Plan addAppDeskbarSymlink $appsDir/Calligra/Plan "Calligra/Plan" + + packageEntries okular_plugins \ + $addOnsDir/Qt5/okular \ + $libDir/libkookularGenerator_odp.so \ + $libDir/libkookularGenerator_odp.so.${libVersion%.*.*} \ + $libDir/libkookularGenerator_odp.so.${libVersion} \ + $libDir/libkookularGenerator_odt.so \ + $libDir/libkookularGenerator_odt.so.${libVersion%.*.*} \ + $libDir/libkookularGenerator_odt.so.${libVersion} } TEST() diff --git a/app-office/calligra/patches/calligra-3.1.0.patchset b/app-office/calligra/patches/calligra-3.1.0.patchset index 271546fb8..d594ad44c 100644 --- a/app-office/calligra/patches/calligra-3.1.0.patchset +++ b/app-office/calligra/patches/calligra-3.1.0.patchset @@ -1,23 +1,26 @@ -From 84ee90ad9dd504621f904b5a41269b607650e6b9 Mon Sep 17 00:00:00 2001 +From 46cfb03d019146e003736c0d280053164299fa51 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 +Date: Fri, 25 Oct 2019 22:52:53 +1000 +Subject: Disable DBUS for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index 65d0cb1..a27044f 100644 +index 65d0cb1..eddd6b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -324,6 +324,9 @@ endif() - - set(HAVE_OPENGL ${Qt5OpenGL_FOUND}) +@@ -364,6 +364,12 @@ add_definitions( + -DQT_NO_CAST_TO_ASCII + ) +if(HAIKU) -+ unset(Qt5DBus_FOUND) ++ add_definitions( ++ -DQT_NO_DBUS ++ ) +endif() - - if (GHNS) - find_package(Attica 3.0) ++ + # only with this definition will all the FOO_TEST_EXPORT macro do something + # 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/filters/sheets/CMakeLists.txt b/filters/sheets/CMakeLists.txt index e84a1f3..90e708a 100644 --- a/filters/sheets/CMakeLists.txt @@ -46,21 +49,24 @@ index 52f2c12..89907b0 100644 add_subdirectory( kross ) endif () +diff --git a/libs/main/CMakeLists.txt b/libs/main/CMakeLists.txt +index 4e8f04c..d0fb4e6 100644 +--- a/libs/main/CMakeLists.txt ++++ b/libs/main/CMakeLists.txt +@@ -71,7 +71,7 @@ set(komain_LIB_SRCS + Calligra2Migration.cpp + ) + +-if( Qt5DBus_FOUND ) ++if( Qt5DBus_FOUND AND NOT HAIKU ) + set(komain_LIB_SRCS ${komain_LIB_SRCS} + KoApplicationAdaptor.cpp + KoViewAdaptor.cpp diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp -index 68a9b3d..a6cc484 100644 +index 68a9b3d..3d1a068 100644 --- a/libs/main/KoDocument.cpp +++ b/libs/main/KoDocument.cpp -@@ -57,7 +57,9 @@ - #include - #include - #include -+#ifndef QT_NO_DBUS - #include -+#endif - #include - - #include -@@ -417,8 +419,9 @@ public: +@@ -417,8 +417,9 @@ public: } else { @@ -71,6 +77,56 @@ index 68a9b3d..a6cc484 100644 m_uploadJob = 0; document->setModified( false ); emit document->completed(); +diff --git a/plan/src/libs/main/CMakeLists.txt b/plan/src/libs/main/CMakeLists.txt +index 5a27cca..8a7f2ea 100644 +--- a/plan/src/libs/main/CMakeLists.txt ++++ b/plan/src/libs/main/CMakeLists.txt +@@ -51,7 +51,7 @@ set(komain_LIB_SRCS + Calligra2Migration.cpp + ) + +-if( Qt5DBus_FOUND ) ++if( Qt5DBus_FOUND AND NOT HAIKU ) + set(komain_LIB_SRCS ${komain_LIB_SRCS} + KoApplicationAdaptor.cpp + KoViewAdaptor.cpp +diff --git a/plan/src/libs/main/KoDocument.cpp b/plan/src/libs/main/KoDocument.cpp +index 03ad374..fedeb4e 100644 +--- a/plan/src/libs/main/KoDocument.cpp ++++ b/plan/src/libs/main/KoDocument.cpp +@@ -417,8 +417,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/CMakeLists.txt b/sheets/CMakeLists.txt +index d5b6241..2cdcb12 100644 +--- a/sheets/CMakeLists.txt ++++ b/sheets/CMakeLists.txt +@@ -144,7 +144,7 @@ set (functions_DIR_SRCS + functions/helper.cpp + ) + +-if(Qt5DBus_FOUND) ++if(Qt5DBus_FOUND AND NOT HAIKU) + set (interfaces_DIR_SRCS + interfaces/MapAdaptor.cpp + interfaces/SheetAdaptor.cpp +@@ -239,7 +239,7 @@ set (calligrasheetscommon_LIB_SRCS + ${ui_DIR_SRCS} + ) + +-if(Qt5DBus_FOUND) ++if(Qt5DBus_FOUND AND NOT HAIKU) + set (calligrasheetscommon_LIB_SRCS + ${calligrasheetscommon_LIB_SRCS} + ${interfaces_DIR_SRCS} diff --git a/sheets/plugins/CMakeLists.txt b/sheets/plugins/CMakeLists.txt index b18b166..c576b92 100644 --- a/sheets/plugins/CMakeLists.txt @@ -82,272 +138,27 @@ index b18b166..c576b92 100644 +if (SHOULD_BUILD_FEATURE_SCRIPTING AND NOT HAIKU) add_subdirectory( scripting ) endif () +diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt +index b678457..3a069dd 100644 +--- a/stage/part/CMakeLists.txt ++++ b/stage/part/CMakeLists.txt +@@ -133,7 +133,7 @@ set( calligrastageprivate_LIB_SRCS + tools/KPrPlaceholderToolFactory.cpp + ) + +-if(Qt5DBus_FOUND) ++if(Qt5DBus_FOUND AND NOT HAIKU) + set( calligrastageprivate_LIB_SRCS + ${calligrastageprivate_LIB_SRCS} + KPrViewAdaptor.cpp -- -2.16.4 +2.23.0 -From 2e1de2206117e8df0ca7378e37499c9904d8f37b Mon Sep 17 00:00:00 2001 +From b6ea306dad2ba6bd20d9c6be1adf951ebcf9e254 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.4 - - -From 5ec83657f083851c0bf4cf92a981a0dfcdd09483 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 -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 - #include - -+#ifdef Q_OS_HAIKU -+#define QT_NO_DBUS -+#endif -+ - #ifndef QT_NO_DBUS - #include - #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 -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 -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 - #include - -+#ifdef Q_OS_HAIKU -+#define QT_NO_DBUS -+#endif -+ - #ifndef QT_NO_DBUS - #include - #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 -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.4 - - -From d43341902395c6898ef0c6239b0c213bd7fc6c12 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 - #include - #include -+ -+#ifdef Q_OS_HAIKU -+#define QT_NO_DBUS -+#endif -+ - #ifndef QT_NO_DBUS - #include - #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 - #include - #include -+#ifndef Q_OS_HAIKU - #include -+#endif - #include - - #include -@@ -69,6 +71,11 @@ - #include - #include - #include -+ -+#ifdef Q_OS_HAIKU -+#define QT_NO_DBUS -+#endif -+ - #ifndef QT_NO_DBUS - #include - #include -@@ -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.4 - - -From 257f9881be396e6d0cd2f5d37c26ef27bb85549c Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 17 Jun 2018 23:18:01 +1000 -Subject: Fix build for Qt 5.11 +Date: Fri, 25 Oct 2019 22:53:43 +1000 +Subject: Add missing includes diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp @@ -424,19 +235,16 @@ index 00ea3af..491cb1e 100644 #include diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp -index d1c3b1f..7c97a07 100644 +index d1c3b1f..ccf6177 100644 --- a/plan/src/libs/ui/kptitemviewsettup.cpp +++ b/plan/src/libs/ui/kptitemviewsettup.cpp -@@ -25,9 +25,9 @@ +@@ -25,6 +25,7 @@ #include "KoPageLayoutWidget.h" +#include #include -- - namespace KPlato - { diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp index 5f79abf..d08d7f2 100644 @@ -512,7 +320,7 @@ index a0a9832..7d7db53 100644 #include #include diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp -index 2e39f59..60887e4 100644 +index ae743da..69ed856 100644 --- a/stage/part/KPrPresentationTool.cpp +++ b/stage/part/KPrPresentationTool.cpp @@ -24,6 +24,7 @@ @@ -549,5 +357,43 @@ index e38599a..7e8b2d5 100644 : m_state(state) { -- -2.16.4 +2.23.0 + + +From 3c2b5ce916c7fb74a20f1ee72576f27ddbcdf701 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 25 Oct 2019 23:43:09 +1000 +Subject: Don't use kdirnotify include without DBUS + + +diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp +index 3d1a068..a6cc484 100644 +--- a/libs/main/KoDocument.cpp ++++ b/libs/main/KoDocument.cpp +@@ -57,7 +57,9 @@ + #include + #include + #include ++#ifndef QT_NO_DBUS + #include ++#endif + #include + + #include +diff --git a/plan/src/libs/main/KoDocument.cpp b/plan/src/libs/main/KoDocument.cpp +index fedeb4e..ac5791f 100644 +--- a/plan/src/libs/main/KoDocument.cpp ++++ b/plan/src/libs/main/KoDocument.cpp +@@ -57,7 +57,9 @@ + #include + #include + #include ++#ifndef QT_NO_DBUS + #include ++#endif + #include + + #include +-- +2.23.0 diff --git a/app-office/calligra/patches/poppler-76.patchset b/app-office/calligra/patches/poppler-76.patchset new file mode 100644 index 000000000..3b398615f --- /dev/null +++ b/app-office/calligra/patches/poppler-76.patchset @@ -0,0 +1,275 @@ +From d45159790f175dcffde6e6c32d0dd7484575b123 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 25 Oct 2019 22:55:18 +1000 +Subject: Fix for poppler-076 + + +diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +index c3e96b0..e910dae 100644 +--- a/filters/karbon/pdf/PdfImport.cpp ++++ b/filters/karbon/pdf/PdfImport.cpp +@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt + SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile()); + if (dev->isOk()) { + int rotate = 0; +- GBool useMediaBox = gTrue; +- GBool crop = gFalse; +- GBool printing = gFalse; ++ bool useMediaBox = true; ++ bool crop = false; ++ bool printing = false; + pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing); + dev->dumpContent(); + } +@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt + delete globalParams; + globalParams = 0; + +- // check for memory leaks +- Object::memCheck(stderr); +- + return KoFilter::OK; + } + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 931917a..52bb37d 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -39,7 +39,7 @@ class SvgOutputDev::Private + { + public: + Private(const QString &fname) +- : svgFile(fname), defs(0), body(0), state(gTrue) ++ : svgFile(fname), defs(0), body(0), state(true) + , brush(Qt::SolidPattern) {} + + ~Private() { +@@ -52,7 +52,7 @@ public: + QString defsData; + QTextStream * defs; + QTextStream * body; +- GBool state; ++ bool state; + QSizeF pageSize; + QPen pen; + QBrush brush; +@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName) + : d(new Private(fileName)) + { + if (! d->svgFile.open(QIODevice::WriteOnly)) { +- d->state = gFalse; ++ d->state = false; + return; + } + +@@ -75,24 +75,24 @@ SvgOutputDev::~SvgOutputDev() + delete d; + } + +-GBool SvgOutputDev::isOk() ++bool SvgOutputDev::isOk() + { + return d->state; + } + +-GBool SvgOutputDev::upsideDown() ++bool SvgOutputDev::upsideDown() + { +- return gTrue; ++ return true; + } + +-GBool SvgOutputDev::useDrawChar() ++bool SvgOutputDev::useDrawChar() + { +- return gFalse; ++ return false; + } + +-GBool SvgOutputDev::interpretType3Chars() ++bool SvgOutputDev::interpretType3Chars() + { +- return gFalse; ++ return false; + } + + void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/) +@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix) + .arg(matrix.dx()) .arg(matrix.dy()); + } + +-QString SvgOutputDev::convertMatrix(double * matrix) ++QString SvgOutputDev::convertMatrix(const double * matrix) + { + return QString("matrix(%1 %2 %3 %4 %5 %6)") + .arg(matrix[0]).arg(matrix[1]) +@@ -387,7 +387,7 @@ QString SvgOutputDev::printStroke() + return stroke; + } + +-void SvgOutputDev::drawString(GfxState * state, GooString * s) ++void SvgOutputDev::drawString(GfxState * state, const GooString * s) + { + int render = state->getRender(); + // check for invisible text -- this is used by Acrobat Capture +@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + + QString str; + +- char * p = s->getCString(); ++ const char * p = s->c_str(); + int len = s->getLength(); + CharCode code; + Unicode *u = nullptr; +@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + double x = state->getCurX(); + double y = state->getCurY(); + +- double * ctm = state->getCTM(); ++ const double * ctm = state->getCTM(); + QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + + QMatrix mirror; +@@ -451,11 +451,11 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + *d->body << " y=\"" << y << "px\""; + + if (font && font->getFamily()) { +- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; +- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() ); ++ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\""; ++ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() ); + } else if (font && font->getName()) { +- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; +- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() ); ++ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\""; ++ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() ); + } + *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\""; + +@@ -474,9 +474,9 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + *d->body << "" << endl; + } + +-void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, ++void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- int *maskColors, GBool /*inlineImg*/) ++ bool /*interpolate*/, int *maskColors, bool inlineImg) + { + ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); +@@ -488,7 +488,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + if (maskColors) { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +- Guchar * pix = imgStr->getLine(); ++ unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + + for (int x = 0; x < width; x++) { +@@ -507,7 +507,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + } else { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +- Guchar * pix = imgStr->getLine(); ++ unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + } + +@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + return; + } + +- double * ctm = state->getCTM(); ++ const double * ctm = state->getCTM(); + QMatrix m; + m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); + +@@ -543,10 +543,3 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + delete imgStr; + } + +-void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, +- int width, int height, GfxImageColorMap *colorMap, +- GBool /*interpolate*/, int *maskColors, GBool inlineImg) +-{ +- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); +-} +- +diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h +index 85fe55d..df2805c 100644 +--- a/filters/karbon/pdf/SvgOutputDev.h ++++ b/filters/karbon/pdf/SvgOutputDev.h +@@ -44,47 +44,44 @@ public: + explicit SvgOutputDev(const QString &fileName); + virtual ~SvgOutputDev(); + +- GBool isOk(); ++ bool isOk(); + +- virtual GBool upsideDown(); +- virtual GBool useDrawChar(); +- virtual GBool interpretType3Chars(); +- virtual void startPage(int pageNum, GfxState *state, XRef *xref); +- virtual void endPage(); ++ bool upsideDown() override; ++ bool useDrawChar() override; ++ bool interpretType3Chars() override; ++ void startPage(int pageNum, GfxState *state, XRef *xref) override; ++ void endPage() override; + + // path painting +- virtual void stroke(GfxState * state); +- virtual void fill(GfxState * state); +- virtual void eoFill(GfxState *state); ++ void stroke(GfxState * state) override; ++ void fill(GfxState * state) override; ++ void eoFill(GfxState *state) override; + + // text +- virtual void drawString(GfxState * state, GooString * s); ++ void drawString(GfxState * state, const GooString * s) override; + + // images +- virtual void drawImage(GfxState *state, Object *ref, Stream *str, ++ void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- int *maskColors, GBool inlineImg); +- virtual void drawImage(GfxState *state, Object *ref, Stream *str, +- int width, int height, GfxImageColorMap *colorMap, +- GBool interpolate, int *maskColors, GBool inlineImg); ++ bool interpolate, int *maskColors, bool inlineImg) override; + + // styles +- virtual void updateAll(GfxState *state); +- virtual void updateFillColor(GfxState *state); +- virtual void updateStrokeColor(GfxState *state); +- virtual void updateFillOpacity(GfxState *state); +- virtual void updateStrokeOpacity(GfxState *state); +- virtual void updateLineJoin(GfxState *state); +- virtual void updateLineCap(GfxState *state); +- virtual void updateMiterLimit(GfxState *state); +- virtual void updateLineWidth(GfxState *state); ++ void updateAll(GfxState *state) override; ++ void updateFillColor(GfxState *state) override; ++ void updateStrokeColor(GfxState *state) override; ++ void updateFillOpacity(GfxState *state) override; ++ void updateStrokeOpacity(GfxState *state) override; ++ void updateLineJoin(GfxState *state) override; ++ void updateLineCap(GfxState *state) override; ++ void updateMiterLimit(GfxState *state) override; ++ void updateLineWidth(GfxState *state) override; + + /// Dumps content to svg file + void dumpContent(); + private: + QString convertPath(GfxPath *path); + QString convertMatrix(const QMatrix &matrix); +- QString convertMatrix(double * matrix); ++ QString convertMatrix(const double * matrix); + QString printFill(); + QString printStroke(); + +-- +2.23.0 +