From 167dc67144fa0cb030bc06533a6fc217373a5e45 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 18 Jun 2018 00:31:16 +1000 Subject: [PATCH] Calligra: Fix build with Qt 5.11 --- app-office/calligra/calligra-3.1.0.recipe | 2 +- .../calligra/patches/calligra-3.1.0.patchset | 212 +++++++++++++++++- 2 files changed, 205 insertions(+), 9 deletions(-) diff --git a/app-office/calligra/calligra-3.1.0.recipe b/app-office/calligra/calligra-3.1.0.recipe index 911f87ffe..59f509201 100644 --- a/app-office/calligra/calligra-3.1.0.recipe +++ b/app-office/calligra/calligra-3.1.0.recipe @@ -6,7 +6,7 @@ HOMEPAGE="https://www.calligra.org/" COPYRIGHT="2010-2018 KDE Organisation" LICENSE="GNU LGPL v2 GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/KDE/calligra/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="33054f2309a3e3d274100d1485a46f50ca227cfafa66c34a3483c550ccc84ef4" SOURCE_FILENAME="calligra-$portVersion.tar.gz" diff --git a/app-office/calligra/patches/calligra-3.1.0.patchset b/app-office/calligra/patches/calligra-3.1.0.patchset index e689916f2..15eea917e 100644 --- a/app-office/calligra/patches/calligra-3.1.0.patchset +++ b/app-office/calligra/patches/calligra-3.1.0.patchset @@ -1,4 +1,4 @@ -From 96633406ef031a9ab0f4c3b745be693eb339b29b Mon Sep 17 00:00:00 2001 +From 17a82f4674306171bfa74e76ed19ccaaf59c1fa4 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 @@ -83,10 +83,10 @@ index b18b166..c576b92 100644 add_subdirectory( scripting ) endif () -- -2.16.2 +2.16.4 -From 5bccfdd83a76b02dbb30a413e79cc37dffc65892 Mon Sep 17 00:00:00 2001 +From 38cdd4424913b0150ff1113b4899b63cc5600df5 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 @@ -103,10 +103,10 @@ index bb8a192..3b7ad36 100644 endif() -- -2.16.2 +2.16.4 -From c550bb67db39f26c47d9ecb5de2dad506f5f4e56 Mon Sep 17 00:00:00 2001 +From 22bc3019f5144278f3404c932eed4f20f5c1e691 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 @@ -278,10 +278,10 @@ index bebcc9a..eaccffa 100644 class KPrViewAdaptor; #endif -- -2.16.2 +2.16.4 -From 21a19b5d4e2dbb96e4d793e5f5cb021095ded757 Mon Sep 17 00:00:00 2001 +From 1144a88d5a23d398b565868ca1d939e06c0e885b 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 @@ -341,5 +341,201 @@ index 03ad374..aa7281e 100644 document->setModified( false ); emit document->completed(); -- -2.16.2 +2.16.4 + + +From 5bdcc021524182e82dbc00ed0b91fb2ff1fa57b4 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 + + +diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp +index 0ffdcf6..cdca006 100644 +--- a/libs/widgets/KoCsvImportDialog.cpp ++++ b/libs/widgets/KoCsvImportDialog.cpp +@@ -21,6 +21,7 @@ + #include "KoCsvImportDialog.h" + + // Qt ++#include + #include + #include + +diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp +index f91555c..2b9d044 100644 +--- a/libs/widgets/KoPageLayoutWidget.cpp ++++ b/libs/widgets/KoPageLayoutWidget.cpp +@@ -19,6 +19,8 @@ + + #include "KoPageLayoutWidget.h" + ++#include ++ + #include + + #include +diff --git a/plan/src/kptview.h b/plan/src/kptview.h +index 44d1193..a98e553 100644 +--- a/plan/src/kptview.h ++++ b/plan/src/kptview.h +@@ -28,6 +28,7 @@ + #include "kptcontext.h" + #include "kptviewbase.h" + ++#include + #include + #include + +diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp +index f34e702..0e6db7b 100644 +--- a/plan/src/kptviewlist.cpp ++++ b/plan/src/kptviewlist.cpp +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + #include +diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp +index 7991faf..54e3a87 100644 +--- a/plan/src/libs/ui/kptaccountseditor.cpp ++++ b/plan/src/libs/ui/kptaccountseditor.cpp +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #include + #include +diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h +index 00ea3af..491cb1e 100644 +--- a/plan/src/libs/ui/kptdocumentspanel.h ++++ b/plan/src/libs/ui/kptdocumentspanel.h +@@ -26,6 +26,7 @@ + + #include "kptdocuments.h" + ++#include + #include + #include + +diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp +index d1c3b1f..7c97a07 100644 +--- a/plan/src/libs/ui/kptitemviewsettup.cpp ++++ b/plan/src/libs/ui/kptitemviewsettup.cpp +@@ -25,9 +25,9 @@ + + #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 +--- a/plan/src/libs/ui/kpttaskeditor.cpp ++++ b/plan/src/libs/ui/kpttaskeditor.cpp +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + #include + + #include +diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp +index 344ebc2..9146f06 100644 +--- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp ++++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp +@@ -31,6 +31,7 @@ + #include + + #include ++#include + #include + #include + #include +diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp +index c9e17b7..b67e984 100644 +--- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp ++++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp +@@ -23,6 +23,8 @@ + + #include + ++#include ++ + class Q_DECL_HIDDEN KoPageLayoutWidget::Private + { + public: +diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp +index c0d5136..d2a772e 100644 +--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp ++++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp +@@ -24,6 +24,7 @@ + + // Qt + #include ++#include + + // Calligra + #include +diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp +index ed10919..8f52177 100644 +--- a/plugins/formulashape/FormulaToolWidget.cpp ++++ b/plugins/formulashape/FormulaToolWidget.cpp +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) +diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp +index a0a9832..7d7db53 100644 +--- a/sheets/dialogs/LayoutDialog.cpp ++++ b/sheets/dialogs/LayoutDialog.cpp +@@ -36,6 +36,7 @@ + #include + + #include ++#include + #include + #include + #include +diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp +index d64208c..bfddb3a 100644 +--- a/words/part/dialogs/KWAnchoringProperties.cpp ++++ b/words/part/dialogs/KWAnchoringProperties.cpp +@@ -35,6 +35,7 @@ + + #include + ++#include + #include + + const int KWAnchoringProperties::vertRels[4][20] = { +diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp +index e38599a..7e8b2d5 100644 +--- a/words/part/dialogs/KWRunAroundProperties.cpp ++++ b/words/part/dialogs/KWRunAroundProperties.cpp +@@ -28,6 +28,8 @@ + + #include + ++#include ++ + KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) + : m_state(state) + { +-- +2.16.4