Control: tags -1 + pending On Fri, Oct 16, 2020 at 08:49:38PM +0300, Dmitry Shachnev wrote: > Dear Maintainer, > > deepin-screenshot fails to build with Qt 5.15, currently available in > experimental.
I have just uploaded an NMU fixing this to DELAYED/5. The debdiff is attached, and I also created a merge request: https://salsa.debian.org/pkg-deepin-team/deepin-screenshot/-/merge_requests/2 -- Dmitry Shachnev
diff --git a/debian/changelog b/debian/changelog index 308832b..97730fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +deepin-screenshot (5.0.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Debian Janitor ] + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + + [ Dmitry Shachnev ] + * Add a patch to fix build with Qt 5.15 (closes: #972354). + + -- Dmitry Shachnev <mity...@debian.org> Sat, 24 Oct 2020 13:07:59 +0300 + deepin-screenshot (5.0.0-1) unstable; urgency=medium * New upstream release 5.0.0. diff --git a/debian/patches/0002-Add-missing-QPainterPath-include.patch b/debian/patches/0002-Add-missing-QPainterPath-include.patch new file mode 100644 index 0000000..c7d0499 --- /dev/null +++ b/debian/patches/0002-Add-missing-QPainterPath-include.patch @@ -0,0 +1,20 @@ +From: Dmitry Shachnev <mity...@debian.org> +Date: Sat, 24 Oct 2020 13:05:51 +0300 +Subject: Add missing QPainterPath include to fix build with Qt 5.15 + +--- + src/widgets/shapeswidget.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/widgets/shapeswidget.cpp b/src/widgets/shapeswidget.cpp +index 3421937..5d346b4 100644 +--- a/src/widgets/shapeswidget.cpp ++++ b/src/widgets/shapeswidget.cpp +@@ -21,6 +21,7 @@ + + #include <QApplication> + #include <QPainter> ++#include <QPainterPath> + #include <QDebug> + + #include "src/utils/calculaterect.h" diff --git a/debian/patches/series b/debian/patches/series index 4cd7e70..da7f854 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-bypass-deepin-turbo-invoker.patch +0002-Add-missing-QPainterPath-include.patch diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..028eeda --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,4 @@ +Bug-Database: https://github.com/linuxdeepin/deepin-screenshot/issues +Bug-Submit: https://github.com/linuxdeepin/deepin-screenshot/issues/new +Repository: https://github.com/linuxdeepin/deepin-screenshot.git +Repository-Browse: https://github.com/linuxdeepin/deepin-screenshot
signature.asc
Description: PGP signature
