[neon/extras/calligra/Neon/release] /: patch not needed with 3.2
Jonathan Riddell
null at kde.org
Tue Apr 20 11:17:49 BST 2021
Git commit b73ad3ee159637c18d34412ba8ce4f6025ebe069 by Jonathan Riddell.
Committed on 20/04/2021 at 10:17.
Pushed by jriddell into branch 'Neon/release'.
patch not needed with 3.2
D +0 -641 debian/patches/qt5.15.diff
D +0 -1 debian/patches/series
D +0 -629 patches/qt5.15.diff
M +1 -12 snapcraft.yaml
https://invent.kde.org/neon/extras/calligra/commit/b73ad3ee159637c18d34412ba8ce4f6025ebe069
diff --git a/debian/patches/qt5.15.diff b/debian/patches/qt5.15.diff
deleted file mode 100644
index f5e055c..0000000
--- a/debian/patches/qt5.15.diff
+++ /dev/null
@@ -1,641 +0,0 @@
-commit 12b178b452ebdda6db87e506b53ef525e94f8512
-Author: Heiko Becker <heirecka at exherbo.org>
-Date: Sun Mar 29 14:05:22 2020 +0200
-
- Fix build with Qt 5.15
-
- QPainterPath is no longer included via qtransform.h (since
- 5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
-
-diff --git a/filters/karbon/wmf/WmfExport.cpp b/filters/karbon/wmf/WmfExport.cpp
-index af96bbcbf0c..b5d5a642975 100644
---- a/filters/karbon/wmf/WmfExport.cpp
-+++ b/filters/karbon/wmf/WmfExport.cpp
-@@ -34,6 +34,8 @@
- #include <KoPatternBackground.h>
- #include <KoUnit.h>
-
-+#include <QPainterPath>
-+
- /*
- TODO: bs.wmf stroke in red with MSword and in brown with Words ??
- */
-diff --git a/filters/libmso/shapes.cpp b/filters/libmso/shapes.cpp
-index b726ba2c821..3fb193e2054 100644
---- a/filters/libmso/shapes.cpp
-+++ b/filters/libmso/shapes.cpp
-@@ -35,6 +35,7 @@
- #include "writeodf/writeodfdraw.h"
-
- #include <QDebug>
-+#include <QPainterPath>
- #include <QTransform>
- #include <QBuffer>
- #include <QUrl>
-diff --git a/karbon/common/KarbonOutlinePaintingStrategy.cpp b/karbon/common/KarbonOutlinePaintingStrategy.cpp
-index 5bcd22baab6..ab4abb4591a 100644
---- a/karbon/common/KarbonOutlinePaintingStrategy.cpp
-+++ b/karbon/common/KarbonOutlinePaintingStrategy.cpp
-@@ -25,6 +25,7 @@
-
- #include <QPen>
- #include <QPainter>
-+#include <QPainterPath>
-
- class OutlineStroke : public KoShapeStroke {
- public:
-diff --git a/karbon/ui/dockers/KarbonLayerModel.cpp b/karbon/ui/dockers/KarbonLayerModel.cpp
-index 586f92f72ba..39eb500c292 100644
---- a/karbon/ui/dockers/KarbonLayerModel.cpp
-+++ b/karbon/ui/dockers/KarbonLayerModel.cpp
-@@ -42,6 +42,7 @@
-
- #include <QMimeData>
- #include <QPainter>
-+#include <QPainterPath>
-
- KoShapeContainer *shapeToContainer(KoShape *shape)
- {
-diff --git a/karbon/ui/widgets/KarbonSmallStylePreview.cpp b/karbon/ui/widgets/KarbonSmallStylePreview.cpp
-index 588b13e339f..bbe7b845c80 100644
---- a/karbon/ui/widgets/KarbonSmallStylePreview.cpp
-+++ b/karbon/ui/widgets/KarbonSmallStylePreview.cpp
-@@ -40,6 +40,7 @@
- #include <QPushButton>
- #include <QLabel>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QHBoxLayout>
-
-diff --git a/libs/basicflakes/tools/KoCreatePathTool_p.h b/libs/basicflakes/tools/KoCreatePathTool_p.h
-index 807c0c80c08..1e04ad6fb63 100644
---- a/libs/basicflakes/tools/KoCreatePathTool_p.h
-+++ b/libs/basicflakes/tools/KoCreatePathTool_p.h
-@@ -34,6 +34,8 @@
- #include "KoSnapStrategy.h"
- #include "KoToolBase_p.h"
-
-+#include <QPainterPath>
-+
- #include "math.h"
-
- /// Small helper to keep track of a path point and its parent path shape
-diff --git a/libs/flake/KoConnectionShape.cpp b/libs/flake/KoConnectionShape.cpp
-index e2a4e2de048..22f47845977 100644
---- a/libs/flake/KoConnectionShape.cpp
-+++ b/libs/flake/KoConnectionShape.cpp
-@@ -34,6 +34,7 @@
- #include <KoXmlNS.h>
- #include <KoUnit.h>
- #include <QPainter>
-+#include <QPainterPath>
-
- #include <FlakeDebug.h>
-
-diff --git a/libs/flake/KoHatchBackground.cpp b/libs/flake/KoHatchBackground.cpp
-index 35f1bb46cda..19e16aaf4e3 100644
---- a/libs/flake/KoHatchBackground.cpp
-+++ b/libs/flake/KoHatchBackground.cpp
-@@ -34,6 +34,7 @@
- #include <QColor>
- #include <QString>
- #include <QPainter>
-+#include <QPainterPath>
-
- class KoHatchBackgroundPrivate : public KoColorBackgroundPrivate
- {
-diff --git a/libs/flake/KoOdfGradientBackground.cpp b/libs/flake/KoOdfGradientBackground.cpp
-index 19a98557c87..7aed19c3d82 100644
---- a/libs/flake/KoOdfGradientBackground.cpp
-+++ b/libs/flake/KoOdfGradientBackground.cpp
-@@ -31,6 +31,7 @@
- #include <KoStyleStack.h>
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QColor>
- #include <QImage>
- #include <qmath.h>
-diff --git a/libs/flake/KoPathShape.cpp b/libs/flake/KoPathShape.cpp
-index a6fdc008b2d..359968f7c92 100644
---- a/libs/flake/KoPathShape.cpp
-+++ b/libs/flake/KoPathShape.cpp
-@@ -50,6 +50,7 @@
-
- #include <FlakeDebug.h>
- #include <QPainter>
-+#include <QPainterPath>
-
- #include <qnumeric.h> // for qIsNaN
- static bool qIsNaNPoint(const QPointF &p) {
-diff --git a/libs/flake/KoPatternBackground.cpp b/libs/flake/KoPatternBackground.cpp
-index 405a66d0161..286fd8a7629 100644
---- a/libs/flake/KoPatternBackground.cpp
-+++ b/libs/flake/KoPatternBackground.cpp
-@@ -36,6 +36,7 @@
-
- #include <QBrush>
- #include <QPainter>
-+#include <QPainterPath>
-
- class KoPatternBackgroundPrivate : public KoShapeBackgroundPrivate
- {
-diff --git a/libs/flake/KoShapeManager.cpp b/libs/flake/KoShapeManager.cpp
-index 7951349491b..a9a8d6214d2 100644
---- a/libs/flake/KoShapeManager.cpp
-+++ b/libs/flake/KoShapeManager.cpp
-@@ -44,6 +44,7 @@
- #include "KoShapePaintingContext.h"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTimer>
- #include <FlakeDebug.h>
-
-diff --git a/libs/flake/KoShapeShadow.cpp b/libs/flake/KoShapeShadow.cpp
-index efe8ee6eab4..903198fa4c7 100644
---- a/libs/flake/KoShapeShadow.cpp
-+++ b/libs/flake/KoShapeShadow.cpp
-@@ -32,6 +32,7 @@
- #include <KoViewConverter.h>
- #include <FlakeDebug.h>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QAtomicInt>
- #include <QImage>
- #include <QRectF>
-diff --git a/libs/flake/KoSnapGuide.cpp b/libs/flake/KoSnapGuide.cpp
-index 4c80b3a2afc..5b16f8fd0f4 100644
---- a/libs/flake/KoSnapGuide.cpp
-+++ b/libs/flake/KoSnapGuide.cpp
-@@ -27,6 +27,7 @@
- #include <KoCanvasBase.h>
-
- #include <QPainter>
-+#include <QPainterPath>
-
- #include <math.h>
-
-diff --git a/libs/flake/KoSnapStrategy.cpp b/libs/flake/KoSnapStrategy.cpp
-index e67b0907367..76dcf7a3a33 100644
---- a/libs/flake/KoSnapStrategy.cpp
-+++ b/libs/flake/KoSnapStrategy.cpp
-@@ -28,6 +28,7 @@
- #include <KoGuidesData.h>
-
- #include <QPainter>
-+#include <QPainterPath>
-
- #include <cmath>
-
-diff --git a/libs/flake/KoUnavailShape.cpp b/libs/flake/KoUnavailShape.cpp
-index 6b39d333ae0..391e8a22262 100644
---- a/libs/flake/KoUnavailShape.cpp
-+++ b/libs/flake/KoUnavailShape.cpp
-@@ -25,6 +25,7 @@
- // Qt
- #include <QPen>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QByteArray>
- #include <QBuffer>
- #include <QDataStream>
-diff --git a/libs/flake/svg/SvgParser.cpp b/libs/flake/svg/SvgParser.cpp
-index 193529d4b86..9e0071a8468 100644
---- a/libs/flake/svg/SvgParser.cpp
-+++ b/libs/flake/svg/SvgParser.cpp
-@@ -50,6 +50,7 @@
- #include <FlakeDebug.h>
-
- #include <QColor>
-+#include <QPainterPath>
-
-
- SvgParser::SvgParser(KoDocumentResourceManager *documentResourceManager)
-diff --git a/libs/flake/svg/SvgStyleWriter.cpp b/libs/flake/svg/SvgStyleWriter.cpp
-index d81093772f5..3f6d86d9c5c 100644
---- a/libs/flake/svg/SvgStyleWriter.cpp
-+++ b/libs/flake/svg/SvgStyleWriter.cpp
-@@ -51,6 +51,7 @@
- #include <QBuffer>
- #include <QGradient>
- #include <QLinearGradient>
-+#include <QPainterPath>
- #include <QRadialGradient>
- #include <QMimeDatabase>
- #include <QMimeType>
-diff --git a/libs/flake/tests/TestShapeBackgroundCommand.cpp b/libs/flake/tests/TestShapeBackgroundCommand.cpp
-index a3a44cd46db..a8a8c164a6d 100644
---- a/libs/flake/tests/TestShapeBackgroundCommand.cpp
-+++ b/libs/flake/tests/TestShapeBackgroundCommand.cpp
-@@ -24,6 +24,7 @@
- #include "KoShapePaintingContext.h"
- #include "KoViewConverter.h"
-
-+#include <QPainterPath>
- #include <QTest>
-
- void TestShapeBackgroundCommand::refCounting()
-diff --git a/libs/flake/tests/TestSnapStrategy.cpp b/libs/flake/tests/TestSnapStrategy.cpp
-index 16015c2b2e2..ac86c23a7c4 100644
---- a/libs/flake/tests/TestSnapStrategy.cpp
-+++ b/libs/flake/tests/TestSnapStrategy.cpp
-@@ -30,6 +30,8 @@
- #include <KoSnapData.h>
- #include <KoGuidesData.h>
-
-+#include <QPainterPath>
-+
- void TestSnapStrategy::testOrthogonalSnap()
- {
- //Test case one - expected not to snap
-diff --git a/libs/flake/tools/KoPathTool.cpp b/libs/flake/tools/KoPathTool.cpp
-index 30ab5ab2b7a..811917a2ace 100644
---- a/libs/flake/tools/KoPathTool.cpp
-+++ b/libs/flake/tools/KoPathTool.cpp
-@@ -56,6 +56,7 @@
- #include <FlakeDebug.h>
- #include <klocalizedstring.h>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QBitmap>
- #include <QTabWidget>
-
-diff --git a/libs/pageapp/KoPADocumentModel.cpp b/libs/pageapp/KoPADocumentModel.cpp
-index 444fc8da163..949a8a21f23 100644
---- a/libs/pageapp/KoPADocumentModel.cpp
-+++ b/libs/pageapp/KoPADocumentModel.cpp
-@@ -48,6 +48,7 @@
- #include <QApplication>
- #include <QClipboard>
- #include <QMenu>
-+#include <QPainterPath>
-
- #include "commands/KoPAPageMoveCommand.h"
-
-diff --git a/libs/pageapp/KoPAPageBase.cpp b/libs/pageapp/KoPAPageBase.cpp
-index ebb76efac1b..2b92d47fcea 100644
---- a/libs/pageapp/KoPAPageBase.cpp
-+++ b/libs/pageapp/KoPAPageBase.cpp
-@@ -40,6 +40,7 @@
- #include <PageAppDebug.h>
-
- #include <QPainter>
-+#include <QPainterPath>
-
-
- KoPAPageBase::KoPAPageBase()
-diff --git a/libs/vectorimage/libemf/EmfOutputPainterStrategy.cpp b/libs/vectorimage/libemf/EmfOutputPainterStrategy.cpp
-index 60fddd99dca..6175951d34f 100644
---- a/libs/vectorimage/libemf/EmfOutputPainterStrategy.cpp
-+++ b/libs/vectorimage/libemf/EmfOutputPainterStrategy.cpp
-@@ -20,6 +20,8 @@
-
- #include <math.h>
-
-+#include <QPainterPath>
-+
- #include <VectorImageDebug.h>
-
- #include "EmfObjects.h"
-diff --git a/libs/vectorimage/libsvm/SvmPainterBackend.cpp b/libs/vectorimage/libsvm/SvmPainterBackend.cpp
-index 77d71adab8d..5f35cf31afa 100644
---- a/libs/vectorimage/libsvm/SvmPainterBackend.cpp
-+++ b/libs/vectorimage/libsvm/SvmPainterBackend.cpp
-@@ -25,6 +25,7 @@
- #include <QPolygon>
- #include <QString>
- #include <QPainter>
-+#include <QPainterPath>
-
- // Libsvm
- #include "SvmEnums.h"
-diff --git a/libs/widgets/KoMarkerItemDelegate.cpp b/libs/widgets/KoMarkerItemDelegate.cpp
-index acfa19db4a7..3acc4703022 100644
---- a/libs/widgets/KoMarkerItemDelegate.cpp
-+++ b/libs/widgets/KoMarkerItemDelegate.cpp
-@@ -24,6 +24,7 @@
- #include <KoMarker.h>
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPen>
-
- KoMarkerItemDelegate::KoMarkerItemDelegate(KoMarkerData::MarkerPosition position, QObject *parent)
-diff --git a/plugins/chartshape/ChartShape.cpp b/plugins/chartshape/ChartShape.cpp
-index b55cb21dd58..fc49be1399f 100644
---- a/plugins/chartshape/ChartShape.cpp
-+++ b/plugins/chartshape/ChartShape.cpp
-@@ -31,6 +31,7 @@
- // Qt
- #include <QPointF>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSizeF>
- #include <QTextDocument>
- #include <QStandardItemModel>
-diff --git a/plugins/chartshape/Legend.cpp b/plugins/chartshape/Legend.cpp
-index 01aae09724a..307d057127d 100644
---- a/plugins/chartshape/Legend.cpp
-+++ b/plugins/chartshape/Legend.cpp
-@@ -30,6 +30,7 @@
- #include <QBrush>
- #include <QFont>
- #include <QImage>
-+#include <QPainterPath>
-
- // Calligra
- #include <KoXmlReader.h>
-diff --git a/plugins/chartshape/PlotArea.cpp b/plugins/chartshape/PlotArea.cpp
-index 58543bf9bf6..7614e8f909e 100644
---- a/plugins/chartshape/PlotArea.cpp
-+++ b/plugins/chartshape/PlotArea.cpp
-@@ -28,6 +28,7 @@
- #include <QList>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
-
- // Calligra
- #include <KoXmlNS.h>
-diff --git a/plugins/defaultTools/defaulttool/DefaultTool.cpp b/plugins/defaultTools/defaulttool/DefaultTool.cpp
-index aa7f1a97aba..c9ac8cc486c 100644
---- a/plugins/defaultTools/defaulttool/DefaultTool.cpp
-+++ b/plugins/defaultTools/defaulttool/DefaultTool.cpp
-@@ -63,6 +63,7 @@
-
- #include <QAction>
- #include <QKeyEvent>
-+#include <QPainterPath>
- #include <QClipboard>
- #include <QStandardPaths>
-
-diff --git a/plugins/formulashape/elements/BasicElement.cpp b/plugins/formulashape/elements/BasicElement.cpp
-index 2cbe039ee4c..485c9ffb0f0 100644
---- a/plugins/formulashape/elements/BasicElement.cpp
-+++ b/plugins/formulashape/elements/BasicElement.cpp
-@@ -32,6 +32,7 @@
- #include <KoXmlReader.h>
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QVariant>
-
-
-diff --git a/plugins/formulashape/elements/FixedElement.cpp b/plugins/formulashape/elements/FixedElement.cpp
-index cce1fdc4d11..8ae09bba9c7 100644
---- a/plugins/formulashape/elements/FixedElement.cpp
-+++ b/plugins/formulashape/elements/FixedElement.cpp
-@@ -25,6 +25,7 @@
- #include <KoXmlReader.h>
-
- #include <QPainter>
-+#include <QPainterPath>
-
-
- FixedElement::FixedElement( BasicElement* parent ) : BasicElement( parent )
-diff --git a/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp b/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
-index 9ec48a1bf5a..a1b871dfc61 100644
---- a/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
-+++ b/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
-@@ -27,6 +27,7 @@
-
- #include <QDebug>
- #include <QColor>
-+#include <QPainterPath>
-
- #include <cmath>
- #include <cstdlib>
-diff --git a/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h b/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
-index 04b5b51bbb9..a44e043c4b7 100644
---- a/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
-+++ b/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
-@@ -22,6 +22,7 @@
-
- #include <KoToolBase.h>
- #include <KoPathShape.h>
-+#include <QPainterPath>
- #include <QPointer>
-
- class KoPathShape;
-diff --git a/plugins/musicshape/MusicStyle.cpp b/plugins/musicshape/MusicStyle.cpp
-index ed52e11580d..1e174c6938d 100644
---- a/plugins/musicshape/MusicStyle.cpp
-+++ b/plugins/musicshape/MusicStyle.cpp
-@@ -17,6 +17,9 @@
- * Boston, MA 02110-1301, USA.
- */
- #include "MusicStyle.h"
-+
-+#include <QPainterPath>
-+
- using namespace MusicCore;
-
- MusicStyle::MusicStyle()
-diff --git a/plugins/musicshape/Renderer.cpp b/plugins/musicshape/Renderer.cpp
-index 679de969b63..0b0c2262529 100644
---- a/plugins/musicshape/Renderer.cpp
-+++ b/plugins/musicshape/Renderer.cpp
-@@ -33,6 +33,7 @@
- #include "core/StaffSystem.h"
-
- #include <QMultiMap>
-+#include <QPainterPath>
-
- #include <climits>
-
-diff --git a/plugins/pathshapes/enhancedpath/EnhancedPathShape.cpp b/plugins/pathshapes/enhancedpath/EnhancedPathShape.cpp
-index 9480187c391..4ff471c4ea6 100644
---- a/plugins/pathshapes/enhancedpath/EnhancedPathShape.cpp
-+++ b/plugins/pathshapes/enhancedpath/EnhancedPathShape.cpp
-@@ -36,6 +36,8 @@
- #include <KoOdfWorkaround.h>
- #include <KoPathPoint.h>
-
-+#include <QPainterPath>
-+
- EnhancedPathShape::EnhancedPathShape(const QRect &viewBox)
- : m_viewBox(viewBox)
- , m_viewBoxOffset(0.0, 0.0)
-diff --git a/plugins/textshape/TextShape.cpp b/plugins/textshape/TextShape.cpp
-index 689199101b6..cfefe228deb 100644
---- a/plugins/textshape/TextShape.cpp
-+++ b/plugins/textshape/TextShape.cpp
-@@ -58,6 +58,7 @@
- #include <QApplication>
- #include <QFont>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPen>
- #include <QTextLayout>
-
-diff --git a/sheets/ui/SheetView.cpp b/sheets/ui/SheetView.cpp
-index 6260d1fda25..0620cc16edc 100644
---- a/sheets/ui/SheetView.cpp
-+++ b/sheets/ui/SheetView.cpp
-@@ -23,6 +23,7 @@
- #include <QCache>
- #include <QRect>
- #include <QPainter>
-+#include <QPainterPath>
- #ifdef CALLIGRA_SHEETS_MT
- #include <QMutex>
- #include <QMutexLocker>
-diff --git a/stage/part/KPrPresentationHighlightWidget.cpp b/stage/part/KPrPresentationHighlightWidget.cpp
-index ee27dd31b3b..adeaf67c016 100644
---- a/stage/part/KPrPresentationHighlightWidget.cpp
-+++ b/stage/part/KPrPresentationHighlightWidget.cpp
-@@ -26,6 +26,7 @@
- #include <QMouseEvent>
- #include <QColor>
- #include <QPainter>
-+#include <QPainterPath>
-
- KPrPresentationHighlightWidget::KPrPresentationHighlightWidget( KoPACanvasBase * canvas )
- : KPrPresentationToolEventForwarder(canvas)
-diff --git a/stage/plugins/pageeffects/edgewipe/barndoorwipe/BarnDoorWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/barndoorwipe/BarnDoorWipeStrategy.cpp
-index a646b31a369..7aee18d3fbc 100644
---- a/stage/plugins/pageeffects/edgewipe/barndoorwipe/BarnDoorWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/barndoorwipe/BarnDoorWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "BarnDoorWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/barnveewipe/BarnVeeWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/barnveewipe/BarnVeeWipeStrategy.cpp
-index f3e0bcaba4d..b4d10ac1ef2 100644
---- a/stage/plugins/pageeffects/edgewipe/barnveewipe/BarnVeeWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/barnveewipe/BarnVeeWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "BarnVeeWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/barnzigzagwipe/BarnZigZagWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/barnzigzagwipe/BarnZigZagWipeStrategy.cpp
-index 3daf68d90cd..c56581e6a76 100644
---- a/stage/plugins/pageeffects/edgewipe/barnzigzagwipe/BarnZigZagWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/barnzigzagwipe/BarnZigZagWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "BarnZigZagWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/boxwipe/BoxWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/boxwipe/BoxWipeStrategy.cpp
-index b73e4a58c2c..3d037b5995f 100644
---- a/stage/plugins/pageeffects/edgewipe/boxwipe/BoxWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/boxwipe/BoxWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "BoxWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/diagonalwipe/DiagonalWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/diagonalwipe/DiagonalWipeStrategy.cpp
-index 4d3fc68dae0..9a7d8841108 100644
---- a/stage/plugins/pageeffects/edgewipe/diagonalwipe/DiagonalWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/diagonalwipe/DiagonalWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "DiagonalWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersInWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersInWipeStrategy.cpp
-index 99f7297ca13..06c8bcbc449 100644
---- a/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersInWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersInWipeStrategy.cpp
-@@ -21,6 +21,8 @@
- #include "FourBoxWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersOutWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersOutWipeStrategy.cpp
-index 1e5a7da69ab..35a5c9dbccb 100644
---- a/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersOutWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersOutWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "FourBoxWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleBarnDoorWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleBarnDoorWipeStrategy.cpp
-index 600e78f66c0..1b5879b6213 100644
---- a/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleBarnDoorWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleBarnDoorWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "MiscDiagonalWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleDiamondWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleDiamondWipeStrategy.cpp
-index 882a7891d44..28cc8bdc43f 100644
---- a/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleDiamondWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleDiamondWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "MiscDiagonalWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/veewipe/VeeWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/veewipe/VeeWipeStrategy.cpp
-index 203da474d4e..fa36ff45290 100644
---- a/stage/plugins/pageeffects/edgewipe/veewipe/VeeWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/veewipe/VeeWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "VeeWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/zigzagwipe/ZigZagWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/zigzagwipe/ZigZagWipeStrategy.cpp
-index 7abf3fb3812..79e43fb66ed 100644
---- a/stage/plugins/pageeffects/edgewipe/zigzagwipe/ZigZagWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/zigzagwipe/ZigZagWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "ZigZagWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/words/part/frames/KWFrameLayout.cpp b/words/part/frames/KWFrameLayout.cpp
-index eac179995d3..a2a5c7d802d 100644
---- a/words/part/frames/KWFrameLayout.cpp
-+++ b/words/part/frames/KWFrameLayout.cpp
-@@ -37,6 +37,7 @@
- #include <KoShapeBackground.h>
- #include <KoColumns.h>
-
-+#include <QPainterPath>
- #include <QTextLayout>
- #include <QTextDocument>
- #include <QTextBlock>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3b26d2f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-qt5.15.diff
diff --git a/patches/qt5.15.diff b/patches/qt5.15.diff
deleted file mode 100644
index 7d3b177..0000000
--- a/patches/qt5.15.diff
+++ /dev/null
@@ -1,629 +0,0 @@
-commit 12b178b452ebdda6db87e506b53ef525e94f8512
-Author: Heiko Becker <heirecka at exherbo.org>
-Date: Sun Mar 29 14:05:22 2020 +0200
-
- Fix build with Qt 5.15
-
- QPainterPath is no longer included via qtransform.h (since
- 5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
-
-diff --git a/filters/karbon/wmf/WmfExport.cpp b/filters/karbon/wmf/WmfExport.cpp
-index af96bbcbf0c..b5d5a642975 100644
---- a/filters/karbon/wmf/WmfExport.cpp
-+++ b/filters/karbon/wmf/WmfExport.cpp
-@@ -34,6 +34,8 @@
- #include <KoPatternBackground.h>
- #include <KoUnit.h>
-
-+#include <QPainterPath>
-+
- /*
- TODO: bs.wmf stroke in red with MSword and in brown with Words ??
- */
-diff --git a/filters/libmso/shapes.cpp b/filters/libmso/shapes.cpp
-index b726ba2c821..3fb193e2054 100644
---- a/filters/libmso/shapes.cpp
-+++ b/filters/libmso/shapes.cpp
-@@ -35,6 +35,7 @@
- #include "writeodf/writeodfdraw.h"
-
- #include <QDebug>
-+#include <QPainterPath>
- #include <QTransform>
- #include <QBuffer>
- #include <QUrl>
-diff --git a/karbon/common/KarbonOutlinePaintingStrategy.cpp b/karbon/common/KarbonOutlinePaintingStrategy.cpp
-index 5bcd22baab6..ab4abb4591a 100644
---- a/karbon/common/KarbonOutlinePaintingStrategy.cpp
-+++ b/karbon/common/KarbonOutlinePaintingStrategy.cpp
-@@ -25,6 +25,7 @@
-
- #include <QPen>
- #include <QPainter>
-+#include <QPainterPath>
-
- class OutlineStroke : public KoShapeStroke {
- public:
-diff --git a/karbon/ui/widgets/KarbonSmallStylePreview.cpp b/karbon/ui/widgets/KarbonSmallStylePreview.cpp
-index 588b13e339f..bbe7b845c80 100644
---- a/karbon/ui/widgets/KarbonSmallStylePreview.cpp
-+++ b/karbon/ui/widgets/KarbonSmallStylePreview.cpp
-@@ -40,6 +40,7 @@
- #include <QPushButton>
- #include <QLabel>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QHBoxLayout>
-
-diff --git a/libs/basicflakes/tools/KoCreatePathTool_p.h b/libs/basicflakes/tools/KoCreatePathTool_p.h
-index 807c0c80c08..1e04ad6fb63 100644
---- a/libs/basicflakes/tools/KoCreatePathTool_p.h
-+++ b/libs/basicflakes/tools/KoCreatePathTool_p.h
-@@ -34,6 +34,8 @@
- #include "KoSnapStrategy.h"
- #include "KoToolBase_p.h"
-
-+#include <QPainterPath>
-+
- #include "math.h"
-
- /// Small helper to keep track of a path point and its parent path shape
-diff --git a/libs/flake/KoConnectionShape.cpp b/libs/flake/KoConnectionShape.cpp
-index e2a4e2de048..22f47845977 100644
---- a/libs/flake/KoConnectionShape.cpp
-+++ b/libs/flake/KoConnectionShape.cpp
-@@ -34,6 +34,7 @@
- #include <KoXmlNS.h>
- #include <KoUnit.h>
- #include <QPainter>
-+#include <QPainterPath>
-
- #include <FlakeDebug.h>
-
-diff --git a/libs/flake/KoHatchBackground.cpp b/libs/flake/KoHatchBackground.cpp
-index 35f1bb46cda..19e16aaf4e3 100644
---- a/libs/flake/KoHatchBackground.cpp
-+++ b/libs/flake/KoHatchBackground.cpp
-@@ -34,6 +34,7 @@
- #include <QColor>
- #include <QString>
- #include <QPainter>
-+#include <QPainterPath>
-
- class KoHatchBackgroundPrivate : public KoColorBackgroundPrivate
- {
-diff --git a/libs/flake/KoOdfGradientBackground.cpp b/libs/flake/KoOdfGradientBackground.cpp
-index 19a98557c87..7aed19c3d82 100644
---- a/libs/flake/KoOdfGradientBackground.cpp
-+++ b/libs/flake/KoOdfGradientBackground.cpp
-@@ -31,6 +31,7 @@
- #include <KoStyleStack.h>
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QColor>
- #include <QImage>
- #include <qmath.h>
-diff --git a/libs/flake/KoPathShape.cpp b/libs/flake/KoPathShape.cpp
-index a6fdc008b2d..359968f7c92 100644
---- a/libs/flake/KoPathShape.cpp
-+++ b/libs/flake/KoPathShape.cpp
-@@ -50,6 +50,7 @@
-
- #include <FlakeDebug.h>
- #include <QPainter>
-+#include <QPainterPath>
-
- #include <qnumeric.h> // for qIsNaN
- static bool qIsNaNPoint(const QPointF &p) {
-diff --git a/libs/flake/KoPatternBackground.cpp b/libs/flake/KoPatternBackground.cpp
-index 405a66d0161..286fd8a7629 100644
---- a/libs/flake/KoPatternBackground.cpp
-+++ b/libs/flake/KoPatternBackground.cpp
-@@ -36,6 +36,7 @@
-
- #include <QBrush>
- #include <QPainter>
-+#include <QPainterPath>
-
- class KoPatternBackgroundPrivate : public KoShapeBackgroundPrivate
- {
-diff --git a/libs/flake/KoShapeManager.cpp b/libs/flake/KoShapeManager.cpp
-index 7951349491b..a9a8d6214d2 100644
---- a/libs/flake/KoShapeManager.cpp
-+++ b/libs/flake/KoShapeManager.cpp
-@@ -44,6 +44,7 @@
- #include "KoShapePaintingContext.h"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTimer>
- #include <FlakeDebug.h>
-
-diff --git a/libs/flake/KoShapeShadow.cpp b/libs/flake/KoShapeShadow.cpp
-index efe8ee6eab4..903198fa4c7 100644
---- a/libs/flake/KoShapeShadow.cpp
-+++ b/libs/flake/KoShapeShadow.cpp
-@@ -32,6 +32,7 @@
- #include <KoViewConverter.h>
- #include <FlakeDebug.h>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QAtomicInt>
- #include <QImage>
- #include <QRectF>
-diff --git a/libs/flake/KoSnapGuide.cpp b/libs/flake/KoSnapGuide.cpp
-index 4c80b3a2afc..5b16f8fd0f4 100644
---- a/libs/flake/KoSnapGuide.cpp
-+++ b/libs/flake/KoSnapGuide.cpp
-@@ -27,6 +27,7 @@
- #include <KoCanvasBase.h>
-
- #include <QPainter>
-+#include <QPainterPath>
-
- #include <math.h>
-
-diff --git a/libs/flake/KoSnapStrategy.cpp b/libs/flake/KoSnapStrategy.cpp
-index e67b0907367..76dcf7a3a33 100644
---- a/libs/flake/KoSnapStrategy.cpp
-+++ b/libs/flake/KoSnapStrategy.cpp
-@@ -28,6 +28,7 @@
- #include <KoGuidesData.h>
-
- #include <QPainter>
-+#include <QPainterPath>
-
- #include <cmath>
-
-diff --git a/libs/flake/KoUnavailShape.cpp b/libs/flake/KoUnavailShape.cpp
-index 6b39d333ae0..391e8a22262 100644
---- a/libs/flake/KoUnavailShape.cpp
-+++ b/libs/flake/KoUnavailShape.cpp
-@@ -25,6 +25,7 @@
- // Qt
- #include <QPen>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QByteArray>
- #include <QBuffer>
- #include <QDataStream>
-diff --git a/libs/flake/svg/SvgParser.cpp b/libs/flake/svg/SvgParser.cpp
-index 193529d4b86..9e0071a8468 100644
---- a/libs/flake/svg/SvgParser.cpp
-+++ b/libs/flake/svg/SvgParser.cpp
-@@ -50,6 +50,7 @@
- #include <FlakeDebug.h>
-
- #include <QColor>
-+#include <QPainterPath>
-
-
- SvgParser::SvgParser(KoDocumentResourceManager *documentResourceManager)
-diff --git a/libs/flake/svg/SvgStyleWriter.cpp b/libs/flake/svg/SvgStyleWriter.cpp
-index d81093772f5..3f6d86d9c5c 100644
---- a/libs/flake/svg/SvgStyleWriter.cpp
-+++ b/libs/flake/svg/SvgStyleWriter.cpp
-@@ -51,6 +51,7 @@
- #include <QBuffer>
- #include <QGradient>
- #include <QLinearGradient>
-+#include <QPainterPath>
- #include <QRadialGradient>
- #include <QMimeDatabase>
- #include <QMimeType>
-diff --git a/libs/flake/tests/TestShapeBackgroundCommand.cpp b/libs/flake/tests/TestShapeBackgroundCommand.cpp
-index a3a44cd46db..a8a8c164a6d 100644
---- a/libs/flake/tests/TestShapeBackgroundCommand.cpp
-+++ b/libs/flake/tests/TestShapeBackgroundCommand.cpp
-@@ -24,6 +24,7 @@
- #include "KoShapePaintingContext.h"
- #include "KoViewConverter.h"
-
-+#include <QPainterPath>
- #include <QTest>
-
- void TestShapeBackgroundCommand::refCounting()
-diff --git a/libs/flake/tests/TestSnapStrategy.cpp b/libs/flake/tests/TestSnapStrategy.cpp
-index 16015c2b2e2..ac86c23a7c4 100644
---- a/libs/flake/tests/TestSnapStrategy.cpp
-+++ b/libs/flake/tests/TestSnapStrategy.cpp
-@@ -30,6 +30,8 @@
- #include <KoSnapData.h>
- #include <KoGuidesData.h>
-
-+#include <QPainterPath>
-+
- void TestSnapStrategy::testOrthogonalSnap()
- {
- //Test case one - expected not to snap
-diff --git a/libs/flake/tools/KoPathTool.cpp b/libs/flake/tools/KoPathTool.cpp
-index 30ab5ab2b7a..811917a2ace 100644
---- a/libs/flake/tools/KoPathTool.cpp
-+++ b/libs/flake/tools/KoPathTool.cpp
-@@ -56,6 +56,7 @@
- #include <FlakeDebug.h>
- #include <klocalizedstring.h>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QBitmap>
- #include <QTabWidget>
-
-diff --git a/libs/pageapp/KoPADocumentModel.cpp b/libs/pageapp/KoPADocumentModel.cpp
-index 444fc8da163..949a8a21f23 100644
---- a/libs/pageapp/KoPADocumentModel.cpp
-+++ b/libs/pageapp/KoPADocumentModel.cpp
-@@ -48,6 +48,7 @@
- #include <QApplication>
- #include <QClipboard>
- #include <QMenu>
-+#include <QPainterPath>
-
- #include "commands/KoPAPageMoveCommand.h"
-
-diff --git a/libs/pageapp/KoPAPageBase.cpp b/libs/pageapp/KoPAPageBase.cpp
-index ebb76efac1b..2b92d47fcea 100644
---- a/libs/pageapp/KoPAPageBase.cpp
-+++ b/libs/pageapp/KoPAPageBase.cpp
-@@ -40,6 +40,7 @@
- #include <PageAppDebug.h>
-
- #include <QPainter>
-+#include <QPainterPath>
-
-
- KoPAPageBase::KoPAPageBase()
-diff --git a/libs/vectorimage/libemf/EmfOutputPainterStrategy.cpp b/libs/vectorimage/libemf/EmfOutputPainterStrategy.cpp
-index 60fddd99dca..6175951d34f 100644
---- a/libs/vectorimage/libemf/EmfOutputPainterStrategy.cpp
-+++ b/libs/vectorimage/libemf/EmfOutputPainterStrategy.cpp
-@@ -20,6 +20,8 @@
-
- #include <math.h>
-
-+#include <QPainterPath>
-+
- #include <VectorImageDebug.h>
-
- #include "EmfObjects.h"
-diff --git a/libs/vectorimage/libsvm/SvmPainterBackend.cpp b/libs/vectorimage/libsvm/SvmPainterBackend.cpp
-index 77d71adab8d..5f35cf31afa 100644
---- a/libs/vectorimage/libsvm/SvmPainterBackend.cpp
-+++ b/libs/vectorimage/libsvm/SvmPainterBackend.cpp
-@@ -25,6 +25,7 @@
- #include <QPolygon>
- #include <QString>
- #include <QPainter>
-+#include <QPainterPath>
-
- // Libsvm
- #include "SvmEnums.h"
-diff --git a/libs/widgets/KoMarkerItemDelegate.cpp b/libs/widgets/KoMarkerItemDelegate.cpp
-index acfa19db4a7..3acc4703022 100644
---- a/libs/widgets/KoMarkerItemDelegate.cpp
-+++ b/libs/widgets/KoMarkerItemDelegate.cpp
-@@ -24,6 +24,7 @@
- #include <KoMarker.h>
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPen>
-
- KoMarkerItemDelegate::KoMarkerItemDelegate(KoMarkerData::MarkerPosition position, QObject *parent)
-diff --git a/plugins/chartshape/ChartShape.cpp b/plugins/chartshape/ChartShape.cpp
-index b55cb21dd58..fc49be1399f 100644
---- a/plugins/chartshape/ChartShape.cpp
-+++ b/plugins/chartshape/ChartShape.cpp
-@@ -31,6 +31,7 @@
- // Qt
- #include <QPointF>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSizeF>
- #include <QTextDocument>
- #include <QStandardItemModel>
-diff --git a/plugins/chartshape/Legend.cpp b/plugins/chartshape/Legend.cpp
-index 01aae09724a..307d057127d 100644
---- a/plugins/chartshape/Legend.cpp
-+++ b/plugins/chartshape/Legend.cpp
-@@ -30,6 +30,7 @@
- #include <QBrush>
- #include <QFont>
- #include <QImage>
-+#include <QPainterPath>
-
- // Calligra
- #include <KoXmlReader.h>
-diff --git a/plugins/chartshape/PlotArea.cpp b/plugins/chartshape/PlotArea.cpp
-index 58543bf9bf6..7614e8f909e 100644
---- a/plugins/chartshape/PlotArea.cpp
-+++ b/plugins/chartshape/PlotArea.cpp
-@@ -28,6 +28,7 @@
- #include <QList>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
-
- // Calligra
- #include <KoXmlNS.h>
-diff --git a/plugins/defaultTools/defaulttool/DefaultTool.cpp b/plugins/defaultTools/defaulttool/DefaultTool.cpp
-index aa7f1a97aba..c9ac8cc486c 100644
---- a/plugins/defaultTools/defaulttool/DefaultTool.cpp
-+++ b/plugins/defaultTools/defaulttool/DefaultTool.cpp
-@@ -63,6 +63,7 @@
-
- #include <QAction>
- #include <QKeyEvent>
-+#include <QPainterPath>
- #include <QClipboard>
- #include <QStandardPaths>
-
-diff --git a/plugins/formulashape/elements/BasicElement.cpp b/plugins/formulashape/elements/BasicElement.cpp
-index 2cbe039ee4c..485c9ffb0f0 100644
---- a/plugins/formulashape/elements/BasicElement.cpp
-+++ b/plugins/formulashape/elements/BasicElement.cpp
-@@ -32,6 +32,7 @@
- #include <KoXmlReader.h>
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QVariant>
-
-
-diff --git a/plugins/formulashape/elements/FixedElement.cpp b/plugins/formulashape/elements/FixedElement.cpp
-index cce1fdc4d11..8ae09bba9c7 100644
---- a/plugins/formulashape/elements/FixedElement.cpp
-+++ b/plugins/formulashape/elements/FixedElement.cpp
-@@ -25,6 +25,7 @@
- #include <KoXmlReader.h>
-
- #include <QPainter>
-+#include <QPainterPath>
-
-
- FixedElement::FixedElement( BasicElement* parent ) : BasicElement( parent )
-diff --git a/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp b/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
-index 9ec48a1bf5a..a1b871dfc61 100644
---- a/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
-+++ b/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
-@@ -27,6 +27,7 @@
-
- #include <QDebug>
- #include <QColor>
-+#include <QPainterPath>
-
- #include <cmath>
- #include <cstdlib>
-diff --git a/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h b/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
-index 04b5b51bbb9..a44e043c4b7 100644
---- a/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
-+++ b/plugins/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
-@@ -22,6 +22,7 @@
-
- #include <KoToolBase.h>
- #include <KoPathShape.h>
-+#include <QPainterPath>
- #include <QPointer>
-
- class KoPathShape;
-diff --git a/plugins/musicshape/MusicStyle.cpp b/plugins/musicshape/MusicStyle.cpp
-index ed52e11580d..1e174c6938d 100644
---- a/plugins/musicshape/MusicStyle.cpp
-+++ b/plugins/musicshape/MusicStyle.cpp
-@@ -17,6 +17,9 @@
- * Boston, MA 02110-1301, USA.
- */
- #include "MusicStyle.h"
-+
-+#include <QPainterPath>
-+
- using namespace MusicCore;
-
- MusicStyle::MusicStyle()
-diff --git a/plugins/musicshape/Renderer.cpp b/plugins/musicshape/Renderer.cpp
-index 679de969b63..0b0c2262529 100644
---- a/plugins/musicshape/Renderer.cpp
-+++ b/plugins/musicshape/Renderer.cpp
-@@ -33,6 +33,7 @@
- #include "core/StaffSystem.h"
-
- #include <QMultiMap>
-+#include <QPainterPath>
-
- #include <climits>
-
-diff --git a/plugins/pathshapes/enhancedpath/EnhancedPathShape.cpp b/plugins/pathshapes/enhancedpath/EnhancedPathShape.cpp
-index 9480187c391..4ff471c4ea6 100644
---- a/plugins/pathshapes/enhancedpath/EnhancedPathShape.cpp
-+++ b/plugins/pathshapes/enhancedpath/EnhancedPathShape.cpp
-@@ -36,6 +36,8 @@
- #include <KoOdfWorkaround.h>
- #include <KoPathPoint.h>
-
-+#include <QPainterPath>
-+
- EnhancedPathShape::EnhancedPathShape(const QRect &viewBox)
- : m_viewBox(viewBox)
- , m_viewBoxOffset(0.0, 0.0)
-diff --git a/plugins/textshape/TextShape.cpp b/plugins/textshape/TextShape.cpp
-index 689199101b6..cfefe228deb 100644
---- a/plugins/textshape/TextShape.cpp
-+++ b/plugins/textshape/TextShape.cpp
-@@ -58,6 +58,7 @@
- #include <QApplication>
- #include <QFont>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPen>
- #include <QTextLayout>
-
-diff --git a/sheets/ui/SheetView.cpp b/sheets/ui/SheetView.cpp
-index 6260d1fda25..0620cc16edc 100644
---- a/sheets/ui/SheetView.cpp
-+++ b/sheets/ui/SheetView.cpp
-@@ -23,6 +23,7 @@
- #include <QCache>
- #include <QRect>
- #include <QPainter>
-+#include <QPainterPath>
- #ifdef CALLIGRA_SHEETS_MT
- #include <QMutex>
- #include <QMutexLocker>
-diff --git a/stage/part/KPrPresentationHighlightWidget.cpp b/stage/part/KPrPresentationHighlightWidget.cpp
-index ee27dd31b3b..adeaf67c016 100644
---- a/stage/part/KPrPresentationHighlightWidget.cpp
-+++ b/stage/part/KPrPresentationHighlightWidget.cpp
-@@ -26,6 +26,7 @@
- #include <QMouseEvent>
- #include <QColor>
- #include <QPainter>
-+#include <QPainterPath>
-
- KPrPresentationHighlightWidget::KPrPresentationHighlightWidget( KoPACanvasBase * canvas )
- : KPrPresentationToolEventForwarder(canvas)
-diff --git a/stage/plugins/pageeffects/edgewipe/barndoorwipe/BarnDoorWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/barndoorwipe/BarnDoorWipeStrategy.cpp
-index a646b31a369..7aee18d3fbc 100644
---- a/stage/plugins/pageeffects/edgewipe/barndoorwipe/BarnDoorWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/barndoorwipe/BarnDoorWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "BarnDoorWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/barnveewipe/BarnVeeWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/barnveewipe/BarnVeeWipeStrategy.cpp
-index f3e0bcaba4d..b4d10ac1ef2 100644
---- a/stage/plugins/pageeffects/edgewipe/barnveewipe/BarnVeeWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/barnveewipe/BarnVeeWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "BarnVeeWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/barnzigzagwipe/BarnZigZagWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/barnzigzagwipe/BarnZigZagWipeStrategy.cpp
-index 3daf68d90cd..c56581e6a76 100644
---- a/stage/plugins/pageeffects/edgewipe/barnzigzagwipe/BarnZigZagWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/barnzigzagwipe/BarnZigZagWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "BarnZigZagWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/boxwipe/BoxWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/boxwipe/BoxWipeStrategy.cpp
-index b73e4a58c2c..3d037b5995f 100644
---- a/stage/plugins/pageeffects/edgewipe/boxwipe/BoxWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/boxwipe/BoxWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "BoxWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/diagonalwipe/DiagonalWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/diagonalwipe/DiagonalWipeStrategy.cpp
-index 4d3fc68dae0..9a7d8841108 100644
---- a/stage/plugins/pageeffects/edgewipe/diagonalwipe/DiagonalWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/diagonalwipe/DiagonalWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "DiagonalWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersInWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersInWipeStrategy.cpp
-index 99f7297ca13..06c8bcbc449 100644
---- a/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersInWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersInWipeStrategy.cpp
-@@ -21,6 +21,8 @@
- #include "FourBoxWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersOutWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersOutWipeStrategy.cpp
-index 1e5a7da69ab..35a5c9dbccb 100644
---- a/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersOutWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/fourboxwipe/CornersOutWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "FourBoxWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleBarnDoorWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleBarnDoorWipeStrategy.cpp
-index 600e78f66c0..1b5879b6213 100644
---- a/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleBarnDoorWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleBarnDoorWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "MiscDiagonalWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleDiamondWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleDiamondWipeStrategy.cpp
-index 882a7891d44..28cc8bdc43f 100644
---- a/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleDiamondWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/miscdiagonalwipe/DoubleDiamondWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "MiscDiagonalWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/veewipe/VeeWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/veewipe/VeeWipeStrategy.cpp
-index 203da474d4e..fa36ff45290 100644
---- a/stage/plugins/pageeffects/edgewipe/veewipe/VeeWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/veewipe/VeeWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "VeeWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/stage/plugins/pageeffects/edgewipe/zigzagwipe/ZigZagWipeStrategy.cpp b/stage/plugins/pageeffects/edgewipe/zigzagwipe/ZigZagWipeStrategy.cpp
-index 7abf3fb3812..79e43fb66ed 100644
---- a/stage/plugins/pageeffects/edgewipe/zigzagwipe/ZigZagWipeStrategy.cpp
-+++ b/stage/plugins/pageeffects/edgewipe/zigzagwipe/ZigZagWipeStrategy.cpp
-@@ -21,6 +21,7 @@
- #include "ZigZagWipeEffectFactory.h"
- #include <QWidget>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int StepCount = 250;
-
-diff --git a/words/part/frames/KWFrameLayout.cpp b/words/part/frames/KWFrameLayout.cpp
-index eac179995d3..a2a5c7d802d 100644
---- a/words/part/frames/KWFrameLayout.cpp
-+++ b/words/part/frames/KWFrameLayout.cpp
-@@ -37,6 +37,7 @@
- #include <KoShapeBackground.h>
- #include <KoColumns.h>
-
-+#include <QPainterPath>
- #include <QTextLayout>
- #include <QTextDocument>
- #include <QTextBlock>
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 6a4b128..ba5b76e 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -80,13 +80,6 @@ package-repositories:
url: http://origin.archive.neon.kde.org/user
key-server: keyserver.ubuntu.com
parts:
- patches:
- source: patches/
- plugin: dump
- prime:
- - "-*"
- stage:
- - qt5.15.diff
calligra:
after:
- kdelibs4support
@@ -150,16 +143,12 @@ parts:
- libwpd-0.10-10
- libwpg-0.3-3
- libwps-0.4-4
- override-build: |-
- cd $SNAPCRAFT_PART_SRC
- patch -p1 < $SNAPCRAFT_STAGE/qt5.15.diff
- snapcraftctl build
parse-info:
- usr/share/metainfo/org.kde.calligrawords.appdata.xml
- usr/share/metainfo/org.kde.calligrasheets.appdata.xml
- usr/share/metainfo/org.kde.calligrastage.appdata.xml
- usr/share/metainfo/org.kde.karbon.appdata.xml
- source: https://download.kde.org/unstable/calligra/calligra-3.1.90.tar.xz
+ source: https://download.kde.org/stable/calligra/calligra-3.2.0.tar.xz
cmake-parameters:
- "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
- "-DCMAKE_INSTALL_PREFIX=/usr"
More information about the Neon-commits
mailing list