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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 66F211581E1 for ; Mon, 18 Nov 2024 22:17:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66BEFE0990; Mon, 18 Nov 2024 22:17:42 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5102CE0990 for ; Mon, 18 Nov 2024 22:17:42 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 539C9340CA7 for ; Mon, 18 Nov 2024 22:17:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02D991682 for ; Mon, 18 Nov 2024 22:17:39 +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: <1731968245.b5677cc5fd6cdee5de5a9fe8e3803b71d08f22b8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/konsole/files/konsole-24.05.2-cmake.patch X-VCS-Directories: kde-apps/konsole/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b5677cc5fd6cdee5de5a9fe8e3803b71d08f22b8 X-VCS-Branch: master Date: Mon, 18 Nov 2024 22:17:39 +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: 66a9e3fa-0c9b-4abb-acf0-4c285fccfad0 X-Archives-Hash: 63492c4b4bf684989b60fa91cce97611 commit: b5677cc5fd6cdee5de5a9fe8e3803b71d08f22b8 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Nov 17 16:35:21 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 18 22:17:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5677cc5 kde-apps/konsole: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/konsole/files/konsole-24.05.2-cmake.patch | 136 --------------------- 1 file changed, 136 deletions(-) diff --git a/kde-apps/konsole/files/konsole-24.05.2-cmake.patch b/kde-apps/konsole/files/konsole-24.05.2-cmake.patch deleted file mode 100644 index 19064a3fde4c..000000000000 --- a/kde-apps/konsole/files/konsole-24.05.2-cmake.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 3800a40653355dd165fe68f80611228fa94656ee Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 7 Jul 2024 23:27:32 +0200 -Subject: [PATCH] Drop faux X11 dependency and switch WITHOUT_X11 option to - WITH_X11 - -X11 is nowhere needed in the codebase. Follow-up to 2f116f9fb2438a6e66b6702b3cc2ace9d0205f96 - -Signed-off-by: Andreas Sturmlechner -(cherry picked from commit c5f2315c9df05ca069de25ab741d9fc38a6de21a) ---- - CMakeLists.txt | 7 +------ - src/MainWindow.cpp | 8 ++++---- - src/WindowSystemInfo.cpp | 4 ++-- - src/config-konsole.h.cmake | 2 +- - src/main.cpp | 4 ++-- - 5 files changed, 10 insertions(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd30a9888..0f00be8f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -95,12 +95,7 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION - find_package(ICU 61.0 COMPONENTS uc i18n REQUIRED) - - if(NOT APPLE) -- option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF) -- if (NOT WITHOUT_X11) -- find_package(X11) -- set_package_properties(X11 PROPERTIES TYPE OPTIONAL) -- set(HAVE_X11 ${X11_FOUND}) -- endif() -+ option(WITH_X11 "Build with X11 integration" ON) - endif() - - # Check for function GETPWUID -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index c034288df..163105357 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -35,7 +35,7 @@ - #include - #include - --#if HAVE_X11 -+#if WITH_X11 - #include - #endif - -@@ -156,7 +156,7 @@ void MainWindow::activationRequest(const QString &xdgActivationToken) - KWindowSystem::setCurrentXdgActivationToken(xdgActivationToken); - - if (KWindowSystem::isPlatformX11()) { --#if HAVE_X11 -+#if WITH_X11 - KX11Extras::forceActiveWindow(winId()); - #endif - } else { -@@ -713,7 +713,7 @@ bool MainWindow::queryClose() - // NOTE: Some, if not all, of the below KWindowSystem calls are only - // implemented under x11 (KDE4.8 kdelibs/kdeui/windowmanagement). - --#if HAVE_X11 -+#if WITH_X11 - // make sure the window is shown on current desktop and is not minimized - KX11Extras::setOnDesktop(winId(), KX11Extras::currentDesktop()); - #endif -@@ -1022,7 +1022,7 @@ void MainWindow::setRemoveWindowTitleBarAndFrame(bool frameless) - } - - if (KWindowSystem::isPlatformX11()) { --#if HAVE_X11 -+#if WITH_X11 - const auto oldGeometry = saveGeometry(); - // This happens for every Konsole window. It depends on - // the fact that every window is processed in single thread -diff --git a/src/WindowSystemInfo.cpp b/src/WindowSystemInfo.cpp -index d6cad5f68..28cc3bd6c 100644 ---- a/src/WindowSystemInfo.cpp -+++ b/src/WindowSystemInfo.cpp -@@ -11,7 +11,7 @@ - - #include - --#if HAVE_X11 -+#if WITH_X11 - #include - #include - #endif -@@ -22,7 +22,7 @@ bool WindowSystemInfo::HAVE_TRANSPARENCY = false; - - bool WindowSystemInfo::compositingActive() - { --#if HAVE_X11 -+#if WITH_X11 - return !KWindowSystem::isPlatformX11() || KX11Extras::compositingActive(); - #else - return true; -diff --git a/src/config-konsole.h.cmake b/src/config-konsole.h.cmake -index b860764d3..b9fac1e56 100644 ---- a/src/config-konsole.h.cmake -+++ b/src/config-konsole.h.cmake -@@ -3,7 +3,7 @@ - /* Defined if on DragonFly BSD */ - #cmakedefine01 HAVE_OS_DRAGONFLYBSD - --#cmakedefine01 HAVE_X11 -+#cmakedefine01 WITH_X11 - - /* If defined, remove public access to dbus sendInput/runCommand */ - #cmakedefine01 REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS -diff --git a/src/main.cpp b/src/main.cpp -index 9f3b88286..b05877f3d 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -284,7 +284,7 @@ bool shouldUseNewProcess(int argc, char *argv[]) - QStringList qtProblematicOptions; - qtProblematicOptions << QStringLiteral("--session") << QStringLiteral("--name") << QStringLiteral("--reverse") << QStringLiteral("--stylesheet") - << QStringLiteral("--graphicssystem"); --#if HAVE_X11 -+#if WITH_X11 - qtProblematicOptions << QStringLiteral("--display") << QStringLiteral("--visual"); - #endif - for (const QString &option : std::as_const(qtProblematicOptions)) { -@@ -296,7 +296,7 @@ bool shouldUseNewProcess(int argc, char *argv[]) - // take KDE options into consideration - QStringList kdeProblematicOptions; - kdeProblematicOptions << QStringLiteral("--config") << QStringLiteral("--style"); --#if HAVE_X11 -+#if WITH_X11 - kdeProblematicOptions << QStringLiteral("--waitforwm"); - #endif - --- -2.45.2 -