On Thu, Oct 22, 2020 at 07:30:34PM +0300, Dmitry Shachnev wrote: > Attached is the NMU debdiff that can also be applied via git am.
Sorry, forgot to attach the file. Doing it now. -- Dmitry Shachnev
From 69d89f7d91444367ccdc87acc83d905c34ea1519 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev <[email protected]> Date: Wed, 21 Oct 2020 20:11:53 +0300 Subject: [PATCH] Backport upstream patch to fix build with Qt 5.15. Closes: #972155. --- debian/changelog | 7 + ...001-Fix-build-failures-under-Qt-5.15.patch | 245 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 253 insertions(+) create mode 100644 debian/patches/0001-Fix-build-failures-under-Qt-5.15.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 76f2a50f..eb97652b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dtkwidget (2.1.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream patch to fix build with Qt 5.15 (closes: #972155). + + -- Dmitry Shachnev <[email protected]> Thu, 22 Oct 2020 14:08:37 +0300 + dtkwidget (2.1.1-1) unstable; urgency=medium * Upload to unstable. diff --git a/debian/patches/0001-Fix-build-failures-under-Qt-5.15.patch b/debian/patches/0001-Fix-build-failures-under-Qt-5.15.patch new file mode 100644 index 00000000..931da00a --- /dev/null +++ b/debian/patches/0001-Fix-build-failures-under-Qt-5.15.patch @@ -0,0 +1,245 @@ +From: Felix Yan <[email protected]> +Date: Thu, 11 Jun 2020 16:17:21 +0800 +Subject: Fix build failures under Qt 5.15+ + +(cherry picked from commit c2184adac8fcef9456b9bc7d1802307a5de402e0) +--- + examples/dwidget-examples/collections/graphicseffecttab.cpp | 1 + + examples/dwidget-examples/collections/multilistitem.cpp | 1 + + examples/dwidget-examples/collections/singlelistitem.cpp | 1 + + src/widgets/dborderlesswidget.cpp | 1 + + src/widgets/dclipeffectwidget.cpp | 1 + + src/widgets/dclipeffectwidget.h | 1 + + src/widgets/dcrumbedit.cpp | 1 + + src/widgets/ddialog.h | 4 ++-- + src/widgets/dgraphicsclipeffect.cpp | 1 + + src/widgets/dgraphicsclipeffect.h | 1 + + src/widgets/dmainwindow.h | 1 + + src/widgets/dsegmentedcontrol.cpp | 1 + + src/widgets/dsimplelistview.cpp | 1 + + src/widgets/dspinner.cpp | 1 + + src/widgets/dvideowidget.cpp | 1 + + src/widgets/dwaterprogress.cpp | 1 + + src/widgets/private/dblureffectwidget_p.h | 1 + + src/widgets/private/settings/shortcutedit.cpp | 1 + + 18 files changed, 19 insertions(+), 2 deletions(-) + +diff --git a/examples/dwidget-examples/collections/graphicseffecttab.cpp b/examples/dwidget-examples/collections/graphicseffecttab.cpp +index 8f8c6ea..d60dcac 100644 +--- a/examples/dwidget-examples/collections/graphicseffecttab.cpp ++++ b/examples/dwidget-examples/collections/graphicseffecttab.cpp +@@ -21,6 +21,7 @@ + + #include <QLabel> + #include <QDebug> ++#include <QPainterPath> + DWIDGET_USE_NAMESPACE + + GraphicsEffectTab::GraphicsEffectTab(QWidget *parent) : QWidget(parent) +diff --git a/examples/dwidget-examples/collections/multilistitem.cpp b/examples/dwidget-examples/collections/multilistitem.cpp +index fb77e62..494cbd8 100644 +--- a/examples/dwidget-examples/collections/multilistitem.cpp ++++ b/examples/dwidget-examples/collections/multilistitem.cpp +@@ -17,6 +17,7 @@ + + #include "multilistitem.h" + #include <QColor> ++#include <QPainterPath> + + DWIDGET_USE_NAMESPACE + +diff --git a/examples/dwidget-examples/collections/singlelistitem.cpp b/examples/dwidget-examples/collections/singlelistitem.cpp +index 4c9a34c..8c160b5 100644 +--- a/examples/dwidget-examples/collections/singlelistitem.cpp ++++ b/examples/dwidget-examples/collections/singlelistitem.cpp +@@ -17,6 +17,7 @@ + + #include "singlelistitem.h" + #include <QColor> ++#include <QPainterPath> + + DWIDGET_USE_NAMESPACE + +diff --git a/src/widgets/dborderlesswidget.cpp b/src/widgets/dborderlesswidget.cpp +index 9273e03..1db38f2 100644 +--- a/src/widgets/dborderlesswidget.cpp ++++ b/src/widgets/dborderlesswidget.cpp +@@ -25,6 +25,7 @@ + #include <QTemporaryFile> + #include <QImage> + #include <QPainter> ++#include <QPainterPath> + #include <QGuiApplication> + #include <QWindow> + +diff --git a/src/widgets/dclipeffectwidget.cpp b/src/widgets/dclipeffectwidget.cpp +index 4ede876..736e1d4 100644 +--- a/src/widgets/dclipeffectwidget.cpp ++++ b/src/widgets/dclipeffectwidget.cpp +@@ -22,6 +22,7 @@ + #include <QBackingStore> + #include <QPainter> + #include <QPaintEvent> ++#include <QPainterPath> + #include <QDebug> + + #include <qpa/qplatformbackingstore.h> +diff --git a/src/widgets/dclipeffectwidget.h b/src/widgets/dclipeffectwidget.h +index 2db0ca1..1ed0e66 100644 +--- a/src/widgets/dclipeffectwidget.h ++++ b/src/widgets/dclipeffectwidget.h +@@ -22,6 +22,7 @@ + #include "dobject.h" + + #include <QWidget> ++#include <QPainterPath> + + DWIDGET_BEGIN_NAMESPACE + +diff --git a/src/widgets/dcrumbedit.cpp b/src/widgets/dcrumbedit.cpp +index 138cfc7..da0daf6 100644 +--- a/src/widgets/dcrumbedit.cpp ++++ b/src/widgets/dcrumbedit.cpp +@@ -23,6 +23,7 @@ + + #include <QAbstractTextDocumentLayout> + #include <QPainter> ++#include <QPainterPath> + #include <QTextBlock> + #include <QStyleOptionFrame> + #include <QMouseEvent> +diff --git a/src/widgets/ddialog.h b/src/widgets/ddialog.h +index 276cde1..92825a1 100644 +--- a/src/widgets/ddialog.h ++++ b/src/widgets/ddialog.h +@@ -92,8 +92,8 @@ public Q_SLOTS: + bool setDefaultButton(int index); + bool setDefaultButton(const QString &str); + void setDefaultButton(QAbstractButton *button); +- void addContent(QWidget *widget, Qt::Alignment alignment = 0); +- void insertContent(int index, QWidget *widget, Qt::Alignment alignment = 0); ++ void addContent(QWidget *widget, Qt::Alignment alignment = {}); ++ void insertContent(int index, QWidget *widget, Qt::Alignment alignment = {}); + void removeContent(QWidget *widget, bool isDelete = true); + void clearContents(bool isDelete = true); + void setSpacing(int spacing); +diff --git a/src/widgets/dgraphicsclipeffect.cpp b/src/widgets/dgraphicsclipeffect.cpp +index 21e0a46..33d68c1 100644 +--- a/src/widgets/dgraphicsclipeffect.cpp ++++ b/src/widgets/dgraphicsclipeffect.cpp +@@ -19,6 +19,7 @@ + #include <DObjectPrivate> + + #include <QPainter> ++#include <QPainterPath> + #include <QDebug> + + DWIDGET_BEGIN_NAMESPACE +diff --git a/src/widgets/dgraphicsclipeffect.h b/src/widgets/dgraphicsclipeffect.h +index ced14b6..1bf7f86 100644 +--- a/src/widgets/dgraphicsclipeffect.h ++++ b/src/widgets/dgraphicsclipeffect.h +@@ -22,6 +22,7 @@ + #include "dobject.h" + + #include <QGraphicsEffect> ++#include <QPainterPath> + + DWIDGET_BEGIN_NAMESPACE + +diff --git a/src/widgets/dmainwindow.h b/src/widgets/dmainwindow.h +index 8c75162..6205baf 100644 +--- a/src/widgets/dmainwindow.h ++++ b/src/widgets/dmainwindow.h +@@ -22,6 +22,7 @@ + #include "dobject.h" + + #include <QMainWindow> ++#include <QPainterPath> + + DWIDGET_BEGIN_NAMESPACE + +diff --git a/src/widgets/dsegmentedcontrol.cpp b/src/widgets/dsegmentedcontrol.cpp +index 613b692..57f438e 100644 +--- a/src/widgets/dsegmentedcontrol.cpp ++++ b/src/widgets/dsegmentedcontrol.cpp +@@ -18,6 +18,7 @@ + #include <QDebug> + #include <QPainter> + #include <QPaintEvent> ++#include <QPainterPath> + #include <QApplication> + + #include "dsegmentedcontrol.h" +diff --git a/src/widgets/dsimplelistview.cpp b/src/widgets/dsimplelistview.cpp +index 841b2d4..7505372 100644 +--- a/src/widgets/dsimplelistview.cpp ++++ b/src/widgets/dsimplelistview.cpp +@@ -31,6 +31,7 @@ + #include <QWheelEvent> + #include <QtMath> + #include <QPointer> ++#include <QPainterPath> + + #include "dhidpihelper.h" + +diff --git a/src/widgets/dspinner.cpp b/src/widgets/dspinner.cpp +index 014f370..e3e6d2f 100644 +--- a/src/widgets/dspinner.cpp ++++ b/src/widgets/dspinner.cpp +@@ -2,6 +2,7 @@ + + #include <QtMath> + #include <QPainter> ++#include <QPainterPath> + #include <QTimer> + + #include <DObjectPrivate> +diff --git a/src/widgets/dvideowidget.cpp b/src/widgets/dvideowidget.cpp +index 8502429..b32d2e2 100644 +--- a/src/widgets/dvideowidget.cpp ++++ b/src/widgets/dvideowidget.cpp +@@ -24,6 +24,7 @@ + #include <QMediaPlayer> + #include <QMediaPlaylist> + #include <QPainter> ++#include <QPainterPath> + #include <QPointer> + + DWIDGET_BEGIN_NAMESPACE +diff --git a/src/widgets/dwaterprogress.cpp b/src/widgets/dwaterprogress.cpp +index 019ef61..777b637 100644 +--- a/src/widgets/dwaterprogress.cpp ++++ b/src/widgets/dwaterprogress.cpp +@@ -20,6 +20,7 @@ + #include <QtMath> + #include <QTimer> + #include <QPainter> ++#include <QPainterPath> + #include <QGraphicsDropShadowEffect> + + #include <DObjectPrivate> +diff --git a/src/widgets/private/dblureffectwidget_p.h b/src/widgets/private/dblureffectwidget_p.h +index 792e283..7154904 100644 +--- a/src/widgets/private/dblureffectwidget_p.h ++++ b/src/widgets/private/dblureffectwidget_p.h +@@ -18,6 +18,7 @@ + #ifndef DBLUREFFECTWIDGET_P_H + #define DBLUREFFECTWIDGET_P_H + ++#include <QPainterPath> + #include <DObjectPrivate> + #include "dblureffectwidget.h" + +diff --git a/src/widgets/private/settings/shortcutedit.cpp b/src/widgets/private/settings/shortcutedit.cpp +index 4e46c11..22cee57 100644 +--- a/src/widgets/private/settings/shortcutedit.cpp ++++ b/src/widgets/private/settings/shortcutedit.cpp +@@ -19,6 +19,7 @@ + + #include <QDebug> + #include <QPainter> ++#include <QPainterPath> + #include <QKeySequence> + #include <QKeyEvent> + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..4a46a6f4 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Fix-build-failures-under-Qt-5.15.patch -- 2.28.0
signature.asc
Description: PGP signature
