commit:     2cc3c6f1a63ffbf57e2e99974c379c012d0cb4b5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 01:19:59 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <AT> gmx.at
Closes: https://bugs.gentoo.org/703696
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 <[email protected]>
+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 
<http://www.gnu.org/licenses/>.
+ 
+ #include <wayland-xdg-output-server-protocol.h>
+ 
++#include <QHash>
++
+ 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" )

Reply via email to