Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/, net-misc/nextcloud-client/
Date: Tue, 05 Mar 2019 23:34:55
Message-Id: 1551828832.4eca64a213519d2aeb0fb3f737a0f31cf9c023d9.voyageur@gentoo
1 commit: 4eca64a213519d2aeb0fb3f737a0f31cf9c023d9
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 5 23:33:42 2019 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 5 23:33:52 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eca64a2
7
8 net-misc/nextcloud-client: fix compilation with Qt 5.12
9
10 Closes: https://bugs.gentoo.org/677008
11 Package-Manager: Portage-2.3.62, Repoman-2.3.12
12 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
13
14 ...nextcloud-client-2.5.1-missing_qt_include.patch | 23 ++++++++++++++++++++++
15 .../nextcloud-client/nextcloud-client-2.5.1.ebuild | 6 +++++-
16 2 files changed, 28 insertions(+), 1 deletion(-)
17
18 diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch
19 new file mode 100644
20 index 00000000000..a5d6f03581b
21 --- /dev/null
22 +++ b/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch
23 @@ -0,0 +1,23 @@
24 +From 129588442041c32b0d98f2361a69e0e350592f70 Mon Sep 17 00:00:00 2001
25 +From: Oskar Kruschitz <okr@×××××××××.com>
26 +Date: Thu, 13 Dec 2018 16:13:01 +0100
27 +Subject: [PATCH] Added missing Include
28 +
29 +Fixing an error during Build with Qt5.12:
30 +error: member access into incomplete type 'const QWebEngineCertificateError'
31 +---
32 + src/gui/wizard/webview.cpp | 1 +
33 + 1 file changed, 1 insertion(+)
34 +
35 +diff --git a/src/gui/wizard/webview.cpp b/src/gui/wizard/webview.cpp
36 +index 15c1f314e..73e671b8f 100644
37 +--- a/src/gui/wizard/webview.cpp
38 ++++ b/src/gui/wizard/webview.cpp
39 +@@ -10,6 +10,7 @@
40 + #include <QProgressBar>
41 + #include <QLoggingCategory>
42 + #include <QLocale>
43 ++#include <QWebEngineCertificateError>
44 +
45 + #include "common/utility.h"
46 +
47
48 diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild
49 index 29daa11a9db..d4aa0a622a2 100644
50 --- a/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild
51 +++ b/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild
52 @@ -1,4 +1,4 @@
53 -# Copyright 1999-2018 Gentoo Authors
54 +# Copyright 1999-2019 Gentoo Authors
55 # Distributed under the terms of the GNU General Public License v2
56
57 EAPI=6
58 @@ -53,6 +53,10 @@ DEPEND="${COMMON_DEPEND}
59 )
60 "
61
62 +PATCHES=(
63 + "${FILESDIR}"/${P}-missing_qt_include.patch
64 + )
65 +
66 S=${WORKDIR}/desktop-${PV/_/-}
67
68 src_prepare() {