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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E2A1158020 for ; Sat, 10 Dec 2022 14:25:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87BD1E07D1; Sat, 10 Dec 2022 14:25:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72051E07D1 for ; Sat, 10 Dec 2022 14:25:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B4B1D340815 for ; Sat, 10 Dec 2022 14:25:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6B88780 for ; Sat, 10 Dec 2022 14:25:30 +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: <1670682311.fe3f01e2d278213c90d28b5e7eb6c4299ddca808.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/, kde-apps/yakuake/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/yakuake/files/yakuake-22.12.0-missing-header.patch kde-apps/yakuake/yakuake-22.12.0.ebuild X-VCS-Directories: kde-apps/yakuake/files/ kde-apps/yakuake/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fe3f01e2d278213c90d28b5e7eb6c4299ddca808 X-VCS-Branch: master Date: Sat, 10 Dec 2022 14:25:30 +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: be16eed7-9331-4458-8c07-5824b19016a9 X-Archives-Hash: ad7da1a42edc7323f55a186b1c9ce352 commit: fe3f01e2d278213c90d28b5e7eb6c4299ddca808 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 10 14:24:04 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 10 14:25:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3f01e2 kde-apps/yakuake: Fix build with USE=-absolute-position Closes: https://bugs.gentoo.org/885101 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/yakuake-22.12.0-missing-header.patch | 33 ++++++++++++++++++++++ kde-apps/yakuake/yakuake-22.12.0.ebuild | 2 ++ 2 files changed, 35 insertions(+) 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 +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 +--- + 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 + #include + #include ++#include + + #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)