Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/notepadqq/, app-editors/notepadqq/files/
Date: Mon, 25 Feb 2019 23:56:55
Message-Id: 1551138985.3c65e3db84c106a2ec219ea4d78350ea200b8b9b.asturm@gentoo
1 commit: 3c65e3db84c106a2ec219ea4d78350ea200b8b9b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 25 23:56:04 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 25 23:56:25 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c65e3db
7
8 app-editors/notepadqq: Fix build with Qt 5.11
9
10 Closes: https://bugs.gentoo.org/668392
11 Package-Manager: Portage-2.3.62, Repoman-2.3.12
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 .../files/notepadqq-1.4.8-qt-5.11-QDateTime.patch | 25 ++++++++++++++++++++++
15 app-editors/notepadqq/notepadqq-1.4.8.ebuild | 5 ++---
16 2 files changed, 27 insertions(+), 3 deletions(-)
17
18 diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
19 new file mode 100644
20 index 00000000000..d0158c33527
21 --- /dev/null
22 +++ b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
23 @@ -0,0 +1,25 @@
24 +From 8d5dc3dfb279f8420457fbc04a3ff6fb5f3f8a21 Mon Sep 17 00:00:00 2001
25 +From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
26 +Date: Tue, 26 Feb 2019 00:47:26 +0100
27 +Subject: [PATCH] Fix build with Qt 5.11 (add missing QDateTime include)
28 +
29 +Downstream report: https://bugs.gentoo.org/668392
30 +---
31 + src/ui/stats.cpp | 1 +
32 + 1 file changed, 1 insertion(+)
33 +
34 +diff --git a/src/ui/stats.cpp b/src/ui/stats.cpp
35 +index 59837c9..e0f3cbd 100644
36 +--- a/src/ui/stats.cpp
37 ++++ b/src/ui/stats.cpp
38 +@@ -3,6 +3,7 @@
39 + #include <QNetworkAccessManager>
40 + #include <QJsonDocument>
41 + #include <QNetworkRequest>
42 ++#include <QDateTime>
43 + #include <QNetworkReply>
44 + #include <QSysInfo>
45 + #include <QTimer>
46 +--
47 +2.21.0
48 +
49
50 diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
51 index a61d2f60013..810b3dd4774 100644
52 --- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
53 +++ b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
54 @@ -27,13 +27,12 @@ RDEPEND="
55 dev-qt/qtwebkit:5
56 dev-qt/qtwidgets:5
57 "
58 -DEPEND="
59 - ${RDEPEND}
60 +DEPEND="${RDEPEND}
61 dev-qt/linguist-tools:5
62 dev-qt/qtsvg:5
63 "
64
65 -PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
66 +PATCHES=( "${FILESDIR}"/${P}-qt-5.11{,-QDateTime}.patch )
67
68 src_prepare() {
69 default