From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: lxqt-base/liblxqt/, lxqt-base/liblxqt/files/
Date: Mon, 23 Dec 2019 21:45:39 +0000 (UTC) [thread overview]
Message-ID: <1577137516.9dc3a09a2a42ed944c1a4297fb63ad698013f991.asturm@gentoo> (raw)
commit: 9dc3a09a2a42ed944c1a4297fb63ad698013f991
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 19:01:48 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=9dc3a09a
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 <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14108
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/liblxqt-0.14.1-qt-5.14-build.patch | 24 ++++++++++++++++++++++
lxqt-base/liblxqt/liblxqt-0.14.1.ebuild | 2 ++
2 files changed, 26 insertions(+)
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
next reply other threads:[~2019-12-23 21:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-23 21:45 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-10-19 15:29 [gentoo-commits] repo/gentoo:master commit in: lxqt-base/liblxqt/, lxqt-base/liblxqt/files/ Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1577137516.9dc3a09a2a42ed944c1a4297fb63ad698013f991.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox