diff -Nru trojita-0.7/debian/changelog trojita-0.7/debian/changelog --- trojita-0.7/debian/changelog 2020-03-30 00:02:44.000000000 +0000 +++ trojita-0.7/debian/changelog 2021-01-07 02:56:08.000000000 +0000 @@ -1,3 +1,10 @@ +trojita (0.7-0ubuntu5) hirsute; urgency=medium + + * d/p/0001-Fix-build-with-Qt-5.15.0.patch: Cherrypick patch from upstream + Git to fix FTBFS with Qt 5.15.0. + + -- Logan Rosen Wed, 06 Jan 2021 21:56:08 -0500 + trojita (0.7-0ubuntu4) focal; urgency=medium * d/trojita.install: Account for multiarch include path, fixing FTBFS. diff -Nru trojita-0.7/debian/patches/0001-Fix-build-with-Qt-5.15.0.patch trojita-0.7/debian/patches/0001-Fix-build-with-Qt-5.15.0.patch --- trojita-0.7/debian/patches/0001-Fix-build-with-Qt-5.15.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ trojita-0.7/debian/patches/0001-Fix-build-with-Qt-5.15.0.patch 2021-01-07 02:55:53.000000000 +0000 @@ -0,0 +1,23 @@ +From 2869c385e72932cbed7398742b8a4d5e3feda765 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Tue, 24 Mar 2020 13:14:43 +0100 +Subject: [PATCH] Fix build with Qt 5.15.0 + +QPainterPath is no longer included via qtransform.h (since +5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). + +Change-Id: Ibb59e769bba8514d86aa886afee26a2395d458ef +--- + src/Gui/Window.cpp | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/Gui/Window.cpp ++++ b/src/Gui/Window.cpp +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff -Nru trojita-0.7/debian/patches/series trojita-0.7/debian/patches/series --- trojita-0.7/debian/patches/series 2018-10-10 16:22:18.000000000 +0000 +++ trojita-0.7/debian/patches/series 2021-01-07 02:55:45.000000000 +0000 @@ -1,2 +1,3 @@ vanilla-gpgme-support.patch fix-gpg-test.patch +0001-Fix-build-with-Qt-5.15.0.patch