[neon/extras/calligraplan/Neon/release] debian: fix build with Qt 5.15 (#975141)

Pino Toscano null at kde.org
Wed Sep 7 17:33:46 BST 2022


Git commit bf86d56033d034a95458672b6c16391269c5581d by Pino Toscano.
Committed on 22/11/2020 at 12:55.
Pushed by jriddell into branch 'Neon/release'.

fix build with Qt 5.15 (#975141)

backport upstream commit f77fb06dc5d9f7930da9c757d6916f1149dc42bd

M  +4    -0    debian/changelog
A  +1    -0    debian/patches/series
A  +33   -0    debian/patches/upstream_Fix-build-with-Qt-5.15.patch

https://invent.kde.org/neon/extras/calligraplan/commit/bf86d56033d034a95458672b6c16391269c5581d

diff --git a/debian/changelog b/debian/changelog
index 91e73ca..ec12532 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 calligraplan (1:3.2.2-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit f77fb06dc5d9f7930da9c757d6916f1149dc42bd to fix
+    build with Qt 5.15; patch upstream_Fix-build-with-Qt-5.15.patch.
+    (Closes: #975141)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 22 Nov 2020 13:53:56 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3e57845
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Fix-build-with-Qt-5.15.patch
diff --git a/debian/patches/upstream_Fix-build-with-Qt-5.15.patch b/debian/patches/upstream_Fix-build-with-Qt-5.15.patch
new file mode 100644
index 0000000..a601327
--- /dev/null
+++ b/debian/patches/upstream_Fix-build-with-Qt-5.15.patch
@@ -0,0 +1,33 @@
+From f77fb06dc5d9f7930da9c757d6916f1149dc42bd Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Sun, 29 Mar 2020 13:55:53 +0200
+Subject: [PATCH] Fix build with Qt 5.15
+
+Summary:
+QPainterPath is no longer included via qtransform.h (since
+5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+
+Test Plan: Builds
+
+Reviewers: #calligra:_3.0, danders
+
+Differential Revision: https://phabricator.kde.org/D28403
+---
+ src/libs/ui/kptganttitemdelegate.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libs/ui/kptganttitemdelegate.cpp b/src/libs/ui/kptganttitemdelegate.cpp
+index 04217da4..d2f3e6d8 100644
+--- a/src/libs/ui/kptganttitemdelegate.cpp
++++ b/src/libs/ui/kptganttitemdelegate.cpp
+@@ -28,6 +28,7 @@
+ #include <QModelIndex>
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLocale>
+ 
+ #include <KLocalizedString>
+-- 
+2.29.2
+



More information about the Neon-commits mailing list