Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: lxqt-base/lxqt-globalkeys/files/, lxqt-base/lxqt-globalkeys/
Date: Mon, 23 Dec 2019 21:45:43
Message-Id: 1577137516.6411fae8d36cc2f5cb755cea87e9ec8bef3095d1.asturm@gentoo
1 commit: 6411fae8d36cc2f5cb755cea87e9ec8bef3095d1
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 23 19:11:37 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 23 21:45:16 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6411fae8
7
8 lxqt-base/lxqt-globalkeys: fix build with Qt 5.14
9
10 Package-Manager: Portage-2.3.82, Repoman-2.3.20
11 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 .../lxqt-globalkeys-0.14.1-qt-5.14-build.patch | 21 +++++++++++++++++++++
15 .../lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild | 2 ++
16 .../lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild | 2 ++
17 3 files changed, 25 insertions(+)
18
19 diff --git a/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch b/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch
20 new file mode 100644
21 index 00000000000..b545f5de61b
22 --- /dev/null
23 +++ b/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch
24 @@ -0,0 +1,21 @@
25 +From c9ec69850428e599fba282c32e51868b815e3019 Mon Sep 17 00:00:00 2001
26 +From: Chih-Hsuan Yen <yan12125@×××××.com>
27 +Date: Sun, 15 Dec 2019 09:33:12 +0800
28 +Subject: [PATCH] Fix building with Qt 5.14
29 +
30 +---
31 + daemon/core.cpp | 1 +
32 + 1 file changed, 1 insertion(+)
33 +
34 +diff --git a/daemon/core.cpp b/daemon/core.cpp
35 +index 1be64ec..53bdf7b 100644
36 +--- a/daemon/core.cpp
37 ++++ b/daemon/core.cpp
38 +@@ -33,6 +33,7 @@
39 + #include <QTimer>
40 + #include <QDBusConnectionInterface>
41 + #include <QDBusServiceWatcher>
42 ++#include <QFile>
43 +
44 + #include <cstddef>
45 + #include <cstdlib>
46
47 diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
48 index 49dee3033b3..aad48dd0656 100644
49 --- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
50 +++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
51 @@ -19,6 +19,8 @@ fi
52 LICENSE="LGPL-2.1+"
53 SLOT="0"
54
55 +PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" )
56 +
57 BDEPEND="
58 dev-qt/linguist-tools:5
59 >=dev-util/lxqt-build-tools-0.6.0
60
61 diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
62 index 61c059834d6..bb7cf41bf3c 100644
63 --- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
64 +++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
65 @@ -19,6 +19,8 @@ fi
66 LICENSE="LGPL-2.1+"
67 SLOT="0"
68
69 +PATCHES=( "${FILESDIR}/${PN}-0.14.1-qt-5.14-build.patch" )
70 +
71 BDEPEND="
72 dev-qt/linguist-tools:5
73 >=dev-util/lxqt-build-tools-0.6.0