summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimi Huotari <chiitoo@gentoo.org>2019-12-23 21:14:43 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-12-23 22:45:16 +0100
commite7e02c3059397c8b53457efbb0f72668c2fbdbc3 (patch)
treed5f48accd87f1edc174f8e41963b4a67171d3b9a /lxqt-base
parentlxqt-base/lxqt-globalkeys: fix build with Qt 5.14 (diff)
downloadgentoo-e7e02c3059397c8b53457efbb0f72668c2fbdbc3.tar.gz
gentoo-e7e02c3059397c8b53457efbb0f72668c2fbdbc3.tar.bz2
gentoo-e7e02c3059397c8b53457efbb0f72668c2fbdbc3.zip
lxqt-base/lxqt-config: 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>
Diffstat (limited to 'lxqt-base')
-rw-r--r--lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch21
-rw-r--r--lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild2
2 files changed, 23 insertions, 0 deletions
diff --git a/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch b/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch
new file mode 100644
index 00000000000..31b22cd6eaa
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch
@@ -0,0 +1,21 @@
+From cd7de12f2ebe5a2ad03c2086da4c3b5317a4506e Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 15 Dec 2019 09:32:55 +0800
+Subject: [PATCH] Fix building with Qt 5.14
+
+---
+ lxqt-config-input/touchpaddevice.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lxqt-config-input/touchpaddevice.cpp b/lxqt-config-input/touchpaddevice.cpp
+index 31adbe5f..41690c2c 100644
+--- a/lxqt-config-input/touchpaddevice.cpp
++++ b/lxqt-config-input/touchpaddevice.cpp
+@@ -21,6 +21,7 @@
+ #include <cmath>
+ #include <QDebug>
+ #include <QX11Info>
++#include <QUrl>
+ #include <libudev.h>
+ #include <LXQt/Settings>
+ #include <X11/Xatom.h>
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
index 263309fa6e7..da4ec98c1f4 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
@@ -20,6 +20,8 @@ LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
SLOT="0"
IUSE="+monitor +touchpad"
+PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" )
+
BDEPEND="
dev-qt/linguist-tools:5
>=dev-util/lxqt-build-tools-0.6.0