summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-03-24 07:42:17 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-03-24 07:42:17 +0100
commit11ee88aed98350f2c08ed36c1daa802182c10a38 (patch)
tree4dab38c995299b9b742938387eb58995596b0e2a /app-office/calligra
parentapp-text/teckit: drop unused patches wrt bug #432144 (diff)
downloadgentoo-11ee88aed98350f2c08ed36c1daa802182c10a38.tar.gz
gentoo-11ee88aed98350f2c08ed36c1daa802182c10a38.tar.bz2
gentoo-11ee88aed98350f2c08ed36c1daa802182c10a38.zip
app-office/calligra: Fix build w/o plan
Closes: https://bugs.gentoo.org/651318 Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'app-office/calligra')
-rw-r--r--app-office/calligra/calligra-3.1.0-r2.ebuild2
-rw-r--r--app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch124
-rw-r--r--app-office/calligra/files/calligra-3.1.0-qt-5.11.patch108
3 files changed, 126 insertions, 108 deletions
diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild
index 2084d5f44db..b1da5f43076 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -159,6 +159,8 @@ src_prepare() {
sed -e "/add_subdirectory(plan)/s/#//" \
-e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
-i CMakeLists.txt || die
+
+ eapply "${FILESDIR}"/${P}-plan-qt-5.11.patch
fi
kde5_src_prepare
diff --git a/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch
new file mode 100644
index 00000000000..d63f5ccbe87
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch
@@ -0,0 +1,124 @@
+From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 18 Mar 2018 11:56:57 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
+
+Reviewers: #calligra:_3.0
+
+Tags: #calligra:_3.0
+
+Differential Revision: https://phabricator.kde.org/D11454
+---
+ plan/src/kptview.h | 1 +
+ plan/src/kptviewlist.cpp | 1 +
+ plan/src/libs/ui/kptaccountseditor.cpp | 1 +
+ plan/src/libs/ui/kptdocumentspanel.h | 1 +
+ plan/src/libs/ui/kptitemviewsettup.cpp | 2 +-
+ plan/src/libs/ui/kpttaskeditor.cpp | 1 +
+ plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
+ plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++
+ 15 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/plan/src/kptview.h b/plan/src/kptview.h
+index 44d11935e71..a98e55342db 100644
+--- a/plan/src/kptview.h
++++ b/plan/src/kptview.h
+@@ -28,6 +28,7 @@
+ #include "kptcontext.h"
+ #include "kptviewbase.h"
+
++#include <QActionGroup>
+ #include <QDockWidget>
+ #include <QMap>
+
+diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp
+index f34e702e055..0e6db7b2ffe 100644
+--- a/plan/src/kptviewlist.cpp
++++ b/plan/src/kptviewlist.cpp
+@@ -25,6 +25,7 @@
+ #include <QStyle>
+ #include <QBrush>
+ #include <QContextMenuEvent>
++#include <QHeaderView>
+ #include <QMenu>
+
+ #include <kmessagebox.h>
+diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp
+index 7991fafd779..54e3a87c94f 100644
+--- a/plan/src/libs/ui/kptaccountseditor.cpp
++++ b/plan/src/libs/ui/kptaccountseditor.cpp
+@@ -40,6 +40,7 @@
+ #include <QContextMenuEvent>
+ #include <QMenu>
+ #include <QAction>
++#include <QHeaderView>
+
+ #include <KLocalizedString>
+ #include <kactioncollection.h>
+diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h
+index 00ea3af80b2..491cb1ebb86 100644
+--- a/plan/src/libs/ui/kptdocumentspanel.h
++++ b/plan/src/libs/ui/kptdocumentspanel.h
+@@ -26,6 +26,7 @@
+
+ #include "kptdocuments.h"
+
++#include <QModelIndexList>
+ #include <QWidget>
+ #include <kundo2qstack.h>
+
+diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp
+index d1c3b1fc157..7c97a070b9a 100644
+--- a/plan/src/libs/ui/kptitemviewsettup.cpp
++++ b/plan/src/libs/ui/kptitemviewsettup.cpp
+@@ -25,9 +25,9 @@
+
+ #include "KoPageLayoutWidget.h"
+
++#include <QHeaderView>
+ #include <QPushButton>
+
+-
+ namespace KPlato
+ {
+
+diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp
+index 21546118d33..91db5acbb18 100644
+--- a/plan/src/libs/ui/kpttaskeditor.cpp
++++ b/plan/src/libs/ui/kpttaskeditor.cpp
+@@ -45,6 +45,7 @@
+ #include <QVBoxLayout>
+ #include <QDragMoveEvent>
+ #include <QAction>
++#include <QHeaderView>
+ #include <QMenu>
+
+ #include <kactionmenu.h>
+diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
+index 344ebc2b599..9146f06ab8c 100644
+--- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
++++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
+@@ -31,6 +31,7 @@
+ #include <KFile>
+
+ #include <QAction>
++#include <QHeaderView>
+ #include <QTreeView>
+ #include <QStandardItemModel>
+ #include <QModelIndex>
+diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
+index c9e17b748a9..b67e9848807 100644
+--- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
++++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
+@@ -23,6 +23,8 @@
+
+ #include <KoUnit.h>
+
++#include <QButtonGroup>
++
+ class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+ {
+ public:
+--
+2.16.2
+
diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
index 09236c41de0..bdbe4b6e855 100644
--- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
+++ b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
@@ -11,14 +11,6 @@ Differential Revision: https://phabricator.kde.org/D11454
---
libs/widgets/KoCsvImportDialog.cpp | 1 +
libs/widgets/KoPageLayoutWidget.cpp | 2 ++
- plan/src/kptview.h | 1 +
- plan/src/kptviewlist.cpp | 1 +
- plan/src/libs/ui/kptaccountseditor.cpp | 1 +
- plan/src/libs/ui/kptdocumentspanel.h | 1 +
- plan/src/libs/ui/kptitemviewsettup.cpp | 2 +-
- plan/src/libs/ui/kpttaskeditor.cpp | 1 +
- plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
- plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++
plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 +
plugins/formulashape/FormulaToolWidget.cpp | 1 +
sheets/dialogs/LayoutDialog.cpp | 1 +
@@ -51,106 +43,6 @@ index f91555ca262..a3816f96d8a 100644
class Q_DECL_HIDDEN KoPageLayoutWidget::Private
{
public:
-diff --git a/plan/src/kptview.h b/plan/src/kptview.h
-index 44d11935e71..a98e55342db 100644
---- a/plan/src/kptview.h
-+++ b/plan/src/kptview.h
-@@ -28,6 +28,7 @@
- #include "kptcontext.h"
- #include "kptviewbase.h"
-
-+#include <QActionGroup>
- #include <QDockWidget>
- #include <QMap>
-
-diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp
-index f34e702e055..0e6db7b2ffe 100644
---- a/plan/src/kptviewlist.cpp
-+++ b/plan/src/kptviewlist.cpp
-@@ -25,6 +25,7 @@
- #include <QStyle>
- #include <QBrush>
- #include <QContextMenuEvent>
-+#include <QHeaderView>
- #include <QMenu>
-
- #include <kmessagebox.h>
-diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp
-index 7991fafd779..54e3a87c94f 100644
---- a/plan/src/libs/ui/kptaccountseditor.cpp
-+++ b/plan/src/libs/ui/kptaccountseditor.cpp
-@@ -40,6 +40,7 @@
- #include <QContextMenuEvent>
- #include <QMenu>
- #include <QAction>
-+#include <QHeaderView>
-
- #include <KLocalizedString>
- #include <kactioncollection.h>
-diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h
-index 00ea3af80b2..491cb1ebb86 100644
---- a/plan/src/libs/ui/kptdocumentspanel.h
-+++ b/plan/src/libs/ui/kptdocumentspanel.h
-@@ -26,6 +26,7 @@
-
- #include "kptdocuments.h"
-
-+#include <QModelIndexList>
- #include <QWidget>
- #include <kundo2qstack.h>
-
-diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp
-index d1c3b1fc157..7c97a070b9a 100644
---- a/plan/src/libs/ui/kptitemviewsettup.cpp
-+++ b/plan/src/libs/ui/kptitemviewsettup.cpp
-@@ -25,9 +25,9 @@
-
- #include "KoPageLayoutWidget.h"
-
-+#include <QHeaderView>
- #include <QPushButton>
-
--
- namespace KPlato
- {
-
-diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp
-index 21546118d33..91db5acbb18 100644
---- a/plan/src/libs/ui/kpttaskeditor.cpp
-+++ b/plan/src/libs/ui/kpttaskeditor.cpp
-@@ -45,6 +45,7 @@
- #include <QVBoxLayout>
- #include <QDragMoveEvent>
- #include <QAction>
-+#include <QHeaderView>
- #include <QMenu>
-
- #include <kactionmenu.h>
-diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-index 344ebc2b599..9146f06ab8c 100644
---- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-+++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-@@ -31,6 +31,7 @@
- #include <KFile>
-
- #include <QAction>
-+#include <QHeaderView>
- #include <QTreeView>
- #include <QStandardItemModel>
- #include <QModelIndex>
-diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-index c9e17b748a9..b67e9848807 100644
---- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-@@ -23,6 +23,8 @@
-
- #include <KoUnit.h>
-
-+#include <QButtonGroup>
-+
- class Q_DECL_HIDDEN KoPageLayoutWidget::Private
- {
- public:
diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
index c0d5136f09e..d2a772e83c2 100644
--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp