| 1 |
commit: 9dc3a09a2a42ed944c1a4297fb63ad698013f991 |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 23 19:01:48 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=9dc3a09a |
| 7 |
|
| 8 |
lxqt-base/liblxqt: fix build with Qt 5.14 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/703596 |
| 11 |
Package-Manager: Portage-2.3.82, Repoman-2.3.20 |
| 12 |
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/14108 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
.../files/liblxqt-0.14.1-qt-5.14-build.patch | 24 ++++++++++++++++++++++ |
| 17 |
lxqt-base/liblxqt/liblxqt-0.14.1.ebuild | 2 ++ |
| 18 |
2 files changed, 26 insertions(+) |
| 19 |
|
| 20 |
diff --git a/lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch b/lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..54fd90676ea |
| 23 |
--- /dev/null |
| 24 |
+++ b/lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch |
| 25 |
@@ -0,0 +1,24 @@ |
| 26 |
+From 534c6f6b5240daa81a2b6206a8ec028a69ee5c2d Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Jimi Huotari <chiitoo@g.o> |
| 28 |
+Date: Mon, 23 Dec 2019 21:20:16 +0200 |
| 29 |
+Subject: [PATCH] Fix build with Qt 5.14. |
| 30 |
+ |
| 31 |
+--- |
| 32 |
+ lxqtpowermanager.cpp | 1 + |
| 33 |
+ 1 file changed, 1 insertion(+) |
| 34 |
+ |
| 35 |
+diff --git a/lxqtpowermanager.cpp b/lxqtpowermanager.cpp |
| 36 |
+index aef5ca2..b0926f9 100644 |
| 37 |
+--- a/lxqtpowermanager.cpp |
| 38 |
++++ b/lxqtpowermanager.cpp |
| 39 |
+@@ -32,6 +32,7 @@ |
| 40 |
+ #include <QApplication> |
| 41 |
+ #include <QDesktopWidget> |
| 42 |
+ #include <QtDebug> |
| 43 |
++#include <QFile> |
| 44 |
+ #include "lxqttranslator.h" |
| 45 |
+ #include "lxqtglobals.h" |
| 46 |
+ #include "lxqtsettings.h" |
| 47 |
+-- |
| 48 |
+2.24.1 |
| 49 |
+ |
| 50 |
|
| 51 |
diff --git a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild |
| 52 |
index 5ad13018bb8..7e6e0123112 100644 |
| 53 |
--- a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild |
| 54 |
+++ b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild |
| 55 |
@@ -19,6 +19,8 @@ fi |
| 56 |
LICENSE="LGPL-2.1+ BSD" |
| 57 |
SLOT="0/$(ver_cut 1-2)" |
| 58 |
|
| 59 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" ) # Bug 703596 |
| 60 |
+ |
| 61 |
BDEPEND=" |
| 62 |
dev-qt/linguist-tools:5 |
| 63 |
>=dev-util/lxqt-build-tools-0.6.0 |
Archives