Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/notepadqq/files/, app-editors/notepadqq/
Date: Thu, 11 Oct 2018 12:30:11
Message-Id: 1539260910.7a6bb58976a8f5a656b708a24397feac7927dae8.kensington@gentoo
1 commit: 7a6bb58976a8f5a656b708a24397feac7927dae8
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 11 12:28:09 2018 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 11 12:28:30 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a6bb589
7
8 app-editors/notepadqq: fix build with Qt 5.11
9
10 Close: https://bugs.gentoo.org/665286
11 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
12 Package-Manager: Portage-2.3.49, Repoman-2.3.11
13
14 .../notepadqq/files/notepadqq-1.4.8-qt-5.11.patch | 26 ++++++++++++++++++++++
15 app-editors/notepadqq/notepadqq-1.4.8.ebuild | 4 +++-
16 app-editors/notepadqq/notepadqq-9999.ebuild | 4 +++-
17 3 files changed, 32 insertions(+), 2 deletions(-)
18
19 diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
20 new file mode 100644
21 index 00000000000..d656bd92094
22 --- /dev/null
23 +++ b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
24 @@ -0,0 +1,26 @@
25 +Bug: https://bugs.gentoo.org/665286
26 +
27 +From 8fabccfe2682583f5190b84dbc1922cce9c8d82b Mon Sep 17 00:00:00 2001
28 +From: Michael Palimaka <kensington@g.o>
29 +Date: Thu, 11 Oct 2018 23:23:08 +1100
30 +Subject: [PATCH] Add missing include.
31 +
32 +---
33 + src/ui/EditorNS/languageservice.cpp | 1 +
34 + 1 file changed, 1 insertion(+)
35 +
36 +diff --git a/src/ui/EditorNS/languageservice.cpp b/src/ui/EditorNS/languageservice.cpp
37 +index bbe03dc..9a0f212 100644
38 +--- a/src/ui/EditorNS/languageservice.cpp
39 ++++ b/src/ui/EditorNS/languageservice.cpp
40 +@@ -6,6 +6,7 @@
41 + #include <QJsonDocument>
42 + #include <QJsonObject>
43 + #include <QJsonValue>
44 ++#include <QTextStream>
45 +
46 + namespace EditorNS {
47 +
48 +--
49 +2.18.1
50 +
51
52 diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
53 index d85db1653d7..0ce0b7273f5 100644
54 --- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
55 +++ b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
56 @@ -1,4 +1,4 @@
57 -# Copyright 1999-2018 Gentoo Foundation
58 +# Copyright 1999-2018 Gentoo Authors
59 # Distributed under the terms of the GNU General Public License v2
60
61 EAPI=6
62 @@ -32,6 +32,8 @@ DEPEND="
63 dev-qt/qtsvg:5
64 "
65
66 +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
67 +
68 src_prepare() {
69 default
70
71
72 diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
73 index 9db258a3956..18d0df4c803 100644
74 --- a/app-editors/notepadqq/notepadqq-9999.ebuild
75 +++ b/app-editors/notepadqq/notepadqq-9999.ebuild
76 @@ -1,4 +1,4 @@
77 -# Copyright 1999-2018 Gentoo Foundation
78 +# Copyright 1999-2018 Gentoo Authors
79 # Distributed under the terms of the GNU General Public License v2
80
81 EAPI=6
82 @@ -33,6 +33,8 @@ DEPEND="
83 dev-qt/qtsvg:5
84 "
85
86 +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
87 +
88 src_prepare() {
89 default