[gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/

[Andreas Sturmlechner]

commit:     b79efdba4a801fa533c4ca85e3124d96c71d878c
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jan 29 15:42:00 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 20:41:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79efdba

kde-apps/konsole: remove unused patch(es)

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19252
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../konsole-20.12.0-revert-bold-breakage.patch     | 33 ----------------------
 1 file changed, 33 deletions(-)

diff --git a/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch b/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch
deleted file mode 100644
index 8e79793601e..00000000000
--- a/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 08a51bbdd70c0c850f44a660a7efbe4c394b8ee3 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Thu, 17 Dec 2020 17:21:44 +0100
-Subject: [PATCH] Revert "Fix bold character color paint"
-
-This reverts commit 270d6ea3247bb41a51535129e4b1c8eef51cf316.
----
- src/Screen.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/Screen.cpp b/src/Screen.cpp
-index 8e7eee51..c8f477ce 100644
---- a/src/Screen.cpp
-+++ b/src/Screen.cpp
-@@ -474,8 +474,14 @@ void Screen::updateEffectiveRendition()
-         _effectiveBackground = _currentBackground;
-     }
- 
--    if ((_currentRendition & RE_BOLD) == 0 && (_currentRendition & RE_FAINT) != 0) {
-+    if ((_currentRendition & RE_BOLD) != 0) {
-+        if ((_currentRendition & RE_FAINT) == 0) {
-+            _effectiveForeground.setIntensive();
-+        }
-+    } else {
-+        if ((_currentRendition & RE_FAINT) != 0) {
-             _effectiveForeground.setFaint();
-+        }
-     }
- }
- 
--- 
-2.29.2
-

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/

[Andreas Sturmlechner]

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
 

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/

[Andreas Sturmlechner]

commit:     b5677cc5fd6cdee5de5a9fe8e3803b71d08f22b8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Nov 17 16:35:21 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <mmk <AT> levelnine.at>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 <asturm@gentoo.org>
-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 <asturm@gentoo.org>
-(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 <KWindowSystem>
- #include <KXMLGUIFactory>
- 
--#if HAVE_X11
-+#if WITH_X11
- #include <KX11Extras>
- #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 <QtGlobal>
- 
--#if HAVE_X11
-+#if WITH_X11
- #include <KWindowSystem>
- #include <KX11Extras>
- #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
-