From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8197E1382C5 for ; Wed, 10 Jun 2020 11:58:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C795E0843; Wed, 10 Jun 2020 11:58:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46F4FE0843 for ; Wed, 10 Jun 2020 11:58:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E850234F215 for ; Wed, 10 Jun 2020 11:58:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A42C296 for ; Wed, 10 Jun 2020 11:58:53 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1591790321.c93ee5f0930ed887880957b051cc611cab5a1779.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild X-VCS-Directories: net-misc/nextcloud-client/ net-misc/nextcloud-client/files/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: c93ee5f0930ed887880957b051cc611cab5a1779 X-VCS-Branch: master Date: Wed, 10 Jun 2020 11:58:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6fb41e3b-baf2-4c03-aba8-b302846a9541 X-Archives-Hash: 93ae40f2c89d9c8d443188a63cf3b6c7 commit: c93ee5f0930ed887880957b051cc611cab5a1779 Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Jun 10 11:53:46 2020 +0000 Commit: Bernard Cafarelli gentoo 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 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 +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 +--- + 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 + #include + #include ++#include + + #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/_/-}