summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimi Huotari <chiitoo@gentoo.org>2019-12-23 21:01:48 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-12-23 22:45:16 +0100
commit9dc3a09a2a42ed944c1a4297fb63ad698013f991 (patch)
tree19bfc991720608d3ffea09882cec7d0ee00fcf36 /lxqt-base
parentnet-dns/getdns: bump version to 1.6.0_beta1 (diff)
downloadgentoo-9dc3a09a2a42ed944c1a4297fb63ad698013f991.tar.gz
gentoo-9dc3a09a2a42ed944c1a4297fb63ad698013f991.tar.bz2
gentoo-9dc3a09a2a42ed944c1a4297fb63ad698013f991.zip
lxqt-base/liblxqt: fix build with Qt 5.14
Closes: https://bugs.gentoo.org/703596 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Jimi Huotari <chiitoo@gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/14108 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'lxqt-base')
-rw-r--r--lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch24
-rw-r--r--lxqt-base/liblxqt/liblxqt-0.14.1.ebuild2
2 files changed, 26 insertions, 0 deletions
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
new file mode 100644
index 00000000000..54fd90676ea
--- /dev/null
+++ b/lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch
@@ -0,0 +1,24 @@
+From 534c6f6b5240daa81a2b6206a8ec028a69ee5c2d Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Mon, 23 Dec 2019 21:20:16 +0200
+Subject: [PATCH] Fix build with Qt 5.14.
+
+---
+ lxqtpowermanager.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lxqtpowermanager.cpp b/lxqtpowermanager.cpp
+index aef5ca2..b0926f9 100644
+--- a/lxqtpowermanager.cpp
++++ b/lxqtpowermanager.cpp
+@@ -32,6 +32,7 @@
+ #include <QApplication>
+ #include <QDesktopWidget>
+ #include <QtDebug>
++#include <QFile>
+ #include "lxqttranslator.h"
+ #include "lxqtglobals.h"
+ #include "lxqtsettings.h"
+--
+2.24.1
+
diff --git a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
index 5ad13018bb8..7e6e0123112 100644
--- a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
@@ -19,6 +19,8 @@ fi
LICENSE="LGPL-2.1+ BSD"
SLOT="0/$(ver_cut 1-2)"
+PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" ) # Bug 703596
+
BDEPEND="
dev-qt/linguist-tools:5
>=dev-util/lxqt-build-tools-0.6.0