Date: Tue, 4 Sep 2018 10:56:58 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478948 - head/editors/calligra/files Message-ID: <201809041056.w84AuwF5013727@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Tue Sep 4 10:56:57 2018 New Revision: 478948 URL: https://svnweb.freebsd.org/changeset/ports/478948 Log: Fix build with Qt 5.11 PR: 230884 Obtained from: upstream Added: head/editors/calligra/files/patch-git_70be8c4 (contents, props changed) head/editors/calligra/files/patch-git_a7ebecb (contents, props changed) Added: head/editors/calligra/files/patch-git_70be8c4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/calligra/files/patch-git_70be8c4 Tue Sep 4 10:56:57 2018 (r478948) @@ -0,0 +1,17 @@ +From 70be8c437406a74c1ec560d1f2cc538e8ede2b8d Mon Sep 17 00:00:00 2001 +From: Dan Leinir Turthra Jensen <admin@leinir.dk> +Date: Tue, 19 Jun 2018 09:52:41 +0100 +Subject: [PATCH] Missing include for QFrame + +This was causing build breakage on the binary factory + +--- stage/part/KPrPresentationTool.cpp.orig 2018-01-26 09:24:44 UTC ++++ stage/part/KPrPresentationTool.cpp +@@ -32,6 +32,7 @@ + #include <QDesktopServices> + #include <QUrl> + #include <QDBusConnection> ++#include <QFrame> + + #include <KoShape.h> + #include <KoShapeManager.h> Added: head/editors/calligra/files/patch-git_a7ebecb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/calligra/files/patch-git_a7ebecb Tue Sep 4 10:56:57 2018 (r478948) @@ -0,0 +1,87 @@ +From a7ebecb9fbee2190e649c44ed53f1299013baa30 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, anthonyfieroni, danders + +Reviewed By: #calligra:_3.0, anthonyfieroni, danders + +Subscribers: anthonyfieroni, danders + +Tags: #calligra:_3.0 + +Differential Revision: https://phabricator.kde.org/D11454 + +--- libs/widgets/KoCsvImportDialog.cpp.orig 2018-01-26 09:24:44 UTC ++++ libs/widgets/KoCsvImportDialog.cpp +@@ -21,6 +21,7 @@ + #include "KoCsvImportDialog.h" + + // Qt ++#include <QButtonGroup> + #include <QTextCodec> + #include <QTextStream> + +--- libs/widgets/KoPageLayoutWidget.cpp.orig 2018-01-26 09:24:44 UTC ++++ libs/widgets/KoPageLayoutWidget.cpp +@@ -23,6 +23,8 @@ + + #include <KoUnit.h> + ++#include <QButtonGroup> ++ + class Q_DECL_HIDDEN KoPageLayoutWidget::Private + { + public: +--- plugins/chartshape/dialogs/TableEditorDialog.cpp.orig 2018-01-26 09:24:44 UTC ++++ plugins/chartshape/dialogs/TableEditorDialog.cpp +@@ -24,6 +24,7 @@ + + // Qt + #include <QAbstractItemModel> ++#include <QAction> + + // Calligra + #include <KoIcon.h> +--- plugins/formulashape/FormulaToolWidget.cpp.orig 2018-01-26 09:24:44 UTC ++++ plugins/formulashape/FormulaToolWidget.cpp +@@ -30,6 +30,7 @@ + #include <QWidgetAction> + #include <QTableWidget> + #include <QAction> ++#include <QHeaderView> + #include <QMenu> + + FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) +--- sheets/dialogs/LayoutDialog.cpp.orig 2018-01-26 09:24:44 UTC ++++ sheets/dialogs/LayoutDialog.cpp +@@ -36,6 +36,7 @@ + #include <math.h> + + #include <QIntValidator> ++#include <QButtonGroup> + #include <QCheckBox> + #include <QFrame> + #include <QLabel> +--- words/part/dialogs/KWAnchoringProperties.cpp.orig 2018-01-26 09:24:44 UTC ++++ words/part/dialogs/KWAnchoringProperties.cpp +@@ -35,6 +35,7 @@ + + #include <kundo2command.h> + ++#include <QButtonGroup> + #include <QComboBox> + + const int KWAnchoringProperties::vertRels[4][20] = { +--- words/part/dialogs/KWRunAroundProperties.cpp.orig 2018-01-26 09:24:44 UTC ++++ words/part/dialogs/KWRunAroundProperties.cpp +@@ -28,6 +28,8 @@ + + #include <kundo2command.h> + ++#include <QButtonGroup> ++ + KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) + : m_state(state) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809041056.w84AuwF5013727>