Hello community, here is the log from the commit of package dtkwidget for openSUSE:Factory checked in at 2020-06-17 14:51:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dtkwidget (Old) and /work/SRC/openSUSE:Factory/.dtkwidget.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dtkwidget" Wed Jun 17 14:51:57 2020 rev:8 rq:815281 version:2.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dtkwidget/dtkwidget.changes 2020-03-21 00:01:32.365103390 +0100 +++ /work/SRC/openSUSE:Factory/.dtkwidget.new.3606/dtkwidget.changes 2020-06-17 14:52:41.265464049 +0200 @@ -1,0 +2,5 @@ +Tue Jun 16 14:56:35 UTC 2020 - Hillwood Yang <hillw...@opensuse.org> + +- Add dtkwidget-qt-5_15.patch, Support Qt 5.15 + +------------------------------------------------------------------- New: ---- dtkwidget-qt-5_15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtkwidget.spec ++++++ --- /var/tmp/diff_new_pack.ae90kg/_old 2020-06-17 14:52:44.177474020 +0200 +++ /var/tmp/diff_new_pack.ae90kg/_new 2020-06-17 14:52:44.181474034 +0200 @@ -1,7 +1,7 @@ # # spec file for package dtkwidget # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2019 Hillwood Yang <hillw...@opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -25,10 +25,12 @@ Summary: Deepin graphical user interface library License: GPL-3.0-or-later Group: System/GUI/Other -Url: https://github.com/linuxdeepin/dtkwidget +URL: https://github.com/linuxdeepin/dtkwidget Source0: https://github.com/linuxdeepin/dtkwidget/archive/%{version}/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTEAM dtkwidget-fix-lost-pkgconfig.patch hillw...@opensuse.org - fix lost pkgconfig Patch0: dtkwidget-fix-lost-pkgconfig.patch +# PATCH-FIX-UPSTEAM dtkwidget-qt-5_15.patch hillw...@opensuse.org - Support Qt 5.15 +Patch1: dtkwidget-qt-5_15.patch BuildRequires: fdupes BuildRequires: libqt5-linguist BuildRequires: libqt5-qtbase-private-headers-devel @@ -76,13 +78,16 @@ %prep %setup -q %patch0 -p1 +%if 0%{?suse_version} > 1500 +%patch1 -p1 +%endif %build # sed -i "s/lrelease/lrelease-qt5/g" tools/translate_generation.* %qmake5 DEFINES+=QT_NO_DEBUG_OUTPUT \ PREFIX=%{_prefix} \ LIB_INSTALL_DIR=%{_libdir} -make %{?_smp_mflags} +%make_build %install %qmake5_install ++++++ dtkwidget-qt-5_15.patch ++++++ diff --git a/examples/dwidget-examples/collections/graphicseffecttab.cpp b/examples/dwidget-examples/collections/graphicseffecttab.cpp index 2497f47..22483bf 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 6c55abf..0cdda21 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 9e1cb15..27f77df 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/dclipeffectwidget.cpp b/src/widgets/dclipeffectwidget.cpp index b9e9190..79011e2 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 f845ba5..71d1432 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/dgraphicsclipeffect.cpp b/src/widgets/dgraphicsclipeffect.cpp index 1624784..81b5487 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 8ee8944..cd65749 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/dsegmentedcontrol.cpp b/src/widgets/dsegmentedcontrol.cpp index b39fe0b..6bd38ef 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 01d5ff7..872b84d 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/dvideowidget.cpp b/src/widgets/dvideowidget.cpp index f0a0d71..53e0973 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 -Nur a/src/widgets/dwaterprogress.cpp b/src/widgets/dwaterprogress.cpp --- a/src/widgets/dwaterprogress.cpp 2019-07-30 19:07:11.000000000 +0800 +++ b/src/widgets/dwaterprogress.cpp 2020-06-16 22:12:46.341356838 +0800 @@ -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 ecb8377..d3822d8 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 d0d6d45..c502c4c 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 -Nur a/src/widgets/dcrumbedit.cpp b/src/widgets/dcrumbedit.cpp --- a/src/widgets/dcrumbedit.cpp 2019-07-30 19:07:11.000000000 +0800 +++ b/src/widgets/dcrumbedit.cpp 2020-06-16 22:00:26.453061630 +0800 @@ -23,6 +23,7 @@ #include <QAbstractTextDocumentLayout> #include <QPainter> +#include <QPainterPath> #include <QTextBlock> #include <QStyleOptionFrame> #include <QMouseEvent> diff -Nur a/src/widgets/ddialog.h b/src/widgets/ddialog.h --- a/src/widgets/ddialog.h 2019-07-30 19:07:11.000000000 +0800 +++ b/src/widgets/ddialog.h 2020-06-16 22:01:33.853088254 +0800 @@ -92,8 +92,8 @@ 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 -Nur a/src/widgets/dmainwindow.h b/src/widgets/dmainwindow.h --- a/src/widgets/dmainwindow.h 2019-07-30 19:07:11.000000000 +0800 +++ b/src/widgets/dmainwindow.h 2020-06-16 22:02:23.813107989 +0800 @@ -22,6 +22,7 @@ #include "dobject.h" #include <QMainWindow> +#include <QPainterPath> DWIDGET_BEGIN_NAMESPACE diff -Nur a/src/widgets/dspinner.cpp b/src/widgets/dspinner.cpp --- a/src/widgets/dspinner.cpp 2019-07-30 19:07:11.000000000 +0800 +++ b/src/widgets/dspinner.cpp 2020-06-16 22:03:20.297130301 +0800 @@ -2,6 +2,7 @@ #include <QtMath> #include <QPainter> +#include <QPainterPath> #include <QTimer> #include <DObjectPrivate> diff -Nur a/src/widgets/dborderlesswidget.cpp b/src/widgets/dborderlesswidget.cpp --- a/src/widgets/dborderlesswidget.cpp 2019-07-30 19:07:11.000000000 +0800 +++ b/src/widgets/dborderlesswidget.cpp 2020-06-16 22:22:58.089602903 +0800 @@ -25,6 +25,7 @@ #include <QTemporaryFile> #include <QImage> #include <QPainter> +#include <QPainterPath> #include <QGuiApplication> #include <QWindow>