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

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

[Johannes Huber]

commit:     457d1927d8dae1074e4a446e496b67a3fa256915
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 25 12:28:48 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan 25 19:25:23 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=457d1927

[kde-apps/konsole] Remove upstreamed patch

---
 .../files/konsole-9999-tests-optional.patch        | 27 ----------------------
 kde-apps/konsole/konsole-9999.ebuild               |  2 --
 2 files changed, 29 deletions(-)

diff --git a/kde-apps/konsole/files/konsole-9999-tests-optional.patch b/kde-apps/konsole/files/konsole-9999-tests-optional.patch
deleted file mode 100644
index 99eaef8..0000000
--- a/kde-apps/konsole/files/konsole-9999-tests-optional.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/CMakeLists.txt	2015-01-19 01:06:41.388214548 +0100
-+++ b/CMakeLists.txt	2015-01-19 01:13:14.851202822 +0100
-@@ -26,7 +26,7 @@
- ecm_setup_version(${Konsole_VERSION} VARIABLE_PREFIX KONSOLEPRIVATE
-                   SOVERSION ${Konsole_VERSION_MAJOR}
- )
--find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Test)
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script)
- 
- find_package(KF5 REQUIRED
-     Bookmarks Completion Config ConfigWidgets
---- a/src/CMakeLists.txt	2015-01-19 01:06:41.386214548 +0100
-+++ b/src/CMakeLists.txt	2015-01-19 01:15:51.963198139 +0100
-@@ -22,8 +22,11 @@
-               ${CMAKE_CURRENT_BINARY_DIR}/config-konsole.h)
- 
- ### Tests
--add_subdirectory(autotests)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+  find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+  add_subdirectory(autotests)
-+  add_subdirectory(tests)
-+endif()
- 
- ### Font Embedder and LineFont.h
- option(KONSOLE_BUILD_FONTEMBEDDER "Konsole: build fontembedder executable" OFF)

diff --git a/kde-apps/konsole/konsole-9999.ebuild b/kde-apps/konsole/konsole-9999.ebuild
index 26b7ffe..8c9b069 100644
--- a/kde-apps/konsole/konsole-9999.ebuild
+++ b/kde-apps/konsole/konsole-9999.ebuild
@@ -49,8 +49,6 @@ RDEPEND="${DEPEND}
 	!kde-base/konsole
 "
 
-PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package X X11)

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

[Andreas Sturmlechner]

commit:     5feba2df29bcc25473f2a7b3b18f3256fee190ad
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 21:50:00 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 23:10:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5feba2df

kde-apps/konsole: ColorScheme: Fix DarkBackground Detection

See also: https://invent.kde.org/kde/konsole/merge_requests/65
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=416638
Thanks-to: Manuel Rüger <mrueg <AT> gentoo.org>
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../konsole-19.12.2-darkbackground-detect.patch    | 27 ++++++++++++++++++++++
 kde-apps/konsole/konsole-19.12.49.9999.ebuild      |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch b/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch
new file mode 100644
index 0000000000..990bad142c
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch
@@ -0,0 +1,27 @@
+From e5b2ada1a6f06e0eea76af1f26ff4c0c4aad8497 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
+Date: Thu, 23 Jan 2020 11:00:06 +0100
+Subject: ColorScheme: Fix DarkBackground Detection
+
+Luminance is a value between 0 and 100.
+
+https://bugs.kde.org/show_bug.cgi?id=416638
+---
+ src/ColorScheme.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp
+index 1693c22..5d6b408 100644
+--- a/src/ColorScheme.cpp
++++ b/src/ColorScheme.cpp
+@@ -403,7 +403,7 @@ bool ColorScheme::hasDarkBackground() const
+     const double g = backgroundColor().greenF();
+     const double b = backgroundColor().blueF();
+     rgb2hsluv(r, g, b, &h, &s, &l);
+-    return l < 0.5;
++    return l < 50;
+ }
+ 
+ void ColorScheme::setOpacity(qreal opacity)
+-- 
+cgit v1.1

diff --git a/kde-apps/konsole/konsole-19.12.49.9999.ebuild b/kde-apps/konsole/konsole-19.12.49.9999.ebuild
index c4c1bb90b5..8c4abf3812 100644
--- a/kde-apps/konsole/konsole-19.12.49.9999.ebuild
+++ b/kde-apps/konsole/konsole-19.12.49.9999.ebuild
@@ -53,6 +53,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package X X11)