Fix build with upcoming Qt5 update

This commit is contained in:
rsadowski 2020-02-25 18:08:07 +00:00
parent 08cb9b929a
commit 39da989220
10 changed files with 139 additions and 2 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.38 2020/01/02 20:30:04 kili Exp $
# $OpenBSD: Makefile,v 1.39 2020/02/25 18:08:07 rsadowski Exp $
COMMENT = K Desktop Environment, office suite
HOMEPAGE = https://www.calligra.org
VERSION = 3.1.0
DISTNAME = calligra-${VERSION}
CATEGORIES = editors
REVISION = 9
REVISION = 10
DIST_SUBDIR = kde
MASTER_SITES = ${MASTER_SITE_KDE:=stable/calligra/${VERSION}/}

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-libs_widgets_KoCsvImportDialog_cpp,v 1.1 2020/02/25 18:08:07 rsadowski Exp $
Unbreak with Qt 5.13
Index: libs/widgets/KoCsvImportDialog.cpp
--- libs/widgets/KoCsvImportDialog.cpp.orig
+++ libs/widgets/KoCsvImportDialog.cpp
@@ -21,6 +21,7 @@
#include "KoCsvImportDialog.h"
// Qt
+#include <QButtonGroup>
#include <QTextCodec>
#include <QTextStream>

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-libs_widgets_KoPageLayoutWidget_cpp,v 1.1 2020/02/25 18:08:07 rsadowski Exp $
Unbreak with Qt 5.13
Index: libs/widgets/KoPageLayoutWidget.cpp
--- libs/widgets/KoPageLayoutWidget.cpp.orig
+++ libs/widgets/KoPageLayoutWidget.cpp
@@ -23,6 +23,8 @@
#include <KoUnit.h>
+#include <QButtonGroup>
+
class Q_DECL_HIDDEN KoPageLayoutWidget::Private
{
public:

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-plugins_chartshape_dialogs_TableEditorDialog_cpp,v 1.1 2020/02/25 18:08:07 rsadowski Exp $
Unbreak with Qt 5.13
Index: plugins/chartshape/dialogs/TableEditorDialog.cpp
--- plugins/chartshape/dialogs/TableEditorDialog.cpp.orig
+++ plugins/chartshape/dialogs/TableEditorDialog.cpp
@@ -24,6 +24,7 @@
// Qt
#include <QAbstractItemModel>
+#include <QAction>
// Calligra
#include <KoIcon.h>

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-plugins_formulashape_FormulaToolWidget_cpp,v 1.1 2020/02/25 18:08:07 rsadowski Exp $
Unbreak with Qt 5.13
Index: plugins/formulashape/FormulaToolWidget.cpp
--- plugins/formulashape/FormulaToolWidget.cpp.orig
+++ plugins/formulashape/FormulaToolWidget.cpp
@@ -30,6 +30,7 @@
#include <QWidgetAction>
#include <QTableWidget>
#include <QAction>
+#include <QHeaderView>
#include <QMenu>
FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent )

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-sheets_dialogs_LayoutDialog_cpp,v 1.1 2020/02/25 18:08:07 rsadowski Exp $
Unbreak with Qt 5.13
Index: sheets/dialogs/LayoutDialog.cpp
--- sheets/dialogs/LayoutDialog.cpp.orig
+++ sheets/dialogs/LayoutDialog.cpp
@@ -36,6 +36,7 @@
#include <math.h>
#include <QIntValidator>
+#include <QButtonGroup>
#include <QCheckBox>
#include <QFrame>
#include <QLabel>

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-sheets_plugins_calendar_CalendarToolWidget_cpp,v 1.1 2020/02/25 18:08:07 rsadowski Exp $
Unbreak with Qt 5.13
Index: sheets/plugins/calendar/CalendarToolWidget.cpp
--- sheets/plugins/calendar/CalendarToolWidget.cpp.orig
+++ sheets/plugins/calendar/CalendarToolWidget.cpp
@@ -30,6 +30,7 @@
#include <kdatepicker.h>
#include <QPushButton>
+#include <QDate>
namespace Calligra
{

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-stage_part_KPrPresentationTool_cpp,v 1.1 2020/02/25 18:08:07 rsadowski Exp $
Unbreak with Qt 5.13
Index: stage/part/KPrPresentationTool.cpp
--- stage/part/KPrPresentationTool.cpp.orig
+++ stage/part/KPrPresentationTool.cpp
@@ -32,6 +32,7 @@
#include <QDesktopServices>
#include <QUrl>
#include <QDBusConnection>
+#include <QFrame>
#include <KoShape.h>
#include <KoShapeManager.h>

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-words_part_dialogs_KWAnchoringProperties_cpp,v 1.1 2020/02/25 18:08:07 rsadowski Exp $
Unbreak with Qt 5.13
Index: words/part/dialogs/KWAnchoringProperties.cpp
--- words/part/dialogs/KWAnchoringProperties.cpp.orig
+++ words/part/dialogs/KWAnchoringProperties.cpp
@@ -35,6 +35,7 @@
#include <kundo2command.h>
+#include <QButtonGroup>
#include <QComboBox>
const int KWAnchoringProperties::vertRels[4][20] = {

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-words_part_dialogs_KWRunAroundProperties_cpp,v 1.1 2020/02/25 18:08:07 rsadowski Exp $
Unbreak with Qt 5.13
Index: words/part/dialogs/KWRunAroundProperties.cpp
--- words/part/dialogs/KWRunAroundProperties.cpp.orig
+++ words/part/dialogs/KWRunAroundProperties.cpp
@@ -28,6 +28,8 @@
#include <kundo2command.h>
+#include <QButtonGroup>
+
KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
: m_state(state)
{