From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: lxqt-base/lxqt-globalkeys/files/, lxqt-base/lxqt-globalkeys/
Date: Mon, 23 Dec 2019 21:45:39 +0000 (UTC) [thread overview]
Message-ID: <1577137516.6411fae8d36cc2f5cb755cea87e9ec8bef3095d1.asturm@gentoo> (raw)
commit: 6411fae8d36cc2f5cb755cea87e9ec8bef3095d1
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 19:11:37 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=6411fae8
lxqt-base/lxqt-globalkeys: 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>
.../lxqt-globalkeys-0.14.1-qt-5.14-build.patch | 21 +++++++++++++++++++++
.../lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild | 2 ++
.../lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild | 2 ++
3 files changed, 25 insertions(+)
diff --git a/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch b/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch
new file mode 100644
index 00000000000..b545f5de61b
--- /dev/null
+++ b/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch
@@ -0,0 +1,21 @@
+From c9ec69850428e599fba282c32e51868b815e3019 Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 15 Dec 2019 09:33:12 +0800
+Subject: [PATCH] Fix building with Qt 5.14
+
+---
+ daemon/core.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/daemon/core.cpp b/daemon/core.cpp
+index 1be64ec..53bdf7b 100644
+--- a/daemon/core.cpp
++++ b/daemon/core.cpp
+@@ -33,6 +33,7 @@
+ #include <QTimer>
+ #include <QDBusConnectionInterface>
+ #include <QDBusServiceWatcher>
++#include <QFile>
+
+ #include <cstddef>
+ #include <cstdlib>
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
index 49dee3033b3..aad48dd0656 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
@@ -19,6 +19,8 @@ fi
LICENSE="LGPL-2.1+"
SLOT="0"
+PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" )
+
BDEPEND="
dev-qt/linguist-tools:5
>=dev-util/lxqt-build-tools-0.6.0
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
index 61c059834d6..bb7cf41bf3c 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
@@ -19,6 +19,8 @@ fi
LICENSE="LGPL-2.1+"
SLOT="0"
+PATCHES=( "${FILESDIR}/${PN}-0.14.1-qt-5.14-build.patch" )
+
BDEPEND="
dev-qt/linguist-tools:5
>=dev-util/lxqt-build-tools-0.6.0
reply other threads:[~2019-12-23 21:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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.6411fae8d36cc2f5cb755cea87e9ec8bef3095d1.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