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 05B3F138334 for ; Wed, 25 Dec 2019 01:27:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C14C0E0AFC; Wed, 25 Dec 2019 01:27:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 A4CA0E0AFD for ; Wed, 25 Dec 2019 01:27:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C0B4934DB2D for ; Wed, 25 Dec 2019 01:27:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D475D3C for ; Wed, 25 Dec 2019 01:27:48 +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: <1577237247.2cc3c6f1a63ffbf57e2e99974c379c012d0cb4b5.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwayland/files/, kde-frameworks/kwayland/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kwayland/files/kwayland-5.64.0-qt-5.14.0.patch kde-frameworks/kwayland/kwayland-5.64.0.ebuild X-VCS-Directories: kde-frameworks/kwayland/files/ kde-frameworks/kwayland/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2cc3c6f1a63ffbf57e2e99974c379c012d0cb4b5 X-VCS-Branch: master Date: Wed, 25 Dec 2019 01:27:48 +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: 56297617-c376-452f-b972-0ebc6e79c5ab X-Archives-Hash: f34b34a270f4a0505a57b4638938f24b commit: 2cc3c6f1a63ffbf57e2e99974c379c012d0cb4b5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 25 01:19:59 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 25 01:27:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc3c6f1 kde-frameworks/kwayland: Fix 5.64.0 build with Qt 5.14.0 Upstream commit c4a49fbf2d5dd63659ed0c679ce180eda89a6d0d Reported-by: m.manico gmx.at Closes: https://bugs.gentoo.org/703696 Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kwayland/files/kwayland-5.64.0-qt-5.14.0.patch | 24 ++++++++++++++++++++++ kde-frameworks/kwayland/kwayland-5.64.0.ebuild | 2 ++ 2 files changed, 26 insertions(+) diff --git a/kde-frameworks/kwayland/files/kwayland-5.64.0-qt-5.14.0.patch b/kde-frameworks/kwayland/files/kwayland-5.64.0-qt-5.14.0.patch new file mode 100644 index 00000000000..818e9894765 --- /dev/null +++ b/kde-frameworks/kwayland/files/kwayland-5.64.0-qt-5.14.0.patch @@ -0,0 +1,24 @@ +From c4a49fbf2d5dd63659ed0c679ce180eda89a6d0d Mon Sep 17 00:00:00 2001 +From: Roman Gilg +Date: Fri, 22 Nov 2019 15:26:23 +0100 +Subject: Add missing include for Qt 5.14 build + +--- + src/server/xdgoutput_interface.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/server/xdgoutput_interface.cpp b/src/server/xdgoutput_interface.cpp +index e32ccf9..b2b2cba 100644 +--- a/src/server/xdgoutput_interface.cpp ++++ b/src/server/xdgoutput_interface.cpp +@@ -25,6 +25,8 @@ License along with this library. If not, see . + + #include + ++#include ++ + namespace KWayland + { + namespace Server +-- +cgit v1.1 diff --git a/kde-frameworks/kwayland/kwayland-5.64.0.ebuild b/kde-frameworks/kwayland/kwayland-5.64.0.ebuild index b1e978e691f..5a81ee17e71 100644 --- a/kde-frameworks/kwayland/kwayland-5.64.0.ebuild +++ b/kde-frameworks/kwayland/kwayland-5.64.0.ebuild @@ -30,3 +30,5 @@ RDEPEND="${COMMON_DEPEND} # All failing, I guess we need a virtual wayland server RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-qt-5.14.0.patch" )