Package: psi-plus Version: 1.4.554-4 Followup-For: Bug #974207 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu hirsute ubuntu-patch X-Debbugs-Cc: lo...@ubuntu.com Control: tags -1 patch
Hi, In Ubuntu, the attached patch was applied to achieve the following: * d/p/qt-5.15.patch: Explicitly include QPainterPath to fix FTBFS with Qt 5.15. Thanks for considering the patch. Logan
diff -Nru psi-plus-1.4.554/debian/patches/qt-5.15.patch psi-plus-1.4.554/debian/patches/qt-5.15.patch --- psi-plus-1.4.554/debian/patches/qt-5.15.patch 1969-12-31 19:00:00.000000000 -0500 +++ psi-plus-1.4.554/debian/patches/qt-5.15.patch 2021-01-11 22:20:22.000000000 -0500 @@ -0,0 +1,51 @@ +--- a/src/plugins/generic/screenshotplugin/screenshot.cpp ++++ b/src/plugins/generic/screenshotplugin/screenshot.cpp +@@ -32,6 +32,7 @@ + #include <QCloseEvent> + #include <QDesktopServices> + #include <QClipboard> ++#include <QPainterPath> + + + #include "screenshot.h" +--- a/src/avatars.cpp ++++ b/src/avatars.cpp +@@ -35,6 +35,7 @@ + #include <QBuffer> + #include <QPainter> + #include <QImageReader> ++#include <QPainterPath> + + #include "xmpp_xmlcommon.h" + #include "xmpp_vcard.h" +--- a/src/contactlistdragview.cpp ++++ b/src/contactlistdragview.cpp +@@ -45,6 +45,7 @@ + #include <QPainter> + #include <QScrollBar> + #include <QMessageBox> ++#include <QPainterPath> + + ContactListDragView::ContactListDragView(QWidget* parent) + : ContactListView(parent) +--- a/src/rosteravatarframe.cpp ++++ b/src/rosteravatarframe.cpp +@@ -23,6 +23,8 @@ + #include "iconset.h" + #include "qpainter.h" + ++#include <QPainterPath> ++ + + RosterAvatarFrame::RosterAvatarFrame(QWidget *parent) + : QFrame(parent) +--- a/src/whiteboarding/wbnewpath.cpp ++++ b/src/whiteboarding/wbnewpath.cpp +@@ -23,6 +23,7 @@ + #include "../sxe/sxesession.h" + + #include <QGraphicsScene> ++#include <QPainterPath> + + WbNewPath::WbNewPath(QGraphicsScene* s, QPointF startPos, int strokeWidth, const QColor &strokeColor, const QColor &fillColor) : WbNewItem(s) { + controlPoint_ = 0; diff -Nru psi-plus-1.4.554/debian/patches/series psi-plus-1.4.554/debian/patches/series --- psi-plus-1.4.554/debian/patches/series 2020-02-25 19:49:20.000000000 -0500 +++ psi-plus-1.4.554/debian/patches/series 2021-01-11 22:19:52.000000000 -0500 @@ -2,3 +2,4 @@ fix-autoscroll-in-chats.patch send-unavailable-presence-on-program-exit.patch change-omemo-initialization-vector-length.patch +qt-5.15.patch