summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimi Huotari <chiitoo@gentoo.org>2019-12-23 21:11:37 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-12-23 22:45:16 +0100
commit6411fae8d36cc2f5cb755cea87e9ec8bef3095d1 (patch)
treecf07b2828ebbaa18e41b44559e49de6149da3999
parentlxqt-base/liblxqt: fix build with Qt 5.14 (diff)
downloadgentoo-6411fae8d36cc2f5cb755cea87e9ec8bef3095d1.tar.gz
gentoo-6411fae8d36cc2f5cb755cea87e9ec8bef3095d1.tar.bz2
gentoo-6411fae8d36cc2f5cb755cea87e9ec8bef3095d1.zip
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@gentoo.org> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch21
-rw-r--r--lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild2
-rw-r--r--lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild2
3 files changed, 25 insertions, 0 deletions
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 000000000000..b545f5de61bf
--- /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 <yan12125@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 49dee3033b36..aad48dd06564 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 61c059834d6d..bb7cf41bf3cc 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