summaryrefslogtreecommitdiff
path: root/kde-apps/yakuake
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-12-10 15:20:44 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-12-10 15:20:44 +0000
commit177349fb1459039cc30cb8e3936af4117d038c16 (patch)
tree34c1bc161daefb8e152212dfba02b98da8a777a5 /kde-apps/yakuake
parentc15acf374d4b25ba5afcb52435da6090f2d98a20 (diff)
gentoo auto-resync : 10:12:2022 - 15:20:44
Diffstat (limited to 'kde-apps/yakuake')
-rw-r--r--kde-apps/yakuake/Manifest3
-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
3 files changed, 37 insertions, 1 deletions
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index 4a099501bdc4..5d4fd76fe65e 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,6 +1,7 @@
AUX yakuake-22.07.90-without_x11.patch 2791 BLAKE2B 8e6a399b07ee4659d2aa55fa03b02c351863c463aa4f75def752ac92e3fe3d848430a9aea1a6a9ef3321451ba5eb4fcd87153d3f4c6ecac88e23f88fc415f8b2 SHA512 88c96e5cc688ae256aedbc70982e51bc26aab043fe15221f634fd64d28b3bdff08f987f484cda6b33cfeedead040738bea363cb86337bbd30d1e22542acde81b
+AUX yakuake-22.12.0-missing-header.patch 943 BLAKE2B 52f0e68509c3addfaec6003e485ec049da1d6fe368441a05608adf9eb404a78fb6ae5b203091a9b1247c578d6b0fd82750bf1f7d5f0db6958a0b375ef96c621f SHA512 bcbcd77f8e90b75d79e235747483c5a4c958c7d8c9b060e4fb6aa745682b3c47a24eab8741b06dd1f2392b1757ac987b0e0ae5bdce4c36f355df6d2fd08e99cf
DIST yakuake-22.08.3.tar.xz 414092 BLAKE2B 235679d6439560cef5519a414f0177834bcd95f440b57428106e6b285a53811a4f32bce6b2ca7c8566e4567e8d9f56ea332e41b175b22d3e649e951ea7e8c794 SHA512 4f02b90d138fa741c8d30f11e409fcc7b08d8775d35e35d90c3d050bbd0f0ce5d2c46ce2c3809e8ad1362eac5661681be75ebe3703570859e4d9e8ebd62ec1d0
DIST yakuake-22.12.0.tar.xz 426592 BLAKE2B e053ad61017a2229ed2f9341457e2effc08b7e0f98ae9e59d5d83a8045de89e4ecdbc4619e913e877fb53737ba5fa3e83667659d0d223b0083437ad7c97703a8 SHA512 2569d67516b9e80277e37291c01ae7225ddfa04a4410ee13add03a1ae8453a431a525cdacb8e447bd32bf6b55e60f81eb49431d2c4a13d5e1e7addc65a830842
EBUILD yakuake-22.08.3.ebuild 1608 BLAKE2B a751a1cece487a98855aedb64ab4ec87f395d310b233512a6962f9cd430d60e3e27acc2c2b2c4490aac935ab4363b781e48a4c3a8731aeab9a4398b22702a844 SHA512 56f9d509f06a34cc2defc6e725447e4b5846172b8c96d78d0e5316292d341dd836cd2ce595170c1fa97051429f2dc71a2d7be4730879bbe9b30cfbfbcaf18859
-EBUILD yakuake-22.12.0.ebuild 1551 BLAKE2B 165ed048558d1ce7f61beae5ddabe7a8469929938a6b5a072c970ac5cfe31c2b415b02b5554a5bd4a9e7b4259f2bcd0b8492d9cbc74aac3af81c0c83a101e67a SHA512 9f86c3cd0021ad8703c4c2494101ba1cea4307172d2b60ee47baea0f6787696d34ba6e60974ad85ba16a796881da291cb85eb869d81df091d58879147229320d
+EBUILD yakuake-22.12.0.ebuild 1617 BLAKE2B 850552167be2591e5e1225054af799e46f7487cb4f61d45eba0a28dcbb2562a9cb0ac3bd2c251fb088741d9a36207b0446aaa89537303f4922f1d4abcbbf541b SHA512 47082692f01c5afd66de5946399752016691e2597b69c412e2e8c746a8af7741a6d8b5161fbede02d3db70c1390d332ec1ae56347387d35f3162915fb7312743
MISC metadata.xml 730 BLAKE2B a366bbedfe3a0b4257147f664f48130ff318a003433134d63e4bd076b9ee43169f28798e0c8da2e13804446abc2b80b1c5327c7468a1f8d6e8243c44c3c72c60 SHA512 7594648f5354d0660fa1063c52fb99af6955b0f3de5603a7c9eca3d1a24db24315990efa13f85680e56d63f77bedfde01f5728271594be794bd896fcf0f01f56
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)