commit: 6411fae8d36cc2f5cb755cea87e9ec8bef3095d1 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Mon Dec 23 19:11:37 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Dec 23 21:45:16 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6411fae8
lxqt-base/lxqt-globalkeys: fix build with Qt 5.14 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../lxqt-globalkeys-0.14.1-qt-5.14-build.patch | 21 +++++++++++++++++++++ .../lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild | 2 ++ .../lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild | 2 ++ 3 files changed, 25 insertions(+) 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 new file mode 100644 index 00000000000..b545f5de61b --- /dev/null +++ b/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch @@ -0,0 +1,21 @@ +From c9ec69850428e599fba282c32e51868b815e3019 Mon Sep 17 00:00:00 2001 +From: Chih-Hsuan Yen <yan12...@gmail.com> +Date: Sun, 15 Dec 2019 09:33:12 +0800 +Subject: [PATCH] Fix building with Qt 5.14 + +--- + daemon/core.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/daemon/core.cpp b/daemon/core.cpp +index 1be64ec..53bdf7b 100644 +--- a/daemon/core.cpp ++++ b/daemon/core.cpp +@@ -33,6 +33,7 @@ + #include <QTimer> + #include <QDBusConnectionInterface> + #include <QDBusServiceWatcher> ++#include <QFile> + + #include <cstddef> + #include <cstdlib> diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild index 49dee3033b3..aad48dd0656 100644 --- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild +++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild @@ -19,6 +19,8 @@ fi LICENSE="LGPL-2.1+" SLOT="0" +PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" ) + BDEPEND=" dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.6.0 diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild index 61c059834d6..bb7cf41bf3c 100644 --- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild +++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild @@ -19,6 +19,8 @@ fi LICENSE="LGPL-2.1+" SLOT="0" +PATCHES=( "${FILESDIR}/${PN}-0.14.1-qt-5.14-build.patch" ) + BDEPEND=" dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.6.0