[neon/extras/calligraplan/Neon/release] debian: update the patches

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


Git commit ba6069d94ad6b12a47040708e46e6f84e3b09f9a by Pino Toscano.
Committed on 29/01/2021 at 20:11.
Pushed by jriddell into branch 'Neon/release'.

update the patches

- upstream_Fix-build-with-Qt-5.15.patch: drop, backported from upstream

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

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

diff --git a/debian/changelog b/debian/changelog
index b4a1ec5..7bd2279 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ calligraplan (1:3.3.0-0r1) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * New upstream release.
   * Add the upstream GPG singing key.
+  * Update the patches:
+    - upstream_Fix-build-with-Qt-5.15.patch: drop, backported from upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 29 Jan 2021 21:07:59 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3e57845..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index a601327..0000000
--- a/debian/patches/upstream_Fix-build-with-Qt-5.15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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