Control: tags -1 + pending On Tue, Oct 13, 2020 at 08:44:41PM +0300, Dmitry Shachnev wrote: > Dear Maintainer, > > zeal fails to build with Qt 5.15, currently available in experimental: > > /build/zeal-0.6.1/src/libs/ui/searchitemdelegate.cpp: In member function > 'virtual void Zeal::WidgetUi::SearchItemDelegate::paint(QPainter*, const > QStyleOptionViewItem&, const QModelIndex&) const': > [...] > /build/zeal-0.6.1/src/libs/ui/searchitemdelegate.cpp:143:26: error: > aggregate 'QPainterPath path' has incomplete type and cannot be defined > 143 | QPainterPath path; > | ^~~~ > > The full build log is attached.
I have just uploaded the NMU fixing this to DELAYED/5. The debdiff is attached, and I have also pushed the change to salsa. -- Dmitry Shachnev
diff -Nru zeal-0.6.1/debian/changelog zeal-0.6.1/debian/changelog --- zeal-0.6.1/debian/changelog 2018-10-31 09:44:09.000000000 +0300 +++ zeal-0.6.1/debian/changelog 2020-10-25 13:29:32.000000000 +0300 @@ -1,3 +1,10 @@ +zeal (1:0.6.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream patch to fix build with Qt 5.15 (closes: #972177). + + -- Dmitry Shachnev <mity...@debian.org> Sun, 25 Oct 2020 13:29:32 +0300 + zeal (1:0.6.1-1) unstable; urgency=medium * New upstream release. diff -Nru zeal-0.6.1/debian/patches/0002-Fix-compilation-error-with-Qt-5.15.patch zeal-0.6.1/debian/patches/0002-Fix-compilation-error-with-Qt-5.15.patch --- zeal-0.6.1/debian/patches/0002-Fix-compilation-error-with-Qt-5.15.patch 1970-01-01 03:00:00.000000000 +0300 +++ zeal-0.6.1/debian/patches/0002-Fix-compilation-error-with-Qt-5.15.patch 2020-10-25 13:29:32.000000000 +0300 @@ -0,0 +1,21 @@ +From: Dmitry Atamanov <data-...@users.noreply.github.com> +Date: Sun, 26 Apr 2020 02:26:53 +0500 +Subject: fix(ui): fix compilation error with Qt 5.15 (#1218) + +(cherry picked from commit 064aaa05d6a3ba4ba3cf648199a3109aba2f41fe) +--- + src/libs/ui/searchitemdelegate.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libs/ui/searchitemdelegate.cpp b/src/libs/ui/searchitemdelegate.cpp +index 4bd6d0a..d8ad79b 100644 +--- a/src/libs/ui/searchitemdelegate.cpp ++++ b/src/libs/ui/searchitemdelegate.cpp +@@ -27,6 +27,7 @@ + #include <QFontMetrics> + #include <QHelpEvent> + #include <QPainter> ++#include <QPainterPath> + #include <QToolTip> + + using namespace Zeal::WidgetUi; diff -Nru zeal-0.6.1/debian/patches/series zeal-0.6.1/debian/patches/series --- zeal-0.6.1/debian/patches/series 2018-10-12 13:20:53.000000000 +0300 +++ zeal-0.6.1/debian/patches/series 2020-10-25 13:29:32.000000000 +0300 @@ -1 +1,2 @@ 0001-Disable-ad-by-default.patch +0002-Fix-compilation-error-with-Qt-5.15.patch
signature.asc
Description: PGP signature
