summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-12-10 15:24:04 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2022-12-10 15:25:11 +0100
commitfe3f01e2d278213c90d28b5e7eb6c4299ddca808 (patch)
tree02b186986f696664d05218eb06eab932f768f063 /kde-apps/yakuake
parentnet-im/neochat: add 22.11 (diff)
downloadgentoo-fe3f01e2d278213c90d28b5e7eb6c4299ddca808.tar.gz
gentoo-fe3f01e2d278213c90d28b5e7eb6c4299ddca808.tar.bz2
gentoo-fe3f01e2d278213c90d28b5e7eb6c4299ddca808.zip
kde-apps/yakuake: Fix build with USE=-absolute-position
Closes: https://bugs.gentoo.org/885101 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/yakuake')
-rw-r--r--kde-apps/yakuake/files/yakuake-22.12.0-missing-header.patch33
-rw-r--r--kde-apps/yakuake/yakuake-22.12.0.ebuild2
2 files changed, 35 insertions, 0 deletions
diff --git a/kde-apps/yakuake/files/yakuake-22.12.0-missing-header.patch b/kde-apps/yakuake/files/yakuake-22.12.0-missing-header.patch
new file mode 100644
index 000000000000..ae43268397ca
--- /dev/null
+++ b/kde-apps/yakuake/files/yakuake-22.12.0-missing-header.patch
@@ -0,0 +1,33 @@
+From 1f2df3b0f57f5b3f4e4a5da8608cccde4edb2de5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 10 Dec 2022 12:22:46 +0100
+Subject: [PATCH] Re-add missing header when building without KF5Wayland
+
+Otherwise we rely on KWayland/Client/surface.h to implicitly provide
+QWindow which may not be available.
+
+Partial revert of 9b93462943ab26ab015989321881dee13404d711
+See also: https://invent.kde.org/utilities/yakuake/-/merge_requests/80
+
+Downstream report: https://bugs.gentoo.org/885101
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ app/mainwindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
+index 4ea361e..8b0aab3 100644
+--- a/app/mainwindow.cpp
++++ b/app/mainwindow.cpp
+@@ -42,6 +42,7 @@
+ #include <QPainter>
+ #include <QScreen>
+ #include <QWhatsThis>
++#include <QWindow>
+
+ #if HAVE_X11
+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+--
+2.38.1
+
diff --git a/kde-apps/yakuake/yakuake-22.12.0.ebuild b/kde-apps/yakuake/yakuake-22.12.0.ebuild
index 08906d9076f1..1dbd5fc92756 100644
--- a/kde-apps/yakuake/yakuake-22.12.0.ebuild
+++ b/kde-apps/yakuake/yakuake-22.12.0.ebuild
@@ -48,6 +48,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" ) # bug 885101
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package absolute-position KF5Wayland)