| 1 |
commit: e7e02c3059397c8b53457efbb0f72668c2fbdbc3 |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 23 19:14:43 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=e7e02c30 |
| 7 |
|
| 8 |
lxqt-base/lxqt-config: 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 |
.../files/lxqt-config-0.14.1-qt-5.14-build.patch | 21 +++++++++++++++++++++ |
| 15 |
lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild | 2 ++ |
| 16 |
2 files changed, 23 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..31b22cd6eaa |
| 21 |
--- /dev/null |
| 22 |
+++ b/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch |
| 23 |
@@ -0,0 +1,21 @@ |
| 24 |
+From cd7de12f2ebe5a2ad03c2086da4c3b5317a4506e Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Chih-Hsuan Yen <yan12125@×××××.com> |
| 26 |
+Date: Sun, 15 Dec 2019 09:32:55 +0800 |
| 27 |
+Subject: [PATCH] Fix building with Qt 5.14 |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ lxqt-config-input/touchpaddevice.cpp | 1 + |
| 31 |
+ 1 file changed, 1 insertion(+) |
| 32 |
+ |
| 33 |
+diff --git a/lxqt-config-input/touchpaddevice.cpp b/lxqt-config-input/touchpaddevice.cpp |
| 34 |
+index 31adbe5f..41690c2c 100644 |
| 35 |
+--- a/lxqt-config-input/touchpaddevice.cpp |
| 36 |
++++ b/lxqt-config-input/touchpaddevice.cpp |
| 37 |
+@@ -21,6 +21,7 @@ |
| 38 |
+ #include <cmath> |
| 39 |
+ #include <QDebug> |
| 40 |
+ #include <QX11Info> |
| 41 |
++#include <QUrl> |
| 42 |
+ #include <libudev.h> |
| 43 |
+ #include <LXQt/Settings> |
| 44 |
+ #include <X11/Xatom.h> |
| 45 |
|
| 46 |
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 |
| 47 |
index 263309fa6e7..da4ec98c1f4 100644 |
| 48 |
--- a/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild |
| 49 |
+++ b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild |
| 50 |
@@ -20,6 +20,8 @@ LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2" |
| 51 |
SLOT="0" |
| 52 |
IUSE="+monitor +touchpad" |
| 53 |
|
| 54 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" ) |
| 55 |
+ |
| 56 |
BDEPEND=" |
| 57 |
dev-qt/linguist-tools:5 |
| 58 |
>=dev-util/lxqt-build-tools-0.6.0 |
Archives