diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
| commit | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch) | |
| tree | b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /app-office/calligraplan | |
| parent | b17a3ef12038de50228bade1f05502c74e135321 (diff) | |
gentoo resync : 16.09.2020
Diffstat (limited to 'app-office/calligraplan')
| -rw-r--r-- | app-office/calligraplan/Manifest | 3 | ||||
| -rw-r--r-- | app-office/calligraplan/calligraplan-3.2.2.ebuild | 2 | ||||
| -rw-r--r-- | app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch | 33 |
3 files changed, 37 insertions, 1 deletions
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest index 986b8de3798b..549e815bdf2a 100644 --- a/app-office/calligraplan/Manifest +++ b/app-office/calligraplan/Manifest @@ -1,3 +1,4 @@ +AUX calligraplan-3.2.2-qt-5.15.patch 909 BLAKE2B 41571de17ffd56488ab2ee761cbbcb4355f42305c50ba192fac1200c0c51a4f773c283faab465759d65d24a93815ce3633d5b32f6148d3592022ec2499afb0ac SHA512 2c7c4c4e7a1ea526dce287211df4bbd2a8a4fd2d95dc1d85072b1bd78d036733ae8148ff10ca9eb595fbbbf451d6149f36f86175e462a152b2037a62ccb0a012 DIST calligraplan-3.2.2.tar.xz 3415816 BLAKE2B b02248ac51c4593434f234b574c23c68fe6777787451c5679985143ddd4845ed3b3eae246dc80ead9158ad98d1896e90ca298df443e9aafc536ee15ee9f2992d SHA512 9d4c32926bc4716d881a6c70ba3e53764cd578b7d31e8fde02d8feb70996e806561149d3f34a75deae7c408ad65f8de93f6afa1b00982bcf15c23db6e6992915 -EBUILD calligraplan-3.2.2.ebuild 2451 BLAKE2B 6bf7d239e8d1955a4a33af9d6eb1256f5d1a3d9e3d4cfadf30e653b0179cbac0cd33eb6f09b6aa363c0eaed8e57bb52a2e3baecd5dc0225190c830684bd07e0c SHA512 fb291924401c6af560693f7992610abc731b3ea6eb812786f6e11ec836b9844b43ee7949eb4db4077f32bb2179db03120ce1f687f4885ec7a473706f5a3eba4a +EBUILD calligraplan-3.2.2.ebuild 2510 BLAKE2B 385cfb7c69c0f898d000b1ad0ea826019feb56e21cb6635b163dc3d935d65d14bd73ce8d7a3acfee5cb3de628c097209c3c24b42cbaa86fe6be654e01d975663 SHA512 aff7743a985d27b1792de73582da3b75afc26b8323b8c47a05d565091c1bd9c1ce672460fc57c8de1b29a200d1ae370815c997487226099acc8fc8f293fb82b7 MISC metadata.xml 649 BLAKE2B 24dd20d4a19187e71952aad0d157b7b66adbbd8de24344e2de7aabe714cffd1db1f69f88b34aed13dfadaa62c51b3be7bc057f651d6388a0e98595688db3dc1b SHA512 44d54e0b08e4422a504a0107c73c7cbd2186698f60bc40b2c523d302150de877a86c482edb6b59ac613ef1a4ea2f04f1124ab7ab6e00c42a097a51e55a0a1dcc diff --git a/app-office/calligraplan/calligraplan-3.2.2.ebuild b/app-office/calligraplan/calligraplan-3.2.2.ebuild index a8dc309bb5c0..3287da88dd80 100644 --- a/app-office/calligraplan/calligraplan-3.2.2.ebuild +++ b/app-office/calligraplan/calligraplan-3.2.2.ebuild @@ -75,6 +75,8 @@ RDEPEND="${DEPEND} RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # bug 741710 + src_configure() { local mycmakeargs=( $(cmake_use_find_package activities KF5Activities) diff --git a/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch b/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch new file mode 100644 index 000000000000..fd925ffee689 --- /dev/null +++ b/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch @@ -0,0 +1,33 @@ +From f77fb06dc5d9f7930da9c757d6916f1149dc42bd Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@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> +-- +GitLab + |