From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1652328-garchives=archives.gentoo.org@lists.gentoo.org>
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 E40181581C1
for <garchives@archives.gentoo.org>; Fri, 12 Jul 2024 17:43:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0ACFFE2A76;
Fri, 12 Jul 2024 17:43:07 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 D0716E2A76
for <gentoo-commits@lists.gentoo.org>; Fri, 12 Jul 2024 17:43:06 +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 03342343088
for <gentoo-commits@lists.gentoo.org>; Fri, 12 Jul 2024 17:43:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F5811BFE
for <gentoo-commits@lists.gentoo.org>; Fri, 12 Jul 2024 17:43:04 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1720806165.75cbeb51d13fc26c9eda09383d5a9825b065325c.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: 75cbeb51d13fc26c9eda09383d5a9825b065325c
X-VCS-Branch: master
Date: Fri, 12 Jul 2024 17:43:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 367ded84-fc22-4452-9fcc-6fb466b4abb1
X-Archives-Hash: 0da83354d831219852b15d0e01e767f4
commit: 75cbeb51d13fc26c9eda09383d5a9825b065325c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 17:42:45 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 17:42:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75cbeb51
kde-apps/konsole: Fix patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/konsole/files/konsole-24.05.2-cmake.patch | 29 +++++++++++-----------
1 file changed, 15 insertions(+), 14 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
index dbedc87de729..19064a3fde4c 100644
--- a/kde-apps/konsole/files/konsole-24.05.2-cmake.patch
+++ b/kde-apps/konsole/files/konsole-24.05.2-cmake.patch
@@ -1,4 +1,4 @@
-From c5f2315c9df05ca069de25ab741d9fc38a6de21a Mon Sep 17 00:00:00 2001
+From 3800a40653355dd165fe68f80611228fa94656ee Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 7 Jul 2024 23:27:32 +0200
Subject: [PATCH] Drop faux X11 dependency and switch WITHOUT_X11 option to
@@ -7,6 +7,7 @@ Subject: [PATCH] Drop faux X11 dependency and switch WITHOUT_X11 option to
X11 is nowhere needed in the codebase. Follow-up to 2f116f9fb2438a6e66b6702b3cc2ace9d0205f96
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+(cherry picked from commit c5f2315c9df05ca069de25ab741d9fc38a6de21a)
---
CMakeLists.txt | 7 +------
src/MainWindow.cpp | 8 ++++----
@@ -16,15 +17,15 @@ Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
5 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80292afd1b..4746aae72a 100644
+index bd30a9888..0f00be8f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -105,12 +105,7 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
+@@ -95,12 +95,7 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
find_package(ICU 61.0 COMPONENTS uc i18n REQUIRED)
- if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU)
+ if(NOT APPLE)
- option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
-- if(NOT WITHOUT_X11)
+- if (NOT WITHOUT_X11)
- find_package(X11)
- set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
- set(HAVE_X11 ${X11_FOUND})
@@ -34,7 +35,7 @@ index 80292afd1b..4746aae72a 100644
# Check for function GETPWUID
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
-index c034288df4..1631053572 100644
+index c034288df..163105357 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -35,7 +35,7 @@
@@ -74,7 +75,7 @@ index c034288df4..1631053572 100644
// 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 d6cad5f68b..28cc3bd6cd 100644
+index d6cad5f68..28cc3bd6c 100644
--- a/src/WindowSystemInfo.cpp
+++ b/src/WindowSystemInfo.cpp
@@ -11,7 +11,7 @@
@@ -96,7 +97,7 @@ index d6cad5f68b..28cc3bd6cd 100644
#else
return true;
diff --git a/src/config-konsole.h.cmake b/src/config-konsole.h.cmake
-index fd8f35822c..a1702d8ed9 100644
+index b860764d3..b9fac1e56 100644
--- a/src/config-konsole.h.cmake
+++ b/src/config-konsole.h.cmake
@@ -3,7 +3,7 @@
@@ -106,13 +107,13 @@ index fd8f35822c..a1702d8ed9 100644
-#cmakedefine01 HAVE_X11
+#cmakedefine01 WITH_X11
- #cmakedefine01 HAVE_DBUS
-
+ /* 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 c9b8b12978..2207db1d7c 100644
+index 9f3b88286..b05877f3d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
-@@ -286,7 +286,7 @@ bool shouldUseNewProcess(int argc, char *argv[])
+@@ -284,7 +284,7 @@ bool shouldUseNewProcess(int argc, char *argv[])
QStringList qtProblematicOptions;
qtProblematicOptions << QStringLiteral("--session") << QStringLiteral("--name") << QStringLiteral("--reverse") << QStringLiteral("--stylesheet")
<< QStringLiteral("--graphicssystem");
@@ -121,7 +122,7 @@ index c9b8b12978..2207db1d7c 100644
qtProblematicOptions << QStringLiteral("--display") << QStringLiteral("--visual");
#endif
for (const QString &option : std::as_const(qtProblematicOptions)) {
-@@ -298,7 +298,7 @@ bool shouldUseNewProcess(int argc, char *argv[])
+@@ -296,7 +296,7 @@ bool shouldUseNewProcess(int argc, char *argv[])
// take KDE options into consideration
QStringList kdeProblematicOptions;
kdeProblematicOptions << QStringLiteral("--config") << QStringLiteral("--style");
@@ -131,5 +132,5 @@ index c9b8b12978..2207db1d7c 100644
#endif
--
-GitLab
+2.45.2