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 829FF15800F for ; Thu, 5 Jan 2023 18:03:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0072AE0867; Thu, 5 Jan 2023 18:03:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 DDC8DE0867 for ; Thu, 5 Jan 2023 18:03:44 +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 1CF86340C8A for ; Thu, 5 Jan 2023 18:03:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5F4A85C for ; Thu, 5 Jan 2023 18:03:40 +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: <1672941775.a67cf84cb44811a53ff5ba7c00f31139987fa744.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/files/, kde-apps/yakuake/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/yakuake/Manifest 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/ kde-apps/yakuake/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a67cf84cb44811a53ff5ba7c00f31139987fa744 X-VCS-Branch: master Date: Thu, 5 Jan 2023 18:03:40 +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: c6e7fe44-b351-46c0-8588-f11e0453de49 X-Archives-Hash: 68387ff69999dd5be57cab5d3a343d57 commit: a67cf84cb44811a53ff5ba7c00f31139987fa744 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 3 14:47:44 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 5 18:02:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a67cf84c kde-apps/yakuake: drop 22.12.0 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/yakuake/Manifest | 1 - .../files/yakuake-22.12.0-missing-header.patch | 33 ------------ kde-apps/yakuake/yakuake-22.12.0.ebuild | 60 ---------------------- 3 files changed, 94 deletions(-) diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest index 4a29fc345daa..9541afc93cbe 100644 --- a/kde-apps/yakuake/Manifest +++ b/kde-apps/yakuake/Manifest @@ -1,3 +1,2 @@ DIST yakuake-22.08.3.tar.xz 414092 BLAKE2B 235679d6439560cef5519a414f0177834bcd95f440b57428106e6b285a53811a4f32bce6b2ca7c8566e4567e8d9f56ea332e41b175b22d3e649e951ea7e8c794 SHA512 4f02b90d138fa741c8d30f11e409fcc7b08d8775d35e35d90c3d050bbd0f0ce5d2c46ce2c3809e8ad1362eac5661681be75ebe3703570859e4d9e8ebd62ec1d0 -DIST yakuake-22.12.0.tar.xz 426592 BLAKE2B e053ad61017a2229ed2f9341457e2effc08b7e0f98ae9e59d5d83a8045de89e4ecdbc4619e913e877fb53737ba5fa3e83667659d0d223b0083437ad7c97703a8 SHA512 2569d67516b9e80277e37291c01ae7225ddfa04a4410ee13add03a1ae8453a431a525cdacb8e447bd32bf6b55e60f81eb49431d2c4a13d5e1e7addc65a830842 DIST yakuake-22.12.1.tar.xz 426896 BLAKE2B 54f9a231ae06eac7477b2da9d7aeb6d2cdd38ca1cb7729c33947520329066ac68e4ecec72ebfe6f1d824c352b1ae78cde554834258b1d993ffad0bff0abd5afe SHA512 734b066a311baf0e3f491b98c0891836b0058694fd8a46d6e13a743248c64a2b19ccb93baedf167be0cdfdeff7a6e4f8371bce12cd701aa5f429746dd5774d07 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 deleted file mode 100644 index ae43268397ca..000000000000 --- a/kde-apps/yakuake/files/yakuake-22.12.0-missing-header.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 1dbd5fc92756..000000000000 --- a/kde-apps/yakuake/yakuake-22.12.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-3) -KFMIN=5.99.0 -QTMIN=5.15.5 -inherit ecm gear.kde.org - -DESCRIPTION="Quake-style terminal emulator based on konsole" -HOMEPAGE="https://apps.kde.org/yakuake/" - -LICENSE="GPL-2 LGPL-2" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86" -IUSE="absolute-position X" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/konsole-${PVCUT}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-missing-header.patch" ) # bug 885101 - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package absolute-position KF5Wayland) - -DWITHOUT_X11=$(usex !X) - ) - - ecm_src_configure -}