| 1 |
commit: 2cc3c6f1a63ffbf57e2e99974c379c012d0cb4b5 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 25 01:19:59 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 25 01:27:27 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc3c6f1 |
| 7 |
|
| 8 |
kde-frameworks/kwayland: Fix 5.64.0 build with Qt 5.14.0 |
| 9 |
|
| 10 |
Upstream commit c4a49fbf2d5dd63659ed0c679ce180eda89a6d0d |
| 11 |
|
| 12 |
Reported-by: m.manico <AT> gmx.at |
| 13 |
Closes: https://bugs.gentoo.org/703696 |
| 14 |
Package-Manager: Portage-2.3.83, Repoman-2.3.20 |
| 15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 16 |
|
| 17 |
.../kwayland/files/kwayland-5.64.0-qt-5.14.0.patch | 24 ++++++++++++++++++++++ |
| 18 |
kde-frameworks/kwayland/kwayland-5.64.0.ebuild | 2 ++ |
| 19 |
2 files changed, 26 insertions(+) |
| 20 |
|
| 21 |
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 |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..818e9894765 |
| 24 |
--- /dev/null |
| 25 |
+++ b/kde-frameworks/kwayland/files/kwayland-5.64.0-qt-5.14.0.patch |
| 26 |
@@ -0,0 +1,24 @@ |
| 27 |
+From c4a49fbf2d5dd63659ed0c679ce180eda89a6d0d Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Roman Gilg <subdiff@×××××.com> |
| 29 |
+Date: Fri, 22 Nov 2019 15:26:23 +0100 |
| 30 |
+Subject: Add missing include for Qt 5.14 build |
| 31 |
+ |
| 32 |
+--- |
| 33 |
+ src/server/xdgoutput_interface.cpp | 2 ++ |
| 34 |
+ 1 file changed, 2 insertions(+) |
| 35 |
+ |
| 36 |
+diff --git a/src/server/xdgoutput_interface.cpp b/src/server/xdgoutput_interface.cpp |
| 37 |
+index e32ccf9..b2b2cba 100644 |
| 38 |
+--- a/src/server/xdgoutput_interface.cpp |
| 39 |
++++ b/src/server/xdgoutput_interface.cpp |
| 40 |
+@@ -25,6 +25,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. |
| 41 |
+ |
| 42 |
+ #include <wayland-xdg-output-server-protocol.h> |
| 43 |
+ |
| 44 |
++#include <QHash> |
| 45 |
++ |
| 46 |
+ namespace KWayland |
| 47 |
+ { |
| 48 |
+ namespace Server |
| 49 |
+-- |
| 50 |
+cgit v1.1 |
| 51 |
|
| 52 |
diff --git a/kde-frameworks/kwayland/kwayland-5.64.0.ebuild b/kde-frameworks/kwayland/kwayland-5.64.0.ebuild |
| 53 |
index b1e978e691f..5a81ee17e71 100644 |
| 54 |
--- a/kde-frameworks/kwayland/kwayland-5.64.0.ebuild |
| 55 |
+++ b/kde-frameworks/kwayland/kwayland-5.64.0.ebuild |
| 56 |
@@ -30,3 +30,5 @@ RDEPEND="${COMMON_DEPEND} |
| 57 |
|
| 58 |
# All failing, I guess we need a virtual wayland server |
| 59 |
RESTRICT+=" test" |
| 60 |
+ |
| 61 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.14.0.patch" ) |
Archives