From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B892A138335 for ; Mon, 23 Dec 2019 21:45:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02395E09F9; Mon, 23 Dec 2019 21:45:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DCAABE09F9 for ; Mon, 23 Dec 2019 21:45:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4DE3F34DB06 for ; Mon, 23 Dec 2019 21:45:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0058C7B68D for ; Mon, 23 Dec 2019 21:45:40 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1577137516.e7e02c3059397c8b53457efbb0f72668c2fbdbc3.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: lxqt-base/lxqt-config/files/, lxqt-base/lxqt-config/ X-VCS-Repository: repo/gentoo X-VCS-Files: lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild X-VCS-Directories: lxqt-base/lxqt-config/files/ lxqt-base/lxqt-config/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e7e02c3059397c8b53457efbb0f72668c2fbdbc3 X-VCS-Branch: master Date: Mon, 23 Dec 2019 21:45:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1d0f14b3-76c4-4917-9279-febc4554a8b9 X-Archives-Hash: b3dceaa899b61a67747e106a097e4b9e commit: e7e02c3059397c8b53457efbb0f72668c2fbdbc3 Author: Jimi Huotari gentoo org> AuthorDate: Mon Dec 23 19:14:43 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 23 21:45:16 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e02c30 lxqt-base/lxqt-config: fix build with Qt 5.14 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Jimi Huotari gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/lxqt-config-0.14.1-qt-5.14-build.patch | 21 +++++++++++++++++++++ lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild | 2 ++ 2 files changed, 23 insertions(+) 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 new file mode 100644 index 00000000000..31b22cd6eaa --- /dev/null +++ b/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch @@ -0,0 +1,21 @@ +From cd7de12f2ebe5a2ad03c2086da4c3b5317a4506e Mon Sep 17 00:00:00 2001 +From: Chih-Hsuan Yen +Date: Sun, 15 Dec 2019 09:32:55 +0800 +Subject: [PATCH] Fix building with Qt 5.14 + +--- + lxqt-config-input/touchpaddevice.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lxqt-config-input/touchpaddevice.cpp b/lxqt-config-input/touchpaddevice.cpp +index 31adbe5f..41690c2c 100644 +--- a/lxqt-config-input/touchpaddevice.cpp ++++ b/lxqt-config-input/touchpaddevice.cpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include 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 index 263309fa6e7..da4ec98c1f4 100644 --- a/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild +++ b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild @@ -20,6 +20,8 @@ LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2" SLOT="0" IUSE="+monitor +touchpad" +PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" ) + BDEPEND=" dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.6.0