public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Bernard Cafarelli" <voyageur@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/
Date: Wed, 10 Jun 2020 11:58:53 +0000 (UTC)	[thread overview]
Message-ID: <1591790321.c93ee5f0930ed887880957b051cc611cab5a1779.voyageur@gentoo> (raw)

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 <michael@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 <michael@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	other threads:[~2020-06-10 11:58 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-10 11:58 Bernard Cafarelli [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-16 20:27 [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/ Bernard Cafarelli
2023-02-08  4:22 Sam James
2021-09-28 21:21 Bernard Cafarelli
2021-07-07 19:16 Bernard Cafarelli
2020-09-02 20:56 Bernard Cafarelli
2019-12-13 12:43 Bernard Cafarelli
2019-03-20 15:50 Miroslav Šulc
2018-08-20 18:13 Bernard Cafarelli
2017-07-18 16:42 Bernard Cafarelli
2016-11-29 13:32 Bernard Cafarelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1591790321.c93ee5f0930ed887880957b051cc611cab5a1779.voyageur@gentoo \
    --to=voyageur@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox