[gentoo-commits] repo/gentoo:master commit in: lxqt-base/lxqt-config/files/, lxqt-base/lxqt-config/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     e7e02c3059397c8b53457efbb0f72668c2fbdbc3
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 19:14:43 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=e7e02c30

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 <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/lxqt-config-0.14.1-qt-5.14-build.patch    | 21 +++++++++++++++++++++
 lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild  |  2 ++
 2 files changed, 23 insertions(+)

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