commit:     c93ee5f0930ed887880957b051cc611cab5a1779
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 11:53:46 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 11:58:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93ee5f0

net-misc/nextcloud-client: fix compilation failure with Qt 5.15

Closes: https://bugs.gentoo.org/727474
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../files/nextcloud-client-2.6.4-qt515.patch       | 22 ++++++++++++++++++++++
 .../nextcloud-client/nextcloud-client-2.6.4.ebuild |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch 
b/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
new file mode 100644
index 00000000000..5c59cf46bf3
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
@@ -0,0 +1,22 @@
+From 0fe7a657386b107ae498e7749ff4c20116b9752a Mon Sep 17 00:00:00 2001
+From: Michael Schuster <mich...@schuster.ms>
+Date: Sun, 7 Jun 2020 02:43:45 +0200
+Subject: [PATCH] Fix Qt 5.15.0 build error (missing include)
+
+Signed-off-by: Michael Schuster <mich...@schuster.ms>
+---
+ src/libsync/networkjobs.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
+index fd63b9606..bb5786ea9 100644
+--- a/src/libsync/networkjobs.cpp
++++ b/src/libsync/networkjobs.cpp
+@@ -31,6 +31,7 @@
+ #include <QJsonDocument>
+ #include <QJsonObject>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include "networkjobs.h"
+ #include "account.h"

diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild 
b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
index 0efd5f09b27..655fcb79a2b 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
@@ -51,7 +51,9 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch
+       "${FILESDIR}"/${P}-qt515.patch
+       )
 
 S=${WORKDIR}/desktop-${PV/_/-}
 

Reply via email to