subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: kde\-apps\/konsole\/"

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

2023-08-01 Thread Sam James

commit: 2fab3b7be08f643076c426d63537b6728c35bba3
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  2 05:47:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  2 05:47:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fab3b7b

kde-apps/konsole: skip extremely flaky TerminalInterfaceTest test

Closes: https://bugs.gentoo.org/862594
Closes: https://bugs.gentoo.org/662756
Signed-off-by: Sam James  gentoo.org>

 kde-apps/konsole/konsole-23.04.3.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konsole/konsole-23.04.3.ebuild 
b/kde-apps/konsole/konsole-23.04.3.ebuild
index d6462c2d2a74..e79c8b5c5ae1 100644
--- a/kde-apps/konsole/konsole-23.04.3.ebuild
+++ b/kde-apps/konsole/konsole-23.04.3.ebuild
@@ -60,9 +60,10 @@ src_configure() {
 }
 
 src_test() {
-   # drkonqi process interferes. bug 702690
+   # DBusTest: drkonqi process interferes. bug 702690
+   # TerminalInterfaceTest: unbelievably flaky, bug 862594 and bug 662756
local myctestargs=(
-   -E "(DBusTest)"
+   -E "(DBusTest|TerminalInterfaceTest)"
)
 
ecm_src_test

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

2022-10-30 Thread WANG Xuerui

commit: c77729bbb8b097f17464a4418b015785e9e7af45
Author: WANG Xuerui  gentoo  org>
AuthorDate: Mon Oct 31 01:21:50 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Mon Oct 31 01:25:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c77729bb

kde-apps/konsole: keyword 22.08.2 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 kde-apps/konsole/konsole-22.08.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-22.08.2.ebuild 
b/kde-apps/konsole/konsole-22.08.2.ebuild
index b2ba161347d9..554b0a30cec0 100644
--- a/kde-apps/konsole/konsole-22.08.2.ebuild
+++ b/kde-apps/konsole/konsole-22.08.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 DEPEND="

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

2022-08-06 Thread Andreas Sturmlechner

commit: 7ec978e7f9bb50d0353c0bdacc8d278339f51805
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 27 13:45:49 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug  6 07:26:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec978e7

kde-apps/konsole: Fix build with USE -X

Upstream commit 0aa39e22a2bb1bbcb8a02dfd6635ffe4d8a0bbb1

Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konsole-22.04.3-without_x11.patch| 46 ++
 kde-apps/konsole/konsole-22.04.3.ebuild|  5 ++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch 
b/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch
new file mode 100644
index ..ed396fcf20ab
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch
@@ -0,0 +1,46 @@
+From 0aa39e22a2bb1bbcb8a02dfd6635ffe4d8a0bbb1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 27 Nov 2021 14:43:18 +0100
+Subject: [PATCH] Add CMake option to build WITHOUT_X11
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding X11 or adding unwanted features if the
+option is enabled.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt | 9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 61ed70cd7..565682848 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -103,10 +103,13 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+ )
+ 
+ if(NOT APPLE)
+-find_package(X11)
+-set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
++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()
+ endif()
+-set(HAVE_X11 ${X11_FOUND})
+ 
+ # Check for function GETPWUID
+ check_symbol_exists(getpwuid "pwd.h" HAVE_GETPWUID)
+-- 
+GitLab
+

diff --git a/kde-apps/konsole/konsole-22.04.3.ebuild 
b/kde-apps/konsole/konsole-22.04.3.ebuild
index cce03a53b3c6..d02a5534dca2 100644
--- a/kde-apps/konsole/konsole-22.04.3.ebuild
+++ b/kde-apps/konsole/konsole-22.04.3.ebuild
@@ -50,11 +50,12 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
 src_configure() {
local mycmakeargs=(
-   $(cmake_use_find_package X X11)
+   -DWITHOUT_X11=$(usex !X)
)
-
ecm_src_configure
 }

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

2022-06-27 Thread Sam James

commit: cf86b568cc6054601d8d5d8ee625ce35208b328c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 27 08:18:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 27 08:19:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf86b568

kde-apps/konsole: fix style

Fixes: 4497060a03e90facbcf724ed7fb36db040ca1f39
Signed-off-by: Sam James  gentoo.org>

 kde-apps/konsole/konsole-22.04.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konsole/konsole-22.04.2.ebuild 
b/kde-apps/konsole/konsole-22.04.2.ebuild
index 76ba1af7bc7f..28bfdda48455 100644
--- a/kde-apps/konsole/konsole-22.04.2.ebuild
+++ b/kde-apps/konsole/konsole-22.04.2.ebuild
@@ -18,8 +18,6 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
-PATCHES=( "${FILESDIR}"/${PN}-22.04.2-musl_malloc_trim.patch )
-
 DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -52,6 +50,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-22.04.2-musl_malloc_trim.patch )
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package X X11)

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

2022-06-26 Thread Sam James

commit: 4497060a03e90facbcf724ed7fb36db040ca1f39
Author: Alfred Persson Forsberg  catcream  org>
AuthorDate: Sun Jun 26 19:42:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 26 20:17:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4497060a

kde-apps/konsole: fix build for musl

This patch fixes building Konsole with musl. Konsole uses the GNU
extension malloc_trim and this patch makes Konsole use it conditionally
depending on if it's present on the target system.

This is upstreamed for release 22.04.3 (mid July).

See-also: https://invent.kde.org/utilities/konsole/-/merge_requests/621
Signed-off-by: Alfred Persson Forsberg  catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/26084
Signed-off-by: Sam James  gentoo.org>

 .../files/konsole-22.04.2-musl_malloc_trim.patch   | 92 ++
 kde-apps/konsole/konsole-22.04.2.ebuild|  2 +
 2 files changed, 94 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-22.04.2-musl_malloc_trim.patch 
b/kde-apps/konsole/files/konsole-22.04.2-musl_malloc_trim.patch
new file mode 100644
index ..455dbc55821f
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-22.04.2-musl_malloc_trim.patch
@@ -0,0 +1,92 @@
+https://invent.kde.org/utilities/konsole/-/merge_requests/621
+https://invent.kde.org/utilities/konsole/-/commit/b8c90a830ceaf293e61f6cd5217bb3e584f997b8
 (backport)
+
+
+From b8c90a830ceaf293e61f6cd5217bb3e584f997b8 Mon Sep 17 00:00:00 2001
+From: Heiko Becker 
+Date: Tue, 22 Mar 2022 22:08:10 +0100
+Subject: [PATCH] Detect the presence of malloc_trim to fix the build with musl
+
+malloc_trim is indeed a GNU extension, but an extension of glibc.
+Relying on __GNUC__ unfortunately doesn't help with that. Check for
+the actual presence of malloc_trim with cmake's check_function_exists
+instead.
+This fixes the build with musl libc, which doesn't come with
+malloc_trim.
+
+Co-authored-by: Ahmad Samir 
+(cherry picked from commit f6310c2b791275f3727f2240ca7fab9f58db943d)
+---
+ CMakeLists.txt |  2 +-
+ src/Screen.cpp | 17 +++--
+ src/config-konsole.h.cmake |  4 ++--
+ 3 files changed, 10 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f2c9d43ac..b306597ba 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -94,7 +94,7 @@ set(HAVE_X11 ${X11_FOUND})
+ # Check for function GETPWUID
+ check_symbol_exists(getpwuid "pwd.h" HAVE_GETPWUID)
+ 
+-check_include_files(malloc.h  HAVE_MALLOC_H)
++check_function_exists(malloc_trim HAVE_MALLOC_TRIM)
+ 
+ # See above includes for defaults
+ add_definitions(
+diff --git a/src/Screen.cpp b/src/Screen.cpp
+index e57314cd5..dff9b54a4 100644
+--- a/src/Screen.cpp
 b/src/Screen.cpp
+@@ -28,13 +28,11 @@
+ #include "history/HistoryType.h"
+ #include "profile/Profile.h"
+ 
+-#ifdef HAVE_MALLOC_H
+-// For malloc_trim, which is a GNU extension
+-#ifdef __GNUC__
+-extern "C" {
+-#include 
+-}
+-#endif
++#ifdef HAVE_MALLOC_TRIM
++// For malloc_trim, which is a GNU extension
++extern "C" {
++#include 
++}
+ #endif
+ 
+ using namespace Konsole;
+@@ -1799,14 +1797,13 @@ void Screen::setScroll(const HistoryType , bool 
copyPreviousScroll)
+ t.scroll(_history);
+ }
+ 
+-#ifdef HAVE_MALLOC_H
++#ifdef HAVE_MALLOC_TRIM
++
+ #ifdef Q_OS_LINUX
+-#ifdef __GNUC__
+ // We might have been using gigabytes of memory, so make sure it is 
actually released
+ malloc_trim(0);
+ #endif
+ #endif
+-#endif
+ }
+ 
+ bool Screen::hasScroll() const
+diff --git a/src/config-konsole.h.cmake b/src/config-konsole.h.cmake
+index b74992b0a..4b1d9b515 100644
+--- a/src/config-konsole.h.cmake
 b/src/config-konsole.h.cmake
+@@ -15,5 +15,5 @@
+ 
+ #cmakedefine HAVE_GETPWUID ${HAVE_GETPWUID}
+ 
+-/* Define to 1 if you have the  header file. */
+-#cmakedefine HAVE_MALLOC_H 1
++/* Defined if system has the malloc_trim function, which is a GNU extension */
++#cmakedefine HAVE_MALLOC_TRIM
+-- 
+GitLab
+

diff --git a/kde-apps/konsole/konsole-22.04.2.ebuild 
b/kde-apps/konsole/konsole-22.04.2.ebuild
index cd237a5abc51..76ba1af7bc7f 100644
--- a/kde-apps/konsole/konsole-22.04.2.ebuild
+++ b/kde-apps/konsole/konsole-22.04.2.ebuild
@@ -18,6 +18,8 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
+PATCHES=( "${FILESDIR}"/${PN}-22.04.2-musl_malloc_trim.patch )
+
 DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5

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

2021-11-26 Thread Andreas Sturmlechner

commit: f533a61d513ad28688874d2871f84d991209c82c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 26 10:00:24 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 26 10:27:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f533a61d

kde-apps/konsole: Drop 21.04.3

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-21.04.3.ebuild | 74 -
 1 file changed, 74 deletions(-)

diff --git a/kde-apps/konsole/konsole-21.04.3.ebuild 
b/kde-apps/konsole/konsole-21.04.3.ebuild
deleted file mode 100644
index ba5b2d4855ba..
--- a/kde-apps/konsole/konsole-21.04.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org;
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="X"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/kbookmarks-${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/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kinit-${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/kpty-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-   ecm_src_prepare
-   ecm_punt_bogus_dep KF5 Completion
-}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package X X11)
-   )
-
-   ecm_src_configure
-}
-
-src_test() {
-   # drkonqi process interferes. bug 702690
-   local myctestargs=(
-   -E "(DBusTest)"
-   )
-
-   ecm_src_test
-}

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

2021-11-16 Thread Sam James

commit: b30a38e511264051254c4e492f6c65d36bf8d06c
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 17 07:47:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 17 07:48:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30a38e5

kde-apps/konsole: Stabilize 21.04.3-r4 arm64, #807933

Signed-off-by: Sam James  gentoo.org>

 kde-apps/konsole/konsole-21.04.3-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-21.04.3-r4.ebuild 
b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
index 0a2128895e36..631d9d6ca081 100644
--- a/kde-apps/konsole/konsole-21.04.3-r4.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="

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

2021-10-01 Thread Andreas Sturmlechner

commit: 6f4bc283efb20a1f4b227a8f00976f2cec443d62
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct  1 12:24:31 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Oct  1 17:27:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4bc283

kde-apps/konsole: Drop 21.04.3-r3

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-21.04.3-r3.ebuild | 80 --
 1 file changed, 80 deletions(-)

diff --git a/kde-apps/konsole/konsole-21.04.3-r3.ebuild 
b/kde-apps/konsole/konsole-21.04.3-r3.ebuild
deleted file mode 100644
index 8ebbdcdf1dd..000
--- a/kde-apps/konsole/konsole-21.04.3-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org;
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="X"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/kbookmarks-${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/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kinit-${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/kpty-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933
-   "${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510
-   
"${FILESDIR}/${P}-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch"
 # bug 810598
-)
-
-src_prepare() {
-   ecm_src_prepare
-   ecm_punt_bogus_dep KF5 Completion
-}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package X X11)
-   )
-
-   ecm_src_configure
-}
-
-src_test() {
-   # drkonqi process interferes. bug 702690
-   local myctestargs=(
-   -E "(DBusTest)"
-   )
-
-   ecm_src_test
-}

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

2021-09-30 Thread Sam James

commit: a6ab12f5fb62a8e19b3712d8f9644cee8d6166b1
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 30 18:15:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 30 18:15:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ab12f5

kde-apps/konsole: Stabilize 21.04.3-r4 amd64, #807933

Signed-off-by: Sam James  gentoo.org>

 kde-apps/konsole/konsole-21.04.3-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-21.04.3-r4.ebuild 
b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
index 8650772eb7a..0a2128895e3 100644
--- a/kde-apps/konsole/konsole-21.04.3-r4.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="

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

2021-09-29 Thread Agostino Sarubbo

commit: 1855c463856a805d9caaae40be06ad62e7455e03
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 29 20:54:47 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 29 20:54:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1855c463

kde-apps/konsole: x86 stable wrt bug #807933

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-apps/konsole/konsole-21.04.3-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-21.04.3-r4.ebuild 
b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
index c44e2eb15d3..8650772eb7a 100644
--- a/kde-apps/konsole/konsole-21.04.3-r4.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="

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

2021-09-22 Thread Andreas Sturmlechner

commit: 7efccec23f297902e698925af2503519d58ddf45
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 22 21:28:56 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 22 21:59:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efccec2

kde-apps/konsole: (Final) fix(?) for window flashing on session close

Upstream commit e693f2d7f1977ca227589154a5cd8c18d8ce44b7

Tested-by: David Flogeras  gmail.com>
Bug: https://bugs.gentoo.org/807933
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 3-default-navigation-be-TabbedNavigation.patch | 32 ++
 ...le-21.08.1.ebuild => konsole-21.04.3-r4.ebuild} | 19 +++--
 ...le-21.08.1.ebuild => konsole-21.08.1-r1.ebuild} |  4 +++
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git 
a/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch
 
b/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch
new file mode 100644
index 000..0eeaef37899
--- /dev/null
+++ 
b/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch
@@ -0,0 +1,32 @@
+From e693f2d7f1977ca227589154a5cd8c18d8ce44b7 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Wed, 1 Sep 2021 11:38:29 +0200
+Subject: [PATCH] The default navigation method should be TabbedNavigation
+
+TabbedNavigation is when we have a MainWindow, i.e. the typical use case;
+whereas NoNavigation is when using Konsole Part. The code in Part calls
+setNavigationMethod(NoNavigation), so things should work as before.
+
+I made a wrong assumption that TabbedNavigation was already the default.
+
+CCBUG: 432077
+---
+ src/ViewManager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
+index 2ba77e9f0..3ffbe6ba0 100644
+--- a/src/ViewManager.cpp
 b/src/ViewManager.cpp
+@@ -52,7 +52,7 @@ ViewManager::ViewManager(QObject *parent, KActionCollection 
*collection) :
+ _pluggedController(nullptr),
+ _sessionMap(QHash()),
+ _actionCollection(collection),
+-_navigationMethod(NoNavigation),
++_navigationMethod(TabbedNavigation),
+ _navigationVisibility(NavigationNotSet),
+ _managerId(0),
+ _terminalDisplayHistoryIndex(-1)
+-- 
+GitLab
+

diff --git a/kde-apps/konsole/konsole-21.08.1.ebuild 
b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
similarity index 77%
copy from kde-apps/konsole/konsole-21.08.1.ebuild
copy to kde-apps/konsole/konsole-21.04.3-r4.ebuild
index 85e60971ebf..c44e2eb15d3 100644
--- a/kde-apps/konsole/konsole-21.08.1.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.84.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND="
@@ -34,6 +34,7 @@ DEPEND="
>=kde-frameworks/kguiaddons-${KFMIN}:5
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kinit-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/knewstuff-${KFMIN}:5
@@ -50,6 +51,18 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933
+   "${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510
+   
"${FILESDIR}/${P}-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch"
 # bug 810598
+   "${FILESDIR}/${P}-default-navigation-be-TabbedNavigation.patch" # bug 
807933
+)
+
+src_prepare() {
+   ecm_src_prepare
+   ecm_punt_bogus_dep KF5 Completion
+}
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package X X11)

diff --git a/kde-apps/konsole/konsole-21.08.1.ebuild 
b/kde-apps/konsole/konsole-21.08.1-r1.ebuild
similarity index 94%
rename from kde-apps/konsole/konsole-21.08.1.ebuild
rename to kde-apps/konsole/konsole-21.08.1-r1.ebuild
index 85e60971ebf..57a1100aff1 100644
--- a/kde-apps/konsole/konsole-21.08.1.ebuild
+++ b/kde-apps/konsole/konsole-21.08.1-r1.ebuild
@@ -50,6 +50,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   
"${FILESDIR}/${PN}-21.04.3-default-navigation-be-TabbedNavigation.patch" # bug 
807933
+)
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package X X11)

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

2021-08-30 Thread Andreas Sturmlechner

commit: 1d44e1110d380df8df6b397520eecb201fea4d6a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 30 12:17:00 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 30 12:58:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d44e111

kde-apps/konsole: Only emit empty() in SessionFinished()

...when in TabbedNavigation mode.

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=441206
Closes: https://bugs.gentoo.org/810598
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...ionFinished-only-in-TabbedNavigation-mode.patch | 53 ++
 ...21.04.3-r2.ebuild => konsole-21.04.3-r3.ebuild} |  1 +
 ...21.08.0-r4.ebuild => konsole-21.08.0-r5.ebuild} |  1 +
 3 files changed, 55 insertions(+)

diff --git 
a/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch
 
b/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch
new file mode 100644
index 000..d02846ace5a
--- /dev/null
+++ 
b/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch
@@ -0,0 +1,53 @@
+From 2684bc7fa5ac0b740b3e8661c3a0ae0136fde0a7 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Sun, 22 Aug 2021 20:02:52 +0200
+Subject: [PATCH] Only emit empty() in SessionFinished() when in
+ TabbedNavigation mode
+
+empty() is emitted so that MainWindow calls close() and we get rid of the
+colours-flashing bug when closing the last session/tab in a window, see
+commit bbec72250d080. However all that isn't relevant when we are in
+konsole Part mode, where there are no tabs or MainWindows.
+
+This fixes a crash in Dolphin when closing its window while the embedded
+Konsole Part is open. The crash would happen as calling
+ViewContainer::currentTabViewCount() would end up in the ViewSplitter code
+path, which is no-op in Konsole Part.
+
+To test:
+- Open dolphin, make sure the terminal panel isn't open to begin with
+- open the terminal panel
+- close the dolphin window while the terminal panel is open
+
+BUG: 441206
+FIXED-IN: 21.08.1
+---
+ src/ViewManager.cpp | 12 +++-
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
+index 92d2951fc..2ba77e9f0 100644
+--- a/src/ViewManager.cpp
 b/src/ViewManager.cpp
+@@ -494,11 +494,13 @@ void ViewManager::sessionFinished()
+ return;
+ }
+ 
+-// The last session/tab, and only one view (no splits), emit empty()
+-// so that close() is called in MainWindow, fixes #432077
+-if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() 
== 1) {
+-Q_EMIT empty();
+-return;
++if (_navigationMethod == TabbedNavigation) {
++// The last session/tab, and only one view (no splits), emit empty()
++// so that close() is called in MainWindow, fixes #432077
++if (_viewContainer->count() == 1 && 
_viewContainer->currentTabViewCount() == 1) {
++Q_EMIT empty();
++return;
++}
+ }
+ 
+ auto *session = qobject_cast(sender());
+-- 
+GitLab
+

diff --git a/kde-apps/konsole/konsole-21.04.3-r2.ebuild 
b/kde-apps/konsole/konsole-21.04.3-r3.ebuild
similarity index 95%
rename from kde-apps/konsole/konsole-21.04.3-r2.ebuild
rename to kde-apps/konsole/konsole-21.04.3-r3.ebuild
index c95192f968c..8ebbdcdf1dd 100644
--- a/kde-apps/konsole/konsole-21.04.3-r2.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r3.ebuild
@@ -54,6 +54,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933
"${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510
+   
"${FILESDIR}/${P}-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch"
 # bug 810598
 )
 
 src_prepare() {

diff --git a/kde-apps/konsole/konsole-21.08.0-r4.ebuild 
b/kde-apps/konsole/konsole-21.08.0-r5.ebuild
similarity index 95%
rename from kde-apps/konsole/konsole-21.08.0-r4.ebuild
rename to kde-apps/konsole/konsole-21.08.0-r5.ebuild
index d4600f096a8..22a1835a1ff 100644
--- a/kde-apps/konsole/konsole-21.08.0-r4.ebuild
+++ b/kde-apps/konsole/konsole-21.08.0-r5.ebuild
@@ -53,6 +53,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
"${FILESDIR}/${PN}-21.04.3-dont-close-window-while-split.patch" # bug 
808510
+   
"${FILESDIR}/${PN}-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch"
 # bug 810598
"${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1
"${FILESDIR}/${P}-fix-KXmlGUI-toolbars-and-MainWindow-size.patch" # 
KDE-bugs 430036, 439339
"${FILESDIR}/${P}-fix-MainWindow-size-w-o-saved-size.patch" # KDE-bug 
437791

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

2021-08-24 Thread Andreas Sturmlechner

commit: 6e8bd8fe46daf2e09b95c3abdeab0e2ad4ce6845
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 24 12:20:34 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 24 13:37:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8bd8fe

kde-apps/konsole: Don't close the whole window if there are splits

Closes: https://bugs.gentoo.org/808510
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...ole-21.04.3-dont-close-window-while-split.patch | 76 ++
 ...21.04.3-r1.ebuild => konsole-21.04.3-r2.ebuild} |  5 +-
 ...21.08.0-r3.ebuild => konsole-21.08.0-r4.ebuild} |  1 +
 3 files changed, 81 insertions(+), 1 deletion(-)

diff --git 
a/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch 
b/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch
new file mode 100644
index 000..20762b10957
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch
@@ -0,0 +1,76 @@
+From 2591a9489a4d3a43c7a7f00764e9f84822d4946c Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Sun, 15 Aug 2021 15:51:33 +0200
+Subject: [PATCH] When closing a session, don't close the whole window if there
+ are splits
+
+When closing a session, we check if that is the last tab, and make the code
+close the whole window, but we also need to make sure it's the last view,
+i.e. no split views.
+
+CCBUG: 440976
+FIXED-IN: 21.08.1
+(cherry picked from commit 4a3cab03f5d853f4dd48531979fc3fb57dde5e2e)
+---
+ src/ViewManager.cpp   | 6 +++---
+ src/widgets/ViewContainer.cpp | 9 +
+ src/widgets/ViewContainer.h   | 6 ++
+ 3 files changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
+index 9c006e2bd..426040b78 100644
+--- a/src/ViewManager.cpp
 b/src/ViewManager.cpp
+@@ -494,9 +494,9 @@ void ViewManager::sessionFinished()
+ return;
+ }
+ 
+-// The last session/tab? emit empty() so that close() is called in
+-// MainWindow, fixes #432077
+-if (_viewContainer->count() == 1) {
++// The last session/tab, and only one view (no splits), emit empty()
++// so that close() is called in MainWindow, fixes #432077
++if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() 
== 1) {
+ Q_EMIT empty();
+ return;
+ }
+diff --git a/src/widgets/ViewContainer.cpp b/src/widgets/ViewContainer.cpp
+index 2d7bfd13b..b25c00cdd 100644
+--- a/src/widgets/ViewContainer.cpp
 b/src/widgets/ViewContainer.cpp
+@@ -145,6 +145,15 @@ ViewSplitter *TabbedViewContainer::viewSplitterAt(int 
index)
+ return qobject_cast(widget(index));
+ }
+ 
++int TabbedViewContainer::currentTabViewCount()
++{
++if (auto *splitter = activeViewSplitter()) {
++return splitter->findChildren().count();
++}
++
++return 1;
++}
++
+ void TabbedViewContainer::moveTabToWindow(int index, QWidget *window)
+ {
+ auto splitter = viewSplitterAt(index);
+diff --git a/src/widgets/ViewContainer.h b/src/widgets/ViewContainer.h
+index 3cbacf2cf..8e0a0986a 100644
+--- a/src/widgets/ViewContainer.h
 b/src/widgets/ViewContainer.h
+@@ -135,6 +135,12 @@ public:
+  */
+ ViewSplitter *viewSplitterAt(int index);
+ 
++/**
++ * Returns the number of split views (i.e. TerminalDisplay widgets)
++ * in this tab; if there are no split views, 1 is returned.
++ */
++int currentTabViewCount();
++
+ void connectTerminalDisplay(TerminalDisplay *display);
+ void disconnectTerminalDisplay(TerminalDisplay *display);
+ void moveTabLeft();
+-- 
+GitLab
+

diff --git a/kde-apps/konsole/konsole-21.04.3-r1.ebuild 
b/kde-apps/konsole/konsole-21.04.3-r2.ebuild
similarity index 92%
rename from kde-apps/konsole/konsole-21.04.3-r1.ebuild
rename to kde-apps/konsole/konsole-21.04.3-r2.ebuild
index 42e9362243d..c95192f968c 100644
--- a/kde-apps/konsole/konsole-21.04.3-r1.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r2.ebuild
@@ -51,7 +51,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-no-flash-on-session-close.patch" ) # bug 807933
+PATCHES=(
+   "${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933
+   "${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510
+)
 
 src_prepare() {
ecm_src_prepare

diff --git a/kde-apps/konsole/konsole-21.08.0-r3.ebuild 
b/kde-apps/konsole/konsole-21.08.0-r4.ebuild
similarity index 96%
rename from kde-apps/konsole/konsole-21.08.0-r3.ebuild
rename to kde-apps/konsole/konsole-21.08.0-r4.ebuild
index fe8cab4b97f..d4600f096a8 100644
--- a/kde-apps/konsole/konsole-21.08.0-r3.ebuild
+++ b/kde-apps/konsole/konsole-21.08.0-r4.ebuild
@@ -52,6 +52,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
+   "${FILESDIR}/${PN}-21.04.3-dont-close-window-while-split.patch" # bug 
808510

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

2021-08-23 Thread Agostino Sarubbo

commit: 77304638ad366f66e713c49591dedc46f6020b06
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 23 22:13:36 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 23 22:13:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77304638

kde-apps/konsole: x86 stable wrt bug #807933

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-apps/konsole/konsole-21.04.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-21.04.3-r1.ebuild 
b/kde-apps/konsole/konsole-21.04.3-r1.ebuild
index 90d146d30c9..42e9362243d 100644
--- a/kde-apps/konsole/konsole-21.04.3-r1.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="

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

2021-08-23 Thread Agostino Sarubbo

commit: a72a3aff2dce218ee932fa051d9bedc49d305ee5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 23 10:44:24 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 23 10:44:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a72a3aff

kde-apps/konsole: amd64 stable wrt bug #807933

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-apps/konsole/konsole-21.04.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-21.04.3-r1.ebuild 
b/kde-apps/konsole/konsole-21.04.3-r1.ebuild
index eb5601c28fc..90d146d30c9 100644
--- a/kde-apps/konsole/konsole-21.04.3-r1.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND="

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

2021-08-18 Thread Andreas Sturmlechner

commit: f0b8fd584285365af19662391cbb62af44c039bf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 18 07:18:16 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 18 07:19:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b8fd58

kde-apps/konsole: Fix MainWindow size when there is no saved size

Upstream commit c78edfbac49852cec40efd5cbe73c341bc06c5ab

See also: https://mail.kde.org/pipermail/distributions/2021-August/001044.html

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=437791
Bug: https://bugs.gentoo.org/808627
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...1.08.0-fix-MainWindow-size-w-o-saved-size.patch | 79 ++
 ...21.08.0-r2.ebuild => konsole-21.08.0-r3.ebuild} |  4 +-
 2 files changed, 81 insertions(+), 2 deletions(-)

diff --git 
a/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch
 
b/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch
new file mode 100644
index 000..48fe1be666a
--- /dev/null
+++ 
b/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch
@@ -0,0 +1,79 @@
+From c78edfbac49852cec40efd5cbe73c341bc06c5ab Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Thu, 29 Jul 2021 18:45:45 +0200
+Subject: [PATCH] Fix MainWindow size when there is no saved size
+
+The very first time a user runs Konsole, where is no konsolerc file in $HOME,
+there is no saved size to restore, instead use the sizeHint(), which ideally
+will be the size set in the default profile (based on lines/columns setting).
+
+CCBUG: 437791
+---
+ src/MainWindow.cpp | 21 +++--
+ src/MainWindow.h   |  1 +
+ 2 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index a4b36b61d..9b025c8fe 100644
+--- a/src/MainWindow.cpp
 b/src/MainWindow.cpp
+@@ -70,13 +70,22 @@ MainWindow::MainWindow() :
+ _menuBarInitialVisibility(true),
+ _menuBarInitialVisibilityApplied(false)
+ {
+-if (!KonsoleSettings::saveGeometryOnExit()) {
++KSharedConfigPtr konsoleConfig = 
KSharedConfig::openConfig(QStringLiteral("konsolerc"));
++KConfigGroup cg = konsoleConfig->group(QStringLiteral("MainWindow"));
++const bool isGroup = cg.exists();
++if (isGroup) {
++const QString stateConfig = cg.readEntry(QStringLiteral("State"));
++
++// If "stateConfig" is empty then this is the very first run,
++// i.e. no konsolerc file in $HOME
++_isSavedUiState = !stateConfig.isEmpty();
++}
++
++if (isGroup && !KonsoleSettings::saveGeometryOnExit()) {
+ // If we are not using the global Konsole save geometry on exit,
+ // remove all geometry data from [MainWindow] in Konsolerc, so KWin 
will
+ // manage it directly
+-KSharedConfigPtr konsoleConfig = 
KSharedConfig::openConfig(QStringLiteral("konsolerc"));
+-KConfigGroup group = konsoleConfig->group("MainWindow");
+-QMap configEntries = group.entryMap();
++QMap configEntries = cg.entryMap();
+ QMapIterator i(configEntries);
+ 
+ while (i.hasNext()) {
+@@ -93,7 +102,7 @@ MainWindow::MainWindow() :
+ || i.key().contains(QLatin1String(" YPosition"))
+ #endif
+ ) {
+-group.deleteEntry(i.key());
++cg.deleteEntry(i.key());
+ }
+ }
+ }
+@@ -949,7 +958,7 @@ void MainWindow::showEvent(QShowEvent *event)
+ _menuBarInitialVisibilityApplied = true;
+ }
+ 
+-if (!KonsoleSettings::saveGeometryOnExit()) {
++if (!_isSavedUiState || !KonsoleSettings::saveGeometryOnExit()) {
+ // Delay resizing to here, so that the other parts of the UI
+ // (ViewManager, TabbedViewContainer, TerminalDisplay ... etc)
+ // have been created and TabbedViewContainer::sizeHint() returns
+diff --git a/src/MainWindow.h b/src/MainWindow.h
+index a80674012..876a81d71 100644
+--- a/src/MainWindow.h
 b/src/MainWindow.h
+@@ -200,6 +200,7 @@ private:
+ bool _menuBarInitialVisibility;
+ bool _menuBarInitialVisibilityApplied;
+ bool _blurEnabled = false;
++bool _isSavedUiState = false;
+ };
+ }
+ 
+-- 
+GitLab
+

diff --git a/kde-apps/konsole/konsole-21.08.0-r2.ebuild 
b/kde-apps/konsole/konsole-21.08.0-r3.ebuild
similarity index 94%
rename from kde-apps/konsole/konsole-21.08.0-r2.ebuild
rename to kde-apps/konsole/konsole-21.08.0-r3.ebuild
index 00032973af8..fe8cab4b97f 100644
--- a/kde-apps/konsole/konsole-21.08.0-r2.ebuild
+++ b/kde-apps/konsole/konsole-21.08.0-r3.ebuild
@@ -53,8 +53,8 @@ RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
"${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1
-   # KDE-bugs 430036, 439339; backport pending for 21.08 branch
-

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

2021-08-15 Thread Andreas Sturmlechner

commit: a69ea70b1f7c6b56cde64cc2dc2604ecc19c4355
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 15 19:10:27 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 15 19:11:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69ea70b

kde-apps/konsole: Fix KXmlGUI toolbars and MainWindow size

Upstream commit fb7f838fd3138a39aea3bcb2e91f923741587137

See also:
https://invent.kde.org/utilities/konsole/-/merge_requests/457

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=430036
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=436471
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439339
Reported-by: Lars Wendler  gentoo.org>
Tested-by: Lars Wendler  gentoo.org>
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...-fix-KXmlGUI-toolbars-and-MainWindow-size.patch | 73 ++
 ...21.08.0-r1.ebuild => konsole-21.08.0-r2.ebuild} |  2 +
 2 files changed, 75 insertions(+)

diff --git 
a/kde-apps/konsole/files/konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch
 
b/kde-apps/konsole/files/konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch
new file mode 100644
index 000..fc62466ea62
--- /dev/null
+++ 
b/kde-apps/konsole/files/konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch
@@ -0,0 +1,73 @@
+From fb7f838fd3138a39aea3bcb2e91f923741587137 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Thu, 29 Jul 2021 18:44:07 +0200
+Subject: [PATCH] Fix KXmlGUI toolbars; and Konsole MainWindow size
+
+Call setupGUI(), which will call createGUI (since we set the
+KXmlGuiWindow::Create flag), omit the StatusBar flag since we don't have a
+statusbar and don't want the "Show StatusBar" menu action.
+
+TabbedViewContainer::sizeHint() calculates an optimum size for itself,
+including the sizes of its child widgets; added in efb621d091c05f11 by
+Mariusz Glebocki; following the code:
+MainWindow creates a ViewManager
+ViewManager creates a TabbedViewContainer and then a TerminalDisplay
+
+which means that the first time TabbedViewContainer::sizeHint() is called
+the TerminalDisplay widget size is 0, then TabbedViewContainer::sizeHint()
+would return 0.
+
+Which is why calling resize() in MainWindow was delayed to the showEvent(),
+(and even delayed more by a QTimer::singleShot() call in Application),
+at which point all the child widgets have been created and
+MainWindow::sizeHint() (which logically takes into account the sizeHint()
+of its child widgets) would return a sensible size.
+
+CCBUG: 430036
+CCBUG: 439339
+BUG: 436471
+
+
+(cherry picked from commit 090356661c92bfedeeeaf6f4f77d294facb3d8c6)
+---
+ src/MainWindow.cpp | 17 -
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index c67acf8b9..a4b36b61d 100644
+--- a/src/MainWindow.cpp
 b/src/MainWindow.cpp
+@@ -131,8 +131,10 @@ MainWindow::MainWindow() :
+ // in terminal applications
+ KAcceleratorManager::setNoAccel(menuBar());
+ 
+-// create menus
+-createGUI();
++constexpr KXmlGuiWindow::StandardWindowOptions guiOpts = ToolBar | Keys | 
Save | Create;
++const QString xmlFile = componentName() + QLatin1String("ui.rc"); // 
Typically "konsoleui.rc"
++// The "Create" flag will make it call createGUI()
++setupGUI(guiOpts, xmlFile);
+ 
+ // remember the original menu accelerators for later use
+ rememberMenuAccelerators();
+@@ -945,9 +947,14 @@ void MainWindow::showEvent(QShowEvent *event)
+ menuBar()->setVisible(_menuBarInitialVisibility);
+ _toggleMenuBarAction->setChecked(_menuBarInitialVisibility);
+ _menuBarInitialVisibilityApplied = true;
+-if (!KonsoleSettings::saveGeometryOnExit()) {
+-resize(sizeHint());
+-}
++}
++
++if (!KonsoleSettings::saveGeometryOnExit()) {
++// Delay resizing to here, so that the other parts of the UI
++// (ViewManager, TabbedViewContainer, TerminalDisplay ... etc)
++// have been created and TabbedViewContainer::sizeHint() returns
++// a usuable size.
++resize(sizeHint());
+ }
+ 
+ // Call parent method
+-- 
+GitLab
+

diff --git a/kde-apps/konsole/konsole-21.08.0-r1.ebuild 
b/kde-apps/konsole/konsole-21.08.0-r2.ebuild
similarity index 93%
rename from kde-apps/konsole/konsole-21.08.0-r1.ebuild
rename to kde-apps/konsole/konsole-21.08.0-r2.ebuild
index 4095d9ac5f9..00032973af8 100644
--- a/kde-apps/konsole/konsole-21.08.0-r1.ebuild
+++ b/kde-apps/konsole/konsole-21.08.0-r2.ebuild
@@ -53,6 +53,8 @@ RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
"${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1
+   # KDE-bugs 430036, 439339; backport pending for 21.08 branch
+   "${FILESDIR}/${P}-fix-KXmlGUI-toolbars-and-MainWindow-size.patch"
 )
 
 src_configure() {

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

2021-08-13 Thread Andreas Sturmlechner

commit: c0e6cbb16cc7682173870439709ba880e1460b46
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 13 20:06:18 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 13 20:13:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e6cbb1

kde-apps/konsole: Prevent window "flashing" when closing last session

Upstream commit 302c16791935cc3cf262aee355afce13d694b00f

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=432077
Bug: https://bugs.gentoo.org/807933
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...konsole-21.04.3-no-flash-on-session-close.patch | 81 ++
 kde-apps/konsole/konsole-21.04.3-r1.ebuild | 76 
 kde-apps/konsole/konsole-21.08.0-r1.ebuild | 72 +++
 3 files changed, 229 insertions(+)

diff --git 
a/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch 
b/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch
new file mode 100644
index 000..d8b14f2f166
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch
@@ -0,0 +1,81 @@
+From 302c16791935cc3cf262aee355afce13d694b00f Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Thu, 12 Aug 2021 13:58:20 +0200
+Subject: [PATCH] Prevent window "flashing" when closing the last session
+
+There are two scenarios when closing a window:
+A) clicking the close button on the title bar (or Ctrl+Shift+Q):
+~MainWindow()
+~ViewManager()
+~TabbedViewContainer()
+~TerminalDisplay()
+~Session()
+
+B) closing the last session/tab in a window:
+SessionController::sessionFinished()
+~Session()
+~TerminalDisplay()
+~TabbedViewContainer()
+~MainWindow()
+~ViewManager()
+
+the issue with the second case is that the TerminalDisplay is torn down
+first, which exposes the TabbedViewContainer widget, the latter has the same
+Qt::Window colour as the system colour scheme window background colour, if
+you're using a dark terminal colour scheme and a light-coloured system colour
+scheme, you could see some "flashing" when you close the last session with
+e.g. Ctrl+D.
+
+To fix this, in sessionFinished() check if TabbedViewContainer::count() is
+1 (i.e. closing last tab/session), and emit the empty() signal in that case,
+which is connected to MainwWindow::close(), then the order of tear down
+becomes:
+SessionController::sessionFinished()
+~Session()
+~MainWindow()
+~ViewManager()
+~TabbedViewContainer()
+~TerminalDisplay()
+
+BUG: 432077
+FIXED-IN: 21.12
+(cherry picked from commit bbec72250d080ce286a6762fb9beee4b6e7981c9)
+---
+ src/MainWindow.cpp  | 2 +-
+ src/ViewManager.cpp | 7 +++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index cc38b3990..0fae334de 100644
+--- a/src/MainWindow.cpp
 b/src/MainWindow.cpp
+@@ -102,7 +102,7 @@ MainWindow::MainWindow() :
+ 
+ // create view manager
+ _viewManager = new ViewManager(this, actionCollection());
+-connect(_viewManager, ::ViewManager::empty, this, 
::MainWindow::close);
++connect(_viewManager, ::ViewManager::empty, this, 
::close);
+ connect(_viewManager, ::ViewManager::activeViewChanged, this,
+ ::MainWindow::activeViewChanged);
+ connect(_viewManager, ::ViewManager::unplugController, this,
+diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
+index 751684dc8..4d33a4cf8 100644
+--- a/src/ViewManager.cpp
 b/src/ViewManager.cpp
+@@ -461,6 +461,13 @@ void ViewManager::sessionFinished()
+ return;
+ }
+ 
++// The last session/tab? emit empty() so that close() is called in
++// MainWindow, fixes #432077
++if (_viewContainer->count() == 1) {
++Q_EMIT empty();
++return;
++}
++
+ auto *session = qobject_cast(sender());
+ Q_ASSERT(session);
+ 
+-- 
+GitLab
+

diff --git a/kde-apps/konsole/konsole-21.04.3-r1.ebuild 
b/kde-apps/konsole/konsole-21.04.3-r1.ebuild
new file mode 100644
index 000..eb5601c28fc
--- /dev/null
+++ b/kde-apps/konsole/konsole-21.04.3-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+

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

2021-08-13 Thread Andreas Sturmlechner

commit: 4b84655345b37e68cee4943046e153efdeb6c1e6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 13 20:12:03 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 13 20:13:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b846553

kde-apps/konsole: Drop 21.08.0 (r0)

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-21.08.0.ebuild | 68 -
 1 file changed, 68 deletions(-)

diff --git a/kde-apps/konsole/konsole-21.08.0.ebuild 
b/kde-apps/konsole/konsole-21.08.0.ebuild
deleted file mode 100644
index 20779d7b8d0..000
--- a/kde-apps/konsole/konsole-21.08.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.84.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org;
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/kbookmarks-${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/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${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/kpty-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package X X11)
-   )
-
-   ecm_src_configure
-}
-
-src_test() {
-   # drkonqi process interferes. bug 702690
-   local myctestargs=(
-   -E "(DBusTest)"
-   )
-
-   ecm_src_test
-}

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

2021-08-13 Thread Andreas Sturmlechner

commit: 9a6221644bee352314ff6e2047f415dd289f5d06
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 13 20:11:26 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 13 20:13:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a622164

kde-apps/konsole: Fix crash when setting blur effect

Upstream commit f24dd6acc28393ba6f731be1360731c01a9a1ef0

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439871
Closes: https://bugs.gentoo.org/807905
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konsole-21.08.0-fix-crash-w-blur.patch   | 49 ++
 kde-apps/konsole/konsole-21.08.0-r1.ebuild |  1 +
 2 files changed, 50 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch 
b/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch
new file mode 100644
index 000..b0c7193eda8
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch
@@ -0,0 +1,49 @@
+From f24dd6acc28393ba6f731be1360731c01a9a1ef0 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Fri, 16 Jul 2021 21:37:51 +0200
+Subject: [PATCH] Fix crash when setting blur effect
+
+Basically to use QWidget::windowHandle() to get a QWindow*, we need to first
+set the Qt::WA_NativeWindow attribute on the QWidget. See:
+https://phabricator.kde.org/D23108
+
+BUG: 439871
+FIXED-IN: 21.12
+(cherry picked from commit a6b2bd539162b39191e827566b656bd97266ffad)
+---
+ src/MainWindow.cpp | 12 +++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index ed5d8cc3d..c67acf8b9 100644
+--- a/src/MainWindow.cpp
 b/src/MainWindow.cpp
+@@ -56,6 +56,8 @@
+ #include "terminalDisplay/TerminalDisplay.h"
+ #include "widgets/ViewContainer.h"
+ 
++#include 
++
+ using namespace Konsole;
+ 
+ MainWindow::MainWindow() :
+@@ -889,7 +891,15 @@ void MainWindow::setBlur(bool blur)
+ #if KWINDOWSYSTEM_VERSION < QT_VERSION_CHECK(5,82,0)
+ KWindowEffects::enableBlurBehind(winId(), blur);
+ #else
+-KWindowEffects::enableBlurBehind(windowHandle(), blur);
++// Set the WA_NativeWindow attribute to force the creation of the 
QWindow.
++// Without this QWidget::windowHandle() returns 0.
++// See https://phabricator.kde.org/D23108
++setAttribute(Qt::WA_NativeWindow);
++if (QWindow *window = windowHandle()) {
++KWindowEffects::enableBlurBehind(window, blur);
++} else {
++qCWarning(KonsoleDebug) << "Blur effect couldn't be enabled.";
++}
+ #endif
+ }
+ }
+-- 
+GitLab
+

diff --git a/kde-apps/konsole/konsole-21.08.0-r1.ebuild 
b/kde-apps/konsole/konsole-21.08.0-r1.ebuild
index a9745100e0f..4095d9ac5f9 100644
--- a/kde-apps/konsole/konsole-21.08.0-r1.ebuild
+++ b/kde-apps/konsole/konsole-21.08.0-r1.ebuild
@@ -52,6 +52,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
+   "${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1
 )
 
 src_configure() {

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

2021-05-01 Thread Andreas Sturmlechner

commit: 2fdb5052e0cf4726eb141fd92a0ca83c2785ca35
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May  1 18:39:38 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May  1 21:21:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fdb5052

kde-apps/konsole: Fix build with GCC-11

Closes: https://bugs.gentoo.org/787179
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/files/konsole-21.04.0-gcc11.patch | 25 ++
 kde-apps/konsole/konsole-21.04.0.ebuild|  2 ++
 2 files changed, 27 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch 
b/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch
new file mode 100644
index 000..0a9e2a4cbc2
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch
@@ -0,0 +1,25 @@
+From 242213afd9eb9886e04eb9e6e69a4caa9c606363 Mon Sep 17 00:00:00 2001
+From: Kurt Hindenburg 
+Date: Fri, 30 Apr 2021 17:07:13 -0400
+Subject: [PATCH] Add missing include to fix build on gcc-11
+
+---
+ src/terminalDisplay/TerminalPainter.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/terminalDisplay/TerminalPainter.cpp 
b/src/terminalDisplay/TerminalPainter.cpp
+index fce10d09..7623602e 100644
+--- a/src/terminalDisplay/TerminalPainter.cpp
 b/src/terminalDisplay/TerminalPainter.cpp
+@@ -30,6 +30,8 @@
+ #include 
+ #include 
+ 
++#include 
++
+ // we use this to force QPainter to display text in LTR mode
+ // more information can be found in: https://unicode.org/reports/tr9/
+ const QChar LTR_OVERRIDE_CHAR(0x202D);
+-- 
+GitLab
+

diff --git a/kde-apps/konsole/konsole-21.04.0.ebuild 
b/kde-apps/konsole/konsole-21.04.0.ebuild
index 701329615e7..387e191ea7f 100644
--- a/kde-apps/konsole/konsole-21.04.0.ebuild
+++ b/kde-apps/konsole/konsole-21.04.0.ebuild
@@ -51,6 +51,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc11.patch ) # bug 787179
+
 src_prepare() {
ecm_src_prepare
ecm_punt_bogus_dep KF5 Completion

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

2021-01-29 Thread Andreas Sturmlechner

commit: b79efdba4a801fa533c4ca85e3124d96c71d878c
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Jan 29 15:42:00 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan 29 20:41:38 2021 +
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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19252
Signed-off-by: Andreas Sturmlechner  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..000
--- 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" 
-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/, kde-apps/konsole/

2020-12-17 Thread Jason A. Donenfeld

commit: 23227fd8a2cfd663d0e5d9aa4f107e64a47941ad
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Thu Dec 17 17:15:54 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Thu Dec 17 22:00:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23227fd8

kde-apps/konsole: revbump to fix bold breakage

Upstream has a regression in the handling of bold/bright colors in
Konsole, detailed here:
https://bugs.kde.org/show_bug.cgi?id=430311
https://invent.kde.org/utilities/konsole/-/merge_requests/299

Before 20.12 colors looked like this:

https://invent.kde.org/utilities/konsole/uploads/3d18886419733f6e0c6bec0041aef5f8/image.png

With 20.12 colors look like this:

https://invent.kde.org/utilities/konsole/uploads/e5eaa8503d9888befdc3213ca5bc6aab/image.png

This follows the bug's suggestion of reverting a particular commit until
upstream has a proper fix.

Acked-by: Andreas K. Hüttel  gentoo.org>
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Jason A. Donenfeld  gentoo.org>

 .../konsole-20.12.0-revert-bold-breakage.patch | 33 ++
 kde-apps/konsole/konsole-20.12.0-r1.ebuild | 72 ++
 2 files changed, 105 insertions(+)

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
new file mode 100644
index 000..8e79793601e
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch
@@ -0,0 +1,33 @@
+From 08a51bbdd70c0c850f44a660a7efbe4c394b8ee3 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" 
+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
+

diff --git a/kde-apps/konsole/konsole-20.12.0-r1.ebuild 
b/kde-apps/konsole/konsole-20.12.0-r1.ebuild
new file mode 100644
index 000..ddcce96264f
--- /dev/null
+++ b/kde-apps/konsole/konsole-20.12.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.75.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://apps.kde.org/en/konsole https://konsole.kde.org;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${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/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kinit-${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/kpty-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}"-revert-bold-breakage.patch )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package X X11)
+   )
+
+   ecm_src_configure
+}
+
+src_test() {
+   # drkonqi process interferes. bug 702690
+   local myctestargs=(
+   -E "(DBusTest)"
+   )
+
+   ecm_src_test
+}

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

2020-05-30 Thread Andreas Sturmlechner

commit: e67279188e5b63ead4d59307399260ddb884661c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 30 10:53:41 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 30 11:06:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6727918

kde-apps/konsole: Disable hanging DBusTest

Bug: https://bugs.gentoo.org/702690
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-19.12.3-r1.ebuild | 9 +
 kde-apps/konsole/konsole-20.04.1-r2.ebuild | 9 +
 2 files changed, 18 insertions(+)

diff --git a/kde-apps/konsole/konsole-19.12.3-r1.ebuild 
b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
index 26ddf0f3892..6799320faf8 100644
--- a/kde-apps/konsole/konsole-19.12.3-r1.ebuild
+++ b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
@@ -67,3 +67,12 @@ src_configure() {
 
ecm_src_configure
 }
+
+src_test() {
+   # drkonqi process interferes. bug 702690
+   local myctestargs=(
+   -E "(DBusTest)"
+   )
+
+   ecm_src_test
+}

diff --git a/kde-apps/konsole/konsole-20.04.1-r2.ebuild 
b/kde-apps/konsole/konsole-20.04.1-r2.ebuild
index 95fd7ffcee3..c532b9d1b71 100644
--- a/kde-apps/konsole/konsole-20.04.1-r2.ebuild
+++ b/kde-apps/konsole/konsole-20.04.1-r2.ebuild
@@ -66,3 +66,12 @@ src_configure() {
 
ecm_src_configure
 }
+
+src_test() {
+   # drkonqi process interferes. bug 702690
+   local myctestargs=(
+   -E "(DBusTest)"
+   )
+
+   ecm_src_test
+}

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

2020-05-28 Thread Andreas Sturmlechner

commit: e51f152cde1e609553ca5712df2f7ad9a4e40ca8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 28 23:20:43 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 28 23:21:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e51f152c

kde-apps/konsole: Fix segfault on session close

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=415762
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konsole-20.04.1-segfault-on-close.patch  | 44 ++
 kde-apps/konsole/konsole-20.04.1-r2.ebuild | 68 ++
 2 files changed, 112 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch 
b/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch
new file mode 100644
index 000..55213878ad2
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch
@@ -0,0 +1,44 @@
+From 5e5129d51fa85036832f1af44ec5b875d426392f Mon Sep 17 00:00:00 2001
+From: Maximilian Schiller 
+Date: Thu, 28 May 2020 22:57:29 +0200
+Subject: [PATCH] Fix konsolepart Segfault when closed
+
+Assign the _view as the parent to the KXMLGuiFactory because the factory
+is referencing the view widget as its associated widget. Since the
+TerminalDisplay gets destructed first this is now a dangling pointer.
+If the view is set as the parent the factory gets cleaned up correctly.
+
+Also cleanup the created clientBuilder after destruction because it
+cant have a parent and would probably leak memory.
+
+BUG: 415762
+BUG: 421226
+BUG: 421194
+BUG: 421138
+---
+ src/SessionController.cpp | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/SessionController.cpp b/src/SessionController.cpp
+index e72f342c4..99e185f5e 100644
+--- a/src/SessionController.cpp
 b/src/SessionController.cpp
+@@ -1732,11 +1732,13 @@ void SessionController::showDisplayContextMenu(const 
QPoint& position)
+ if (factory() == nullptr) {
+ if (clientBuilder() == nullptr) {
+ setClientBuilder(new KXMLGUIBuilder(_view));
++
++// Client builder does not get delted automatically
++connect(this, ::destroyed, this, [this]{ delete 
clientBuilder(); });
+ }
+ 
+-auto factory = new KXMLGUIFactory(clientBuilder(), this);
++auto factory = new KXMLGUIFactory(clientBuilder(), _view);
+ factory->addClient(this);
+-qDebug() << "Created xmlgui factory" << factory;
+ }
+ 
+ QPointer popup = 
qobject_cast(factory()->container(QStringLiteral("session-popup-menu"), 
this));
+-- 
+2.26.2
+

diff --git a/kde-apps/konsole/konsole-20.04.1-r2.ebuild 
b/kde-apps/konsole/konsole-20.04.1-r2.ebuild
new file mode 100644
index 000..95fd7ffcee3
--- /dev/null
+++ b/kde-apps/konsole/konsole-20.04.1-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.70.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
+https://konsole.kde.org;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${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/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kinit-${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/kpty-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-crash-on-close.patch" # bug 723214, in 20.04.2
+   "${FILESDIR}/${P}-qt-5.15-set-text-encoding-crash.patch" # KDE-Bug 
419526; pending
+   "${FILESDIR}/${P}-segfault-on-close.patch" # KDE-Bug 415762; pending
+)
+

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

2020-05-28 Thread Andreas Sturmlechner

commit: 899e42a759c4114b93f8fc1070f703d8fd79b6d9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 28 23:21:29 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 28 23:21:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=899e42a7

kde-apps/konsole: Drop 20.04.1-r1

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-20.04.1-r1.ebuild | 67 --
 1 file changed, 67 deletions(-)

diff --git a/kde-apps/konsole/konsole-20.04.1-r1.ebuild 
b/kde-apps/konsole/konsole-20.04.1-r1.ebuild
deleted file mode 100644
index a60f18304f2..000
--- a/kde-apps/konsole/konsole-20.04.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
-https://konsole.kde.org;
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/kbookmarks-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${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/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kinit-${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/kpty-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${P}-crash-on-close.patch" # bug 723214, in 20.04.2
-   "${FILESDIR}/${P}-qt-5.15-set-text-encoding-crash.patch" # KDE-Bug 
419526; pending
-)
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package X X11)
-   )
-
-   ecm_src_configure
-}

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

2020-05-28 Thread Andreas Sturmlechner

commit: ce8934eff28bbe9ccbfd987735944c8f18f893ce
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 28 20:19:01 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 28 20:20:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8934ef

kde-apps/konsole: Fix crash on 'Set Encoding' context menu w/ Qt 5.15

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=419526
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...e-20.04.1-qt-5.15-set-text-encoding-crash.patch | 109 +
 kde-apps/konsole/konsole-20.04.1-r1.ebuild |   5 +-
 2 files changed, 113 insertions(+), 1 deletion(-)

diff --git 
a/kde-apps/konsole/files/konsole-20.04.1-qt-5.15-set-text-encoding-crash.patch 
b/kde-apps/konsole/files/konsole-20.04.1-qt-5.15-set-text-encoding-crash.patch
new file mode 100644
index 000..78e5559d047
--- /dev/null
+++ 
b/kde-apps/konsole/files/konsole-20.04.1-qt-5.15-set-text-encoding-crash.patch
@@ -0,0 +1,109 @@
+From 72e76de072aa4c7960396856e72681a00c4f67d9 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Thu, 28 May 2020 21:40:29 +0200
+Subject: [PATCH] [SessionController] Fix crash caused by text encoding menu
+
+QMenu since 5.15 is hidden when an action is triggered, this caused a
+crash in Konsole when trying to access the text encoding menu.
+
+Now Session emits a signal when the text encoding is changed, the
+SessionController can connect to that singal to set the current codec in
+the KCodecAction object.
+
+Also fix the EditProfileDialog so that when the KCodecAction menu is
+shown the currently set codec is selected.
+
+BUG: 419526
+
+FIXED-IN: 20.08
+---
+ src/EditProfileDialog.cpp | 1 +
+ src/Session.cpp   | 2 ++
+ src/Session.h | 5 +
+ src/SessionController.cpp | 7 ---
+ src/SessionController.h   | 2 +-
+ 5 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
+index a64136934..f93e9e166 100644
+--- a/src/EditProfileDialog.cpp
 b/src/EditProfileDialog.cpp
+@@ -1725,6 +1725,7 @@ void EditProfileDialog::setupAdvancedPage(const 
Profile::Ptr )
+ 
+ // encoding options
+ auto codecAction = new KCodecAction(this);
++codecAction->setCurrentCodec(profile->defaultEncoding());
+ _advancedUi->selectEncodingButton->setMenu(codecAction->menu());
+ connect(codecAction,
+ QOverload::of(::triggered), this,
+diff --git a/src/Session.cpp b/src/Session.cpp
+index 1103f6e1b..483d8fd6a 100644
+--- a/src/Session.cpp
 b/src/Session.cpp
+@@ -252,6 +252,8 @@ void Session::setCodec(QTextCodec* codec)
+ }
+ 
+ emulation()->setCodec(codec);
++
++emit sessionCodecChanged(codec);
+ }
+ 
+ bool Session::setCodec(const QByteArray& name)
+diff --git a/src/Session.h b/src/Session.h
+index 1b7da1b3b..c1af3c05d 100644
+--- a/src/Session.h
 b/src/Session.h
+@@ -661,6 +661,11 @@ Q_SIGNALS:
+  */
+ void currentDirectoryChanged(const QString );
+ 
++/**
++ * Emitted when the session text encoding changes.
++ */
++void sessionCodecChanged(QTextCodec *codec);
++
+ /** Emitted when a bell event occurs in the session. */
+ void bellRequest(const QString );
+ 
+diff --git a/src/SessionController.cpp b/src/SessionController.cpp
+index e72f342c4..f74969f85 100644
+--- a/src/SessionController.cpp
 b/src/SessionController.cpp
+@@ -691,7 +691,8 @@ void SessionController::setupCommonActions()
+ _codecAction = new KCodecAction(i18n("Set "), this);
+ _codecAction->setIcon(QIcon::fromTheme(QStringLiteral("character-set")));
+ collection->addAction(QStringLiteral("set-encoding"), _codecAction);
+-connect(_codecAction->menu(), ::aboutToShow, this, 
::SessionController::updateCodecAction);
++_codecAction->setCurrentCodec(QString::fromUtf8(_session->codec()));
++connect(_session.data(), ::Session::sessionCodecChanged, this, 
::SessionController::updateCodecAction);
+ connect(_codecAction,
+ QOverload::of(::triggered), this,
+ ::SessionController::changeCodec);
+@@ -846,9 +847,9 @@ void SessionController::prepareSwitchProfileMenu()
+ _switchProfileMenu->menu()->clear();
+ _switchProfileMenu->menu()->addActions(_profileList->actions());
+ }
+-void SessionController::updateCodecAction()
++void SessionController::updateCodecAction(QTextCodec *codec)
+ {
+-_codecAction->setCurrentCodec(QString::fromUtf8(_session->codec()));
++_codecAction->setCurrentCodec(codec);
+ }
+ 
+ void SessionController::changeCodec(QTextCodec* codec)
+diff --git a/src/SessionController.h b/src/SessionController.h
+index 057a31446..5062833b7 100644
+--- a/src/SessionController.h
 b/src/SessionController.h
+@@ -260,7 +260,7 @@ private Q_SLOTS:
+ // other
+ void setupSearchBar();
+ void prepareSwitchProfileMenu();
+-void updateCodecAction();
++void

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

2020-05-28 Thread Andreas Sturmlechner

commit: 5023c1e9e6c8c43e4c964d246c02dbf092a0c734
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 28 19:39:47 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 28 19:40:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5023c1e9

kde-apps/konsole: Drop 20.04.1 (r0)

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-20.04.1.ebuild | 62 -
 1 file changed, 62 deletions(-)

diff --git a/kde-apps/konsole/konsole-20.04.1.ebuild 
b/kde-apps/konsole/konsole-20.04.1.ebuild
deleted file mode 100644
index e33980b3d81..000
--- a/kde-apps/konsole/konsole-20.04.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
-https://konsole.kde.org;
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/kbookmarks-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${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/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kinit-${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/kpty-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package X X11)
-   )
-
-   ecm_src_configure
-}

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

2020-05-28 Thread Andreas Sturmlechner

commit: 53c4419851fc373c392ccd9081f2190f77780d4a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 28 19:38:59 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 28 19:40:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c44198

kde-apps/konsole: Fix crash on session close

Upstream commit fdfae25665731882687da8721e58c3c56a3babf8

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=415762
Closes: https://bugs.gentoo.org/723214
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konsole-20.04.1-crash-on-close.patch | 57 +++
 kde-apps/konsole/konsole-20.04.1-r1.ebuild | 64 ++
 2 files changed, 121 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch 
b/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch
new file mode 100644
index 000..51e1d0c5dcd
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch
@@ -0,0 +1,57 @@
+From fdfae25665731882687da8721e58c3c56a3babf8 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella 
+Date: Thu, 28 May 2020 09:28:06 -0400
+Subject: Fix crash when closing session in KonsolePart via menu
+
+This close method is also used when closing a Konsole session
+via the X on the tabbar and tabheader.
+
+FIXED-IN: 20.08.0
+BUG: 420817
+BUG: 420695
+BUG: 415762
+
+See merge request !87
+---
+ src/SessionController.cpp | 23 +++
+ 1 file changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/src/SessionController.cpp b/src/SessionController.cpp
+index 006ba8b..e72f342 100644
+--- a/src/SessionController.cpp
 b/src/SessionController.cpp
+@@ -999,16 +999,23 @@ void SessionController::closeSession()
+ return;
+ }
+ 
+-if (confirmClose()) {
+-if (_session->closeInNormalWay()) {
++if (!confirmClose()) {
++return;
++}
++
++if (!_session->closeInNormalWay()) {
++if (!confirmForceClose()) {
+ return;
+-} else if (confirmForceClose()) {
+-if (_session->closeInForceWay()) {
+-return;
+-} else {
+-qCDebug(KonsoleDebug) << "Konsole failed to close a session 
in any way.";
+-}
+ }
++
++if (!_session->closeInForceWay()) {
++qCDebug(KonsoleDebug) << "Konsole failed to close a session in 
any way.";
++return;
++}
++}
++
++if (factory()) {
++factory()->removeClient(this);
+ }
+ }
+ 
+-- 
+cgit v1.1
+

diff --git a/kde-apps/konsole/konsole-20.04.1-r1.ebuild 
b/kde-apps/konsole/konsole-20.04.1-r1.ebuild
new file mode 100644
index 000..f6870330550
--- /dev/null
+++ b/kde-apps/konsole/konsole-20.04.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.70.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
+https://konsole.kde.org;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${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/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kinit-${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/kpty-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-crash-on-close.patch" ) # bug 723214
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package X X11)
+   )
+
+   ecm_src_configure
+}

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

2020-05-10 Thread Andreas Sturmlechner

commit: d6078abbbd9889ba13ebdb4ca9450e3d62476979
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 10 18:41:18 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 10 18:41:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6078abb

kde-apps/konsole: Drop 19.12.3 (r0)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-19.12.3.ebuild | 67 -
 1 file changed, 67 deletions(-)

diff --git a/kde-apps/konsole/konsole-19.12.3.ebuild 
b/kde-apps/konsole/konsole-19.12.3.ebuild
deleted file mode 100644
index a0cd125f570..000
--- a/kde-apps/konsole/konsole-19.12.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
-https://konsole.kde.org;
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="X"
-
-DEPEND="
-   >=kde-frameworks/kbookmarks-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${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/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kinit-${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/kpty-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch"
-   "${FILESDIR}/${P}-no-ccache.patch"
-)
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package X X11)
-   )
-
-   ecm_src_configure
-}

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

2020-05-10 Thread Mart Raudsepp

commit: 5339d8c614f9b1148050501aed0688c24d300f62
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Sat May  9 22:17:13 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun May 10 17:38:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5339d8c6

kde-apps/konsole: arm64 stable (bug #720178)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 kde-apps/konsole/konsole-19.12.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-19.12.3-r1.ebuild 
b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
index 7607fe2c346..26ddf0f3892 100644
--- a/kde-apps/konsole/konsole-19.12.3-r1.ebuild
+++ b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
@@ -16,7 +16,7 @@ https://konsole.kde.org;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="X"
 
 # drop kbookmarks subslot operator when KFMIN >= 5.69.0

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

2020-05-10 Thread Mikle Kolyada

commit: 8e66226f8e66d089d08a0dd05a534c3de7b5bf62
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May 10 09:19:13 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May 10 09:19:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e66226f

kde-apps/konsole: x86 stable wrt bug #720178

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Mikle Kolyada  gentoo.org>

 kde-apps/konsole/konsole-19.12.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-19.12.3-r1.ebuild 
b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
index 3998c6a911b..7607fe2c346 100644
--- a/kde-apps/konsole/konsole-19.12.3-r1.ebuild
+++ b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
@@ -16,7 +16,7 @@ https://konsole.kde.org;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="X"
 
 # drop kbookmarks subslot operator when KFMIN >= 5.69.0

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

2020-05-10 Thread Mikle Kolyada

commit: 01b4772a637d71c648d4042f7d23ebb8a618214f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May 10 09:14:42 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May 10 09:15:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b4772a

kde-apps/konsole: amd64 stable wrt bug #720178

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada  gentoo.org>

 kde-apps/konsole/konsole-19.12.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-19.12.3-r1.ebuild 
b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
index d3f4cb95ef1..3998c6a911b 100644
--- a/kde-apps/konsole/konsole-19.12.3-r1.ebuild
+++ b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
@@ -16,7 +16,7 @@ https://konsole.kde.org;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 # drop kbookmarks subslot operator when KFMIN >= 5.69.0

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

2020-04-15 Thread Andreas Sturmlechner

commit: d05e2833e464fdae89660ebf0cb283f67687582d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr 15 19:32:09 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr 15 22:27:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d05e2833

kde-apps/konsole: Adapt the code to >=kde-frameworks/kbookmarks-5.69

Tested-by: Michael Mair-Keimberger  gmail.com>
Tested-by: Nils Freydank  posteo.de>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konsole-19.12.3-kf5bookmarks-5.69.patch  | 117 +
 kde-apps/konsole/konsole-19.12.3-r1.ebuild |  69 
 2 files changed, 186 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch 
b/kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch
new file mode 100644
index 000..d70a50ea055
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch
@@ -0,0 +1,117 @@
+From e56c31a961b182663decd44bc57729576446315b Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Mon, 13 Apr 2020 11:30:47 +0200
+Subject: [PATCH] [BookmarkMenu] Adapt the code to KBookmarks 5.69 changes
+
+Starting from KBookmarks 5.69 the ctor that took a KActionCollection
+parameter has been deprecated, and we need to manually add the various
+bookmark actions to the actionCollection so that they show up in the
+shortcusts editor.
+
+Move the code that overrides the add bookmark shortcut, Ctrl+B, to the
+BookmarkMenu class, so that all the relevant code is in one place.
+
+BUG: 419981
+(cherry picked from commit 6db7f8d2593ccb0238b2b547ed6eaf7da6a26c4c)
+(cherry picked from commit dcf8cf3f2255293da170648f633873aa7c4afcf1)
+---
+ src/BookmarkMenu.cpp | 34 +-
+ src/BookmarkMenu.h   |  2 +-
+ src/MainWindow.cpp   | 10 --
+ 3 files changed, 30 insertions(+), 16 deletions(-)
+
+diff --git a/src/BookmarkMenu.cpp b/src/BookmarkMenu.cpp
+index 77344ad1..5b83ece9 100644
+--- a/src/BookmarkMenu.cpp
 b/src/BookmarkMenu.cpp
+@@ -21,24 +21,48 @@
+ 
+ // Own
+ #include "BookmarkMenu.h"
++#include "Shortcut_p.h"
+ 
+ // KDE
+ #include 
++#include 
++#include 
++#include 
+ 
+ // Qt
+ #include 
+-#include 
+-#include 
++#include 
+ 
+ #include // std::any_of
+ 
+-BookmarkMenu::BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, 
QMenu *parentMenu, KActionCollection *collec) :
+-KBookmarkMenu (mgr, owner, parentMenu, collec)
++BookmarkMenu::BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, 
QMenu *parentMenu, KActionCollection *collection) :
++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
++KBookmarkMenu (mgr, owner, parentMenu, collection)
++#else
++KBookmarkMenu (mgr, owner, parentMenu)
++#endif
+ {
++QAction *bookmarkAction;
++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
++bookmarkAction = collection->action(QStringLiteral("add_bookmark"));
++#else
++collection->addActions(parentMenu->actions());
++
++bookmarkAction = addBookmarkAction();
++#endif
++
++Q_ASSERT(bookmarkAction);
++
+ // We need to hijack the action - note this only hijacks top-level action
+-QAction *bookmarkAction = collec->action(QStringLiteral("add_bookmark"));
+ disconnect(bookmarkAction, nullptr, this, nullptr);
+ connect(bookmarkAction, ::triggered, this, 
::maybeAddBookmark);
++
++// replace Ctrl+B shortcut for bookmarks only if user hasn't already
++// changed the shortcut; however, if the user changed it to Ctrl+B
++// this will still get changed to Ctrl+Shift+B
++if (bookmarkAction->shortcut() == QKeySequence(Konsole::ACCEL + 
Qt::Key_B)) {
++collection->setDefaultShortcut(bookmarkAction, Konsole::ACCEL + 
Qt::SHIFT + Qt::Key_B);
++}
+ }
+ 
+ void BookmarkMenu::maybeAddBookmark()
+diff --git a/src/BookmarkMenu.h b/src/BookmarkMenu.h
+index a42eab23..fde893c0 100644
+--- a/src/BookmarkMenu.h
 b/src/BookmarkMenu.h
+@@ -39,7 +39,7 @@ class KONSOLEPRIVATE_EXPORT BookmarkMenu : public 
KBookmarkMenu
+ Q_OBJECT
+ 
+ public:
+-BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu 
*parentMenu, KActionCollection *collec);
++BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu 
*parentMenu, KActionCollection *collection);
+ 
+ private Q_SLOTS:
+ void maybeAddBookmark();
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index 461b9e54..90bbf5ed 100644
+--- a/src/MainWindow.cpp
 b/src/MainWindow.cpp
+@@ -190,16 +190,6 @@ void MainWindow::correctStandardShortcuts()
+ if (helpAction != nullptr) {
+ actionCollection()->setDefaultShortcut(helpAction, QKeySequence());
+ }
+-
+-// replace Ctrl+B shortcut for bookmarks only if user hasn't already
+-// changed the shortcut; however, if the user changed it to Ctrl+B
+-// this will still get changed to Ctrl+Shift+B
+-QAction *bookmarkAction =

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

2020-03-23 Thread Andreas Sturmlechner

commit: 6d0bc899f71f6c139a9020dd3ab75a0b41e54621
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar 23 23:56:09 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar 23 23:56:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0bc899

kde-apps/konsole: Revert upstream ccache auto-detection

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konsole/files/konsole-19.12.3-no-ccache.patch  | 45 ++
 kde-apps/konsole/konsole-19.12.3.ebuild|  5 ++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch 
b/kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch
new file mode 100644
index 000..9419ea5c612
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch
@@ -0,0 +1,45 @@
+From 3529286a0a4885ad3626a4081407fb56a8a568f9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 24 Mar 2020 00:24:05 +0100
+Subject: [PATCH] Revert "CMakeLists.txt: use ccache if present"
+
+This was added for feature-parity with Meson-based projects; but an individual
+package is the wrong place for that. To avoid the proliferation of auto-
+detected ccache support in kde.org packages please submit such a proposal to
+kde-frameworks-devel instead, where it could be added for the benefit of all
+the projects using ECM. And more importantly, with a standard switch to disable
+it for packaging environments.
+
+This reverts commit 007c2a08523887cf9c0445a288ad82994bd02a57.
+
+Differential Revision: https://phabricator.kde.org/D24805
+---
+ CMakeLists.txt | 12 
+ 1 file changed, 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17c82b0d..45ab9f62 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -17,18 +17,6 @@ set (KF5_MIN_VERSION "5.6.0")
+ # Release script will create bugzilla versions
+ project(konsole VERSION ${RELEASE_SERVICE_VERSION})
+ 
+-find_program(CCACHE_FOUND "ccache")
+-set(CCACHE_SUPPORT ON CACHE BOOL "Enable ccache support")
+-if (CCACHE_FOUND AND CCACHE_SUPPORT)
+-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" # GNU is GNU GCC
+-  OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-# without this compiler messages in `make` backend would be uncolored
+-set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto")
+-  endif()
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "ccache")
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "ccache")
+-endif()
+-
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
+ 
+-- 
+2.25.1
+

diff --git a/kde-apps/konsole/konsole-19.12.3.ebuild 
b/kde-apps/konsole/konsole-19.12.3.ebuild
index 5b2e6ae45ff..a0cd125f570 100644
--- a/kde-apps/konsole/konsole-19.12.3.ebuild
+++ b/kde-apps/konsole/konsole-19.12.3.ebuild
@@ -53,7 +53,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch"
+   "${FILESDIR}/${P}-no-ccache.patch"
+)
 
 src_configure() {
local mycmakeargs=(

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

2020-02-26 Thread Andreas Sturmlechner

commit: f6d8eb246a1e6460c779be1501199832dbdc3e0c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb 26 16:08:24 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb 26 16:56:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d8eb24

kde-apps/konsole: Drop 19.12.2 (r0)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-19.12.2.ebuild | 62 -
 1 file changed, 62 deletions(-)

diff --git a/kde-apps/konsole/konsole-19.12.2.ebuild 
b/kde-apps/konsole/konsole-19.12.2.ebuild
deleted file mode 100644
index babfc6b76f0..000
--- a/kde-apps/konsole/konsole-19.12.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
-https://konsole.kde.org;
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-   >=kde-frameworks/kbookmarks-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${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/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kinit-${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/kpty-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package X X11)
-   )
-
-   ecm_src_configure
-}

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

2020-02-12 Thread Andreas Sturmlechner

commit: 1026fe273b5eeb3ac241fca8056011f9d8a94e7c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb 12 21:50:00 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb 12 21:51:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1026fe27

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  gentoo.org>
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konsole-19.12.2-darkbackground-detect.patch| 27 +
 kde-apps/konsole/konsole-19.12.2-r1.ebuild | 64 ++
 2 files changed, 91 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 000..990bad142c3
--- /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?= 
+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, , , );
+-return l < 0.5;
++return l < 50;
+ }
+ 
+ void ColorScheme::setOpacity(qreal opacity)
+-- 
+cgit v1.1

diff --git a/kde-apps/konsole/konsole-19.12.2-r1.ebuild 
b/kde-apps/konsole/konsole-19.12.2-r1.ebuild
new file mode 100644
index 000..3e45534a5d5
--- /dev/null
+++ b/kde-apps/konsole/konsole-19.12.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
+https://konsole.kde.org;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+   >=kde-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${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/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kinit-${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/kpty-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-darkbackground-detect.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package X X11)
+   )
+
+   ecm_src_configure
+}

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

2018-12-25 Thread Andreas Sturmlechner

commit: 8db345fe63a72a60df25699e7f182634404a3e8f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 25 12:59:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 25 21:23:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db345fe

kde-apps/konsole: Fix cursor w/ antialising

Follow-up to 6984d3c, fixed in 18.12.1.

Thanks-to: Lars Wendler  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konsole/files/konsole-18.12.0-fix-cursor.patch | 58 
 kde-apps/konsole/konsole-18.12.0-r2.ebuild | 62 ++
 2 files changed, 120 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch 
b/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch
new file mode 100644
index 000..36aabaaccc5
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch
@@ -0,0 +1,58 @@
+From b48ecb5712037027e6385515c9eced7fabfc3dc3 Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" 
+Date: Mon, 10 Dec 2018 10:09:35 -0500
+Subject: fix cursor when anti aliasing is enabled
+
+Summary:
+When there is a margin of 1 pixel, but some of the anti-aliasing
+"blur" leaks to 0,0. so it is fixed with a full update() (e. g. when
+it regains focus), but not when just some content updates in the
+window.   Without this it draws outside the content rect, most
+visible as a vertical line if the cursor is completely to the left and
+then moves.
+
+Reviewers: #konsole, hindenburg
+
+Reviewed By: #konsole, hindenburg
+
+Subscribers: pbraun, konsole-devel, #konsole
+
+Tags: #konsole
+
+Differential Revision: https://phabricator.kde.org/D17414
+
+(cherry picked from commit e7085310d6d594823d0ed491fa8bdbd99dec4932)
+---
+ src/TerminalDisplay.cpp | 10 +-
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index 6e8b262..64c831c 100644
+--- a/src/TerminalDisplay.cpp
 b/src/TerminalDisplay.cpp
+@@ -933,7 +933,7 @@ void TerminalDisplay::drawCursor(QPainter& painter,
+ 
+ // shift rectangle top down one pixel to leave some space
+ // between top and bottom
+-QRect cursorRect = rect.adjusted(0, 1, 0, 0);
++QRectF cursorRect = rect.adjusted(0, 1, 0, 0);
+ 
+ QColor cursorColor = _cursorColor.isValid() ? _cursorColor : 
foregroundColor;
+ painter.setPen(cursorColor);
+@@ -942,10 +942,10 @@ void TerminalDisplay::drawCursor(QPainter& painter,
+ // draw the cursor outline, adjusting the area so that
+ // it is draw entirely inside 'rect'
+ int penWidth = qMax(1, painter.pen().width());
+-painter.drawRect(cursorRect.adjusted(penWidth / 2,
+- penWidth / 2,
+- - penWidth / 2 - penWidth % 2,
+- - penWidth / 2 - penWidth % 2));
++painter.drawRect(cursorRect.adjusted(penWidth / 2 + 0.5,
++ penWidth / 2 + 0.5,
++ - penWidth / 2 - penWidth % 2 + 
0.5,
++ - penWidth / 2 - penWidth % 2 + 
0.5));
+ 
+ // draw the cursor body only when the widget has focus
+ if (hasFocus()) {
+-- 
+cgit v1.1

diff --git a/kde-apps/konsole/konsole-18.12.0-r2.ebuild 
b/kde-apps/konsole/konsole-18.12.0-r2.ebuild
new file mode 100644
index 000..abc36ad9309
--- /dev/null
+++ b/kde-apps/konsole/konsole-18.12.0-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
+
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+   $(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kinit)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knewstuff)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kpty)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+

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

2018-12-25 Thread Andreas Sturmlechner

commit: bf2c29643dafbc62250e50a987e93d39155ae0d3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 25 13:00:35 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 25 21:23:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf2c2964

kde-apps/konsole: Drop 18.12.0-r1

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-18.12.0-r1.ebuild | 59 --
 1 file changed, 59 deletions(-)

diff --git a/kde-apps/konsole/konsole-18.12.0-r1.ebuild 
b/kde-apps/konsole/konsole-18.12.0-r1.ebuild
deleted file mode 100644
index 63fec0b9fa7..000
--- a/kde-apps/konsole/konsole-18.12.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
-
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-   $(add_frameworks_dep kbookmarks)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kinit)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep knewstuff)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kpty)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-drawing-box-chars.patch" ) # fixed in 18.12.1
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package X X11)
-   )
-
-   kde5_src_configure
-}

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

2018-12-22 Thread Andreas Sturmlechner

commit: 6984d3c3f7cfb5f0dfbc1d166d7bf2be409280be
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 22 20:41:53 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 23 01:25:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6984d3c3

kde-apps/konsole: Fix drawing box chars

Fixed in 18.12.1.

Thanks-to: Lars Wendler  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konsole-18.12.0-fix-drawing-box-chars.patch| 188 +
 kde-apps/konsole/konsole-18.12.0-r1.ebuild |  59 +++
 2 files changed, 247 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch 
b/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch
new file mode 100644
index 000..1847543737a
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch
@@ -0,0 +1,188 @@
+From 807ac77061604c2ac7cf84b0a0b29dd949a6c634 Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" 
+Date: Thu, 6 Dec 2018 10:02:41 -0500
+Subject: fix drawing box chars, avoid storing and saving state all the time
+
+Summary:
+to get the box chars to be drawn correctly we need to turn on high
+quality antialiasing in qpainter. in addition only turn it on if
+antialiasing is enabled.
+
+lastly qpainter.save()/restore() is called very often, so try to avoid
+that if it isn't necessary.
+
+BUG: 401463
+
+Test Plan:
+`cat tests/boxes.txt`
+
+old:
+
+{F6428268}
+
+new:
+
+{F6450304}
+
+Reviewers: #konsole, hindenburg
+
+Reviewed By: #konsole, hindenburg
+
+Subscribers: wbauer, konsole-devel, #konsole
+
+Tags: #konsole
+
+Differential Revision: https://phabricator.kde.org/D16947
+
+(cherry picked from commit 14b3c8be2c15ed9711b1308b4a991de4aad5802d)
+---
+ src/TerminalDisplay.cpp | 45 -
+ 1 file changed, 20 insertions(+), 25 deletions(-)
+
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index 722e200..2b14556 100644
+--- a/src/TerminalDisplay.cpp
 b/src/TerminalDisplay.cpp
+@@ -619,7 +619,7 @@ static void drawLineChar(QPainter& paint, int x, int y, 
int w, int h, uchar code
+ {
+ //Calculate cell midpoints, end points.
+ const int cx = x + w / 2;
+-const int cy = y + h / 2;
++const int cy = y + h / 2. - 0.5;
+ const int ex = x + w - 1;
+ const int ey = y + h - 1;
+ 
+@@ -671,33 +671,33 @@ static void drawLineChar(QPainter& paint, int x, int y, 
int w, int h, uchar code
+ 
+ //Intersection points.
+ if ((toDraw & Int11) != 0u) {
+-paint.drawPoint(cx - 1, cy - 1);
++paint.drawPoint(cx - 2, cy - 2);
+ }
+ if ((toDraw & Int12) != 0u) {
+-paint.drawPoint(cx, cy - 1);
++paint.drawPoint(cx - 1, cy - 2);
+ }
+ if ((toDraw & Int13) != 0u) {
+-paint.drawPoint(cx + 1, cy - 1);
++paint.drawPoint(cx - 0, cy - 2);
+ }
+ 
+ if ((toDraw & Int21) != 0u) {
+-paint.drawPoint(cx - 1, cy);
++paint.drawPoint(cx - 2, cy - 1);
+ }
+ if ((toDraw & Int22) != 0u) {
+-paint.drawPoint(cx, cy);
++paint.drawPoint(cx - 1, cy - 1);
+ }
+ if ((toDraw & Int23) != 0u) {
+-paint.drawPoint(cx + 1, cy);
++paint.drawPoint(cx - 0, cy - 1);
+ }
+ 
+ if ((toDraw & Int31) != 0u) {
+-paint.drawPoint(cx - 1, cy + 1);
++paint.drawPoint(cx - 2, cy);
+ }
+ if ((toDraw & Int32) != 0u) {
+-paint.drawPoint(cx, cy + 1);
++paint.drawPoint(cx - 1, cy);
+ }
+ if ((toDraw & Int33) != 0u) {
+-paint.drawPoint(cx + 1, cy + 1);
++paint.drawPoint(cx - 0, cy);
+ }
+ }
+ 
+@@ -705,7 +705,7 @@ static void drawOtherChar(QPainter& paint, int x, int y, 
int w, int h, uchar cod
+ {
+ //Calculate cell midpoints, end points.
+ const int cx = x + w / 2;
+-const int cy = y + h / 2;
++const int cy = y + h / 2. - 0.5; // Compensate for the translation, to 
match fonts
+ const int ex = x + w - 1;
+ const int ey = y + h - 1;
+ 
+@@ -792,16 +792,17 @@ void TerminalDisplay::drawLineCharString(QPainter& 
painter, int x, int y, const
+ const Character* attributes)
+ {
+ painter.save();
+-painter.setRenderHint(QPainter::Antialiasing);
+ 
+-const QPen& originalPen = painter.pen();
++// For antialiasing, we need to shift it so the single pixel width is in 
the middle
++painter.translate(0.5, 0.5);
+ 
+ if (((attributes->rendition & RE_BOLD) != 0) && _boldIntense) {
+-QPen boldPen(originalPen);
+-boldPen.setWidth(3);
++QPen boldPen(painter.pen());
++boldPen.setWidth(4);
+ painter.setPen(boldPen);
+ }
+ 
++
+ for (int i = 0 ; i < str.length(); i++) {
+ const uchar code = str[i].cell();
+ if (LineChars[code] != 0u) {
+@@ -909,10 +910,10 @@ void TerminalDisplay::drawBackground(QPainter& painter,

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

2018-12-22 Thread Andreas Sturmlechner

commit: 98de1d17d7c2245582e50ca80c487702e2ad29c0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 22 20:43:14 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 23 01:25:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98de1d17

kde-apps/konsole: Drop 18.12.0 (r0)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-18.12.0.ebuild | 57 -
 1 file changed, 57 deletions(-)

diff --git a/kde-apps/konsole/konsole-18.12.0.ebuild 
b/kde-apps/konsole/konsole-18.12.0.ebuild
deleted file mode 100644
index 87c52af1ea2..000
--- a/kde-apps/konsole/konsole-18.12.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
-
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-   $(add_frameworks_dep kbookmarks)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kinit)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep knewstuff)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kpty)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package X X11)
-   )
-
-   kde5_src_configure
-}

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

2018-11-17 Thread Andreas Sturmlechner

commit: 16368489e7efd2cb661f1f55f9f2d0f504e70870
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 17 16:58:07 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 17 18:39:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16368489

kde-apps/konsole: Drop 18.08.3 (r0)

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-18.08.3.ebuild | 57 -
 1 file changed, 57 deletions(-)

diff --git a/kde-apps/konsole/konsole-18.08.3.ebuild 
b/kde-apps/konsole/konsole-18.08.3.ebuild
deleted file mode 100644
index 87c52af1ea2..000
--- a/kde-apps/konsole/konsole-18.08.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
-
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-   $(add_frameworks_dep kbookmarks)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kinit)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep knewstuff)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kpty)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package X X11)
-   )
-
-   kde5_src_configure
-}

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

2018-11-13 Thread Andreas Sturmlechner

commit: d5244c851a9becb379023744f0be214d0b1565e1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 13 11:08:00 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 13 11:32:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5244c85

kde-apps/konsole: Add StartupWMClass to .desktop file

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konsole/files/konsole-18.08.3-desktop.patch| 29 +++
 kde-apps/konsole/konsole-18.08.3-r1.ebuild | 59 ++
 2 files changed, 88 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-18.08.3-desktop.patch 
b/kde-apps/konsole/files/konsole-18.08.3-desktop.patch
new file mode 100644
index 000..8c204fe2bd2
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-18.08.3-desktop.patch
@@ -0,0 +1,29 @@
+From 1506ecdfd0f91d4b8b39c01bad1fe301193d6e82 Mon Sep 17 00:00:00 2001
+From: David Hallas 
+Date: Sun, 11 Nov 2018 10:26:31 -0500
+Subject: Add StartupWMClass to .desktop file
+
+The org.kde.konsole.desktop file is missing a StartupWMClass setting.
+
+BUG: 372441
+FIXED-IN: 18.12
+
+Differential Revision: https://phabricator.kde.org/D16546
+---
+ desktop/org.kde.konsole.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop
+index adc472c..86c2160 100755
+--- a/desktop/org.kde.konsole.desktop
 b/desktop/org.kde.konsole.desktop
+@@ -10,6 +10,7 @@ X-DocPath=konsole/index.html
+ X-DBUS-StartupType=Unique
+ StartupNotify=true
+ X-KDE-AuthorizeAction=shell_access
++StartupWMClass=konsole
+ 
+ Name=Konsole
+ Name[af]=Konsole
+-- 
+cgit v0.11.2

diff --git a/kde-apps/konsole/konsole-18.08.3-r1.ebuild 
b/kde-apps/konsole/konsole-18.08.3-r1.ebuild
new file mode 100644
index 000..5bc727ab78c
--- /dev/null
+++ b/kde-apps/konsole/konsole-18.08.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
+
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+   $(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kinit)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knewstuff)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kpty)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package X X11)
+   )
+
+   kde5_src_configure
+}

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

2018-04-19 Thread Andreas Sturmlechner

commit: 2a4534c91eda566e71ab91f00ba2bcfcdf52d56e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 20 00:42:25 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 20 00:44:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a4534c9

kde-apps/konsole: Add missing DEPEND

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 kde-apps/konsole/{konsole-18.04.0.ebuild => konsole-18.04.0-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/konsole/konsole-18.04.0.ebuild 
b/kde-apps/konsole/konsole-18.04.0-r1.ebuild
similarity index 97%
rename from kde-apps/konsole/konsole-18.04.0.ebuild
rename to kde-apps/konsole/konsole-18.04.0-r1.ebuild
index c091c44e38a..c0b85015b17 100644
--- a/kde-apps/konsole/konsole-18.04.0.ebuild
+++ b/kde-apps/konsole/konsole-18.04.0-r1.ebuild
@@ -28,6 +28,7 @@ DEPEND="
$(add_frameworks_dep kinit)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
+   $(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep knotifyconfig)
$(add_frameworks_dep kparts)

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

2018-02-07 Thread Andreas Sturmlechner

commit: c93886a5ea884fffa1c01384e5e0873140a1b8e7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb  7 16:02:45 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb  8 00:01:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93886a5

kde-apps/konsole: Fix mouse wheel scrolling w/ libinput

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=386762
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../konsole-17.12.1-libinput-pixeldelta.patch  | 54 
 kde-apps/konsole/konsole-17.12.1-r1.ebuild | 58 ++
 2 files changed, 112 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch 
b/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch
new file mode 100644
index 000..37049b9b2f2
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch
@@ -0,0 +1,54 @@
+From d25e5ac7089f2c81cc5ffe8e155ba8b3dfb11b97 Mon Sep 17 00:00:00 2001
+From: Kurt Hindenburg 
+Date: Wed, 7 Feb 2018 10:38:09 -0500
+Subject: Fix mouse wheel scrolling with libinput
+
+If the Libinput X server input driver is used we get a value for
+pixelDelta for a physical mouse wheel scroll, so we check that the
+source of the wheel event is actually a mouse, this was fixed in
+Qt 5.9.5*
+https://bugreports.qt.io/browse/QTBUG-59261
+
+Patch by ahmadsamir
+
+* fixed in Gentoo: Qt 5.9.4
+
+BUG: 386762
+Differential Revision: https://phabricator.kde.org/D9008
+---
+ src/ScrollState.cpp | 19 +++
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/src/ScrollState.cpp b/src/ScrollState.cpp
+index e5b486d..f71b142 100644
+--- a/src/ScrollState.cpp
 b/src/ScrollState.cpp
+@@ -25,10 +25,21 @@ using namespace Konsole;
+ 
+ void ScrollState::addWheelEvent(const QWheelEvent *wheel)
+ {
+-if ((wheel->angleDelta().y() != 0) && (wheel->pixelDelta().y() == 0)) {
+-_remainingScrollPixel = 0;
+-} else {
+-_remainingScrollPixel += wheel->pixelDelta().y();
++// If the Libinput X server input driver is used we get a value for
++// pixelDelta for a physical mouse wheel scroll, so we check that
++// the source of the wheel event is actually a mouse, this has been
++// fixed upstream in Qt 5.9.5: https://bugreports.qt.io/browse/QTBUG-59261
++// Fixes Konsole BUG: https://bugs.kde.org/show_bug.cgi?id=386762
++#if (QT_VERSION < QT_VERSION_CHECK(5, 9, 4))
++if (wheel->source() != Qt::MouseEventNotSynthesized) {
++#else
++if (true) {
++#endif
++if ((wheel->angleDelta().y() != 0) && (wheel->pixelDelta().y() == 0)) 
{
++_remainingScrollPixel = 0;
++} else {
++_remainingScrollPixel += wheel->pixelDelta().y();
++}
+ }
+ _remainingScrollAngle += wheel->angleDelta().y();
+ }
+-- 
+cgit v0.11.2
+

diff --git a/kde-apps/konsole/konsole-17.12.1-r1.ebuild 
b/kde-apps/konsole/konsole-17.12.1-r1.ebuild
new file mode 100644
index 000..8e2357bbc0a
--- /dev/null
+++ b/kde-apps/konsole/konsole-17.12.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
+
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+   $(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kinit)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kpty)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-libinput-pixeldelta.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package X X11)
+   )
+
+   kde5_src_configure
+}

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

2018-02-07 Thread Andreas Sturmlechner

commit: 28cdf920dac7f61c82de28575264ba6e08aa90b9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb  7 16:03:46 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb  8 00:01:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28cdf920

kde-apps/konsole: Drop 17.12.1 (r0)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 kde-apps/konsole/konsole-17.12.1.ebuild | 56 -
 1 file changed, 56 deletions(-)

diff --git a/kde-apps/konsole/konsole-17.12.1.ebuild 
b/kde-apps/konsole/konsole-17.12.1.ebuild
deleted file mode 100644
index c091c44e38a..000
--- a/kde-apps/konsole/konsole-17.12.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
-
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-   $(add_frameworks_dep kbookmarks)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kinit)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kpty)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package X X11)
-   )
-
-   kde5_src_configure
-}

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

2017-11-29 Thread Thomas Deutschmann

commit: def5bbc2452c5df59c0c5a04f7643cd2f993d921
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Nov 30 01:59:46 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Nov 30 02:07:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def5bbc2

kde-apps/konsole: x86 stable (bug #637292)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 kde-apps/konsole/konsole-17.08.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-17.08.3.ebuild 
b/kde-apps/konsole/konsole-17.08.3.ebuild
index eefabb85fb8..e37aedc1a8b 100644
--- a/kde-apps/konsole/konsole-17.08.3.ebuild
+++ b/kde-apps/konsole/konsole-17.08.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="KDE's terminal emulator"
 HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="X"
 
 DEPEND="

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

2017-04-25 Thread Michael Palimaka

commit: 253b68324cf4294d02524720a440f2cf14a085c5
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Apr 25 12:47:06 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Apr 25 12:47:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253b6832

kde-apps/konsole: backport patch from upstream solving --new-tab regression

Gentoo-bug: 615850
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../konsole/files/konsole-16.12.3-newtabs.patch| 31 
 kde-apps/konsole/konsole-16.12.3-r1.ebuild | 59 ++
 2 files changed, 90 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-16.12.3-newtabs.patch 
b/kde-apps/konsole/files/konsole-16.12.3-newtabs.patch
new file mode 100644
index 000..45ee52bd260
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-16.12.3-newtabs.patch
@@ -0,0 +1,31 @@
+From e3de3ca72552c81bc8d7dbe5cf1568eedd33c31e Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" 
+Date: Wed, 25 Jan 2017 22:25:48 +0100
+Subject: [PATCH] Fix opening of new tabs with multiple processes
+
+Make sure we re-use the process if the user wants a new tab.
+
+BUG: 373440
+REVIEW: 129886
+---
+ src/main.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index f4bb5af..33a2bdb 100644
+--- a/src/main.cpp
 b/src/main.cpp
+@@ -117,8 +117,8 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* 
argv[])
+ parser->process(*app);
+ about.processCommandLine(parser.data());
+ 
+-// Enable user to force multiple instances
+-if (!Konsole::KonsoleSettings::useSingleInstance()) {
++// Enable user to force multiple instances, unless a new tab is requested
++if (!Konsole::KonsoleSettings::useSingleInstance() && 
!parser->isSet(QStringLiteral("new-tab"))) {
+ startupOption = KDBusService::Multiple;
+ }
+ 
+-- 
+2.10.2
+

diff --git a/kde-apps/konsole/konsole-16.12.3-r1.ebuild 
b/kde-apps/konsole/konsole-16.12.3-r1.ebuild
new file mode 100644
index 000..551d2797b9f
--- /dev/null
+++ b/kde-apps/konsole/konsole-16.12.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
+
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+   $(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kinit)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kpty)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-newtabs.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package X X11)
+   )
+
+   kde5_src_configure
+}

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

2017-01-29 Thread Andreas Sturmlechner

commit: 2b8f606c3df1f0ece08d0a060c3bef8b6b7c3020
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 29 14:12:34 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 29 14:13:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8f606c

kde-apps/konsole: Fix build w/ ECM 5.31

Add upstream patch to fix build w/ upcoming extra-cmake-modules.

Thanks-to: karolherbst

Package-Manager: portage-2.3.3

 .../konsole/files/konsole-16.12.1-ecm531.patch | 22 ++
 kde-apps/konsole/konsole-16.12.1.ebuild|  2 ++
 2 files changed, 24 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-16.12.1-ecm531.patch 
b/kde-apps/konsole/files/konsole-16.12.1-ecm531.patch
new file mode 100644
index ..fd22781
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-16.12.1-ecm531.patch
@@ -0,0 +1,22 @@
+commit 3a055ea19d5f458ccf06a33c697fbcda7a7f14df
+Author: Aleix Pol 
+Date:   Wed Jan 18 12:15:00 2017 +0100
+
+Fix build
+
+frameworks/konsole/src/Session.cpp:839:5: warning: 'not' is not defined,
+evaluates to 0 [-Wundef]
+
+diff --git a/src/Session.cpp b/src/Session.cpp
+index d63c8a0..482ee0b 100644
+--- a/src/Session.cpp
 b/src/Session.cpp
+@@ -836,7 +836,7 @@ void Session::sendTextToTerminal(const QString& text, 
const QChar& eol) const
+ // Only D-Bus calls this function (via SendText or runCommand)
+ void Session::sendText(const QString& text) const
+ {
+-#if not defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS)
++#if !defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS)
+ if (show_disallow_certain_dbus_methods_message) {
+ 
+ KNotification::event(KNotification::Warning, "Konsole D-Bus Warning",

diff --git a/kde-apps/konsole/konsole-16.12.1.ebuild 
b/kde-apps/konsole/konsole-16.12.1.ebuild
index 1070cde..ea4c0fe 100644
--- a/kde-apps/konsole/konsole-16.12.1.ebuild
+++ b/kde-apps/konsole/konsole-16.12.1.ebuild
@@ -49,6 +49,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-ecm531.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)

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

2016-11-20 Thread Michael Palimaka

commit: 733c84ea8d919028598111f0f551f287119417fc
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Nov 20 16:20:22 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Nov 20 16:20:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=733c84ea

kde-apps/konsole: backport patch from upstream making the file filter optional

The file filter was introduced in 16.08 and can cause high CPU usage and
general lag in konsole. This backports a commit from 16.12 making the file
filter optional and disabled by default.

KDE-bug: 367882
KDE-bug: 368234

Package-Manager: portage-2.3.2

 .../konsole/files/konsole-16.08.3-filefilter.patch | 437 +
 kde-apps/konsole/konsole-16.08.3-r1.ebuild |  60 +++
 2 files changed, 497 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-16.08.3-filefilter.patch 
b/kde-apps/konsole/files/konsole-16.08.3-filefilter.patch
new file mode 100644
index ..c842c37
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-16.08.3-filefilter.patch
@@ -0,0 +1,437 @@
+From e434862050abe2ec48a0c506faf8e2a5f0fe99a9 Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" 
+Date: Sun, 4 Sep 2016 14:12:02 +0200
+Subject: [PATCH] Make the config of file filters and url filters separate
+
+REVIEW: 128828
+BUG: 368234
+---
+ src/EditProfileDialog.cpp | 21 ---
+ src/EditProfileDialog.h   |  1 +
+ src/EditProfileDialog.ui  | 14 --
+ src/Profile.cpp   |  4 ++-
+ src/Profile.h |  9 +++
+ src/SessionController.cpp | 40 +---
+ src/SessionController.h   |  6 +
+ src/TerminalDisplay.cpp   | 67 ++-
+ src/TerminalDisplay.h | 16 ---
+ src/ViewManager.cpp   |  1 -
+ 10 files changed, 117 insertions(+), 62 deletions(-)
+
+diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
+index a85cd5b..1a94193 100644
+--- a/src/EditProfileDialog.cpp
 b/src/EditProfileDialog.cpp
+@@ -857,6 +857,7 @@ void EditProfileDialog::removeKeyBinding()
+ _ui->keyBindingList->model()->removeRow(selected.first().row());
+ }
+ }
++
+ void EditProfileDialog::showKeyBindingEditor(bool isNewTranslator)
+ {
+ QModelIndexList selected = 
_ui->keyBindingList->selectionModel()->selectedIndexes();
+@@ -1010,11 +1011,16 @@ void EditProfileDialog::scrollHalfPage()
+ }
+ void EditProfileDialog::setupMousePage(const Profile::Ptr profile)
+ {
+-BooleanOption  options[] = { {
++BooleanOption  options[] = {
++{
+ _ui->underlineLinksButton , Profile::UnderlineLinksEnabled,
+ SLOT(toggleUnderlineLinks(bool))
+ },
+ {
++_ui->underlineFilesButton , Profile::UnderlineFilesEnabled,
++SLOT(toggleUnderlineFiles(bool))
++},
++{
+ _ui->ctrlRequiredForDragButton, Profile::CtrlRequiredForDrag,
+ SLOT(toggleCtrlRequiredForDrag(bool))
+ },
+@@ -1057,7 +1063,7 @@ void EditProfileDialog::setupMousePage(const 
Profile::Ptr profile)
+ 
+ connect(_ui->tripleClickModeCombo, 
static_cast(::activated), this, 
::EditProfileDialog::TripleClickModeChanged);
+ 
+-
_ui->openLinksByDirectClickButton->setEnabled(_ui->underlineLinksButton->isChecked());
++
_ui->openLinksByDirectClickButton->setEnabled(_ui->underlineLinksButton->isChecked()
 || _ui->underlineFilesButton->isChecked());
+ 
+ 
_ui->enableMouseWheelZoomButton->setChecked(profile->mouseWheelZoomEnabled());
+ connect(_ui->enableMouseWheelZoomButton, ::toggled, this, 
::EditProfileDialog::toggleMouseWheelZoom);
+@@ -1163,7 +1169,16 @@ void EditProfileDialog::toggleBlinkingCursor(bool 
enable)
+ void EditProfileDialog::toggleUnderlineLinks(bool enable)
+ {
+ updateTempProfileProperty(Profile::UnderlineLinksEnabled, enable);
+-_ui->openLinksByDirectClickButton->setEnabled(enable);
++
++bool enableClick = _ui->underlineFilesButton->isChecked() || enable;
++_ui->openLinksByDirectClickButton->setEnabled(enableClick);
++}
++void EditProfileDialog::toggleUnderlineFiles(bool enable)
++{
++updateTempProfileProperty(Profile::UnderlineFilesEnabled, enable);
++
++bool enableClick = _ui->underlineLinksButton->isChecked() || enable;
++_ui->openLinksByDirectClickButton->setEnabled(enableClick);
+ }
+ void EditProfileDialog::toggleCtrlRequiredForDrag(bool enable)
+ {
+diff --git a/src/EditProfileDialog.h b/src/EditProfileDialog.h
+index 1195c14..febed0a 100644
+--- a/src/EditProfileDialog.h
 b/src/EditProfileDialog.h
+@@ -156,6 +156,7 @@ private slots:
+ void removeKeyBinding();
+ 
+ // mouse page
++void toggleUnderlineFiles(bool enable);
+ void toggleUnderlineLinks(bool);
+ void toggleOpenLinksByDirectClick(bool);
+ void toggleCtrlRequiredForDrag(bool);
+diff --git a/src/EditProfileDialog.ui b/src/EditProfileDialog.ui
+index

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

2016-08-17 Thread Michael Palimaka

commit: 9d549303e846712f12d13ce4206563bec6afb78a
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Aug 14 20:34:52 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Aug 17 20:41:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d549303

kde-apps/konsole: USE=X requires kdelibs4support[X]

Gentoo-bug: 591074

Package-Manager: portage-2.2.28

 kde-apps/konsole/konsole-16.04.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-16.04.3.ebuild 
b/kde-apps/konsole/konsole-16.04.3.ebuild
index f47f16f..9c87770 100644
--- a/kde-apps/konsole/konsole-16.04.3.ebuild
+++ b/kde-apps/konsole/konsole-16.04.3.ebuild
@@ -21,7 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kdelibs4support 'X?')
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep ki18n)

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/, kde-apps/kde-l10n/, kde-apps/kspaceduel/, kde-apps/bomber/, ...

2016-06-23 Thread Michael Palimaka

commit: 0a1c7f5d6e18c2a80f8a683bcdc4291c7c3ad767
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jun 23 13:35:19 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jun 23 13:39:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1c7f5d

kde-apps: stabilise 15.12.3 on x86

Gentoo-bug: 579992

Package-Manager: portage-2.3.0_rc1

 kde-apps/analitza/analitza-15.12.3.ebuild   | 2 +-
 kde-apps/ark/ark-15.12.3.ebuild | 2 +-
 kde-apps/artikulate/artikulate-15.12.3.ebuild   | 2 +-
 kde-apps/attica/attica-15.12.3.ebuild   | 2 +-
 kde-apps/audiocd-kio/audiocd-kio-15.12.3.ebuild | 2 +-
 kde-apps/baloo-widgets/baloo-widgets-15.12.3.ebuild | 2 +-
 kde-apps/blinken/blinken-15.12.3.ebuild | 2 +-
 kde-apps/bomber/bomber-15.12.3.ebuild   | 2 +-
 kde-apps/bovo/bovo-15.12.3.ebuild   | 2 +-
 kde-apps/cantor/cantor-15.12.3-r1.ebuild| 2 +-
 kde-apps/cervisia/cervisia-15.12.3.ebuild   | 2 +-
 kde-apps/dolphin-plugins/dolphin-plugins-15.12.3.ebuild | 2 +-
 kde-apps/dolphin/dolphin-15.12.3-r1.ebuild  | 2 +-
 kde-apps/dragon/dragon-15.12.3.ebuild   | 2 +-
 kde-apps/drkonqi/drkonqi-15.12.3.ebuild | 2 +-
 kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.3.ebuild   | 2 +-
 kde-apps/filelight/filelight-15.12.3.ebuild | 2 +-
 kde-apps/granatier/granatier-15.12.3.ebuild | 2 +-
 kde-apps/gwenview/gwenview-15.12.3.ebuild   | 2 +-
 kde-apps/jovie/jovie-15.12.3.ebuild | 2 +-
 kde-apps/juk/juk-15.12.3.ebuild | 2 +-
 kde-apps/kaccessible/kaccessible-15.12.3.ebuild | 2 +-
 kde-apps/kaccounts-integration/kaccounts-integration-15.12.3.ebuild | 2 +-
 kde-apps/kajongg/kajongg-15.12.3.ebuild | 2 +-
 kde-apps/kalgebra/kalgebra-15.12.3.ebuild   | 2 +-
 kde-apps/kalzium/kalzium-15.12.3-r2.ebuild  | 2 +-
 kde-apps/kamera/kamera-15.12.3.ebuild   | 2 +-
 kde-apps/kanagram/kanagram-15.12.3.ebuild   | 2 +-
 kde-apps/kapman/kapman-15.12.3.ebuild   | 2 +-
 kde-apps/kapptemplate/kapptemplate-15.12.3-r1.ebuild| 2 +-
 kde-apps/kate/kate-15.12.3.ebuild   | 2 +-
 kde-apps/katomic/katomic-15.12.3.ebuild | 2 +-
 kde-apps/kblackbox/kblackbox-15.12.3.ebuild | 2 +-
 kde-apps/kblocks/kblocks-15.12.3-r1.ebuild  | 2 +-
 kde-apps/kbounce/kbounce-15.12.3.ebuild | 2 +-
 kde-apps/kbreakout/kbreakout-15.12.3.ebuild | 2 +-
 kde-apps/kbruch/kbruch-15.12.3-r1.ebuild| 2 +-
 kde-apps/kcachegrind/kcachegrind-15.12.3.ebuild | 2 +-
 kde-apps/kcalc/kcalc-15.12.3-r1.ebuild  | 2 +-
 kde-apps/kcharselect/kcharselect-15.12.3.ebuild | 2 +-
 kde-apps/kcmshell/kcmshell-15.12.3.ebuild   | 2 +-
 kde-apps/kcolorchooser/kcolorchooser-15.12.3.ebuild | 2 +-
 kde-apps/kcontrol/kcontrol-15.12.3.ebuild   | 2 +-
 kde-apps/kcron/kcron-15.12.3.ebuild | 2 +-
 kde-apps/kde-apps-meta/kde-apps-meta-15.12.3-r3.ebuild  | 2 +-
 kde-apps/kde-dev-scripts/kde-dev-scripts-15.12.3.ebuild | 2 +-
 kde-apps/kde-dev-utils/kde-dev-utils-15.12.3.ebuild | 2 +-
 kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild| 2 +-
 kde-apps/kde-meta/kde-meta-15.12.3.ebuild   | 2 +-
 kde-apps/kde4-l10n/kde4-l10n-15.12.3-r1.ebuild  | 2 +-
 kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-15.12.3.ebuild | 2 +-
 kde-apps/kdeadmin-meta/kdeadmin-meta-15.12.3.ebuild | 2 +-
 kde-apps/kdebase-data/kdebase-data-15.12.3.ebuild   | 2 +-
 kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.12.3.ebuild   | 2 +-
 kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.12.3.ebuild | 2 +-
 kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.12.3.ebuild   | 2 +-
 kde-apps/kdebase-menu/kdebase-menu-15.12.3.ebuild   | 2 +-

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

2016-03-06 Thread Mikle Kolyada

commit: 846259bdbc5d8e4714bacae4d5fefcd6f419fca5
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar  6 10:22:11 2016 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar  6 10:22:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846259bd

kde-apps/konsole: x86 stable wrt bug #569742

Package-Manager: portage-2.2.26

 kde-apps/konsole/konsole-4.14.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-4.14.3-r2.ebuild 
b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
index acd5b940..b773196 100644
--- a/kde-apps/konsole/konsole-4.14.3-r2.ebuild
+++ b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base
 
 DESCRIPTION="X terminal for use with KDE"
 HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND=""

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

2016-03-06 Thread Mikle Kolyada

commit: 199f221f542b47c3bb5b07a7e6812f8ef480997a
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Mar  5 12:12:08 2016 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Mar  5 12:12:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=199f221f

kde-apps/konsole: amd64 stable wrt bug #569742

Package-Manager: portage-2.2.26

 kde-apps/konsole/konsole-4.14.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-4.14.3-r2.ebuild 
b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
index be55c4a..acd5b940 100644
--- a/kde-apps/konsole/konsole-4.14.3-r2.ebuild
+++ b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base
 
 DESCRIPTION="X terminal for use with KDE"
 HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND=""

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

2016-01-18 Thread Michael Palimaka

commit: c0e38f4f9bd8f6d115e0e1bb0621693046afaee0
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Jan 16 22:03:22 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jan 18 18:33:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e38f4f

kde-apps/konsole: Auto-block slot 4 again

Package-Manager: portage-2.2.26

 .../konsole/{konsole-15.08.3.ebuild => konsole-15.08.3-r1.ebuild} | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/kde-apps/konsole/konsole-15.08.3.ebuild 
b/kde-apps/konsole/konsole-15.08.3-r1.ebuild
similarity index 89%
rename from kde-apps/konsole/konsole-15.08.3.ebuild
rename to kde-apps/konsole/konsole-15.08.3-r1.ebuild
index b73cd81..b89b816 100644
--- a/kde-apps/konsole/konsole-15.08.3.ebuild
+++ b/kde-apps/konsole/konsole-15.08.3-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-KDE_BLOCK_SLOT4="false"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
@@ -47,10 +46,7 @@ DEPEND="
dev-qt/qtxml:5
X? ( x11-libs/libX11 )
 "
-RDEPEND="${DEPEND}
-   !kde-apps/konsole:4[handbook]
-   !kde-apps/konsole:4[-minimal(-)]
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
local mycmakeargs=(

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

2016-01-18 Thread Michael Palimaka

commit: 4296fbfe17f53dd61af679ea74c22e9c42c9c1e1
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Jan 16 21:59:52 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jan 18 18:33:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4296fbfe

kde-apps/konsole: Drop USE=minimal

Now there is konsolepart, prevent users from ending up without konsole
binary after rebuild, following the switch to plasma profile.

Package-Manager: portage-2.2.26

 kde-apps/konsole/konsole-4.14.3-r1.ebuild | 55 ---
 kde-apps/konsole/konsole-4.14.3.ebuild| 13 ++--
 2 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/kde-apps/konsole/konsole-4.14.3-r1.ebuild 
b/kde-apps/konsole/konsole-4.14.3-r1.ebuild
deleted file mode 100644
index f5cb4e9..000
--- a/kde-apps/konsole/konsole-4.14.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KDE_DOC_DIRS="doc/manual"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="X terminal for use with KDE"
-HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug minimal"
-
-COMMONDEPEND="
-   !aqua? (
-   x11-libs/libX11
-   x11-libs/libXext
-   >=x11-libs/libxklavier-3.2
-   x11-libs/libXrender
-   x11-libs/libXtst
-   !minimal? ( $(add_kdeapps_dep libkonq) )
-   )
-"
-DEPEND="${COMMONDEPEND}
-   !aqua? (
-   x11-apps/bdftopcf
-   x11-proto/kbproto
-   x11-proto/renderproto
-   )
-"
-RDEPEND="${COMMONDEPEND}"
-
-# can't connect to a kded instance, fails to connect to dbus
-RESTRICT="test"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with "!minimal" LibKonq)
-   )
-
-   kde4-base_src_configure
-}
-
-src_install() {
-   kde4-base_src_install
-
-   if use minimal; then
-   rm "${D}/usr/bin/konsole" || die
-   rm "${D}/usr/bin/konsoleprofile" || die
-   fi
-}

diff --git a/kde-apps/konsole/konsole-4.14.3.ebuild 
b/kde-apps/konsole/konsole-4.14.3.ebuild
index e1a86c6..a43086a 100644
--- a/kde-apps/konsole/konsole-4.14.3.ebuild
+++ b/kde-apps/konsole/konsole-4.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ inherit kde4-base
 DESCRIPTION="X terminal for use with KDE"
 HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug minimal"
+IUSE="debug"
 
 COMMONDEPEND="
!aqua? (
@@ -36,12 +36,3 @@ RDEPEND="${COMMONDEPEND}"
 
 # can't connect to a kded instance, fails to connect to dbus
 RESTRICT="test"
-
-src_install() {
-   kde4-base_src_install
-
-   if use minimal; then
-   rm "${D}/usr/bin/konsole" || die
-   rm "${D}/usr/bin/konsoleprofile" || die
-   fi
-}

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

2016-01-04 Thread Michael Palimaka

commit: 86bf6b72c2f05ed6f78f1450f70c985a8cc31731
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Mon Jan  4 00:17:52 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jan  4 18:00:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86bf6b72

kde-apps/konsole: Drop USE=minimal, RDEPEND on konsolepart instead

Make konsole install the binaries you'd expect from it again, even when
plasma profile is selected. Dropping minimal flag, the existing blocker in
konsole:5 continues to work. All conflicting files are now in konsole:4.

Package-Manager: portage-2.2.26

 kde-apps/konsole/konsole-4.14.3-r2.ebuild | 45 +++
 1 file changed, 45 insertions(+)

diff --git a/kde-apps/konsole/konsole-4.14.3-r2.ebuild 
b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
new file mode 100644
index 000..be55c4a
--- /dev/null
+++ b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_DOC_DIRS="doc/manual"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde4-base
+
+DESCRIPTION="X terminal for use with KDE"
+HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND=""
+RDEPEND="$(add_kdeapps_dep konsolepart)"
+
+# can't connect to a kded instance, fails to connect to dbus
+RESTRICT="test"
+
+src_prepare() {
+   comment_add_subdirectory data
+
+   kde4-base_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_LibKonq=OFF
+   )
+
+   kde4-base_src_configure
+}
+
+src_install() {
+   kde4-base_src_install
+
+   rm -r "${ED}"usr/$(get_libdir) || die
+   rm -r "${ED}"usr/share/apps || die
+   rm "${ED}"usr/share/kde4/services/konsolepart.desktop || die
+   rm -r "${ED}"usr/share/kde4/servicetypes || die
+}

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

2015-12-06 Thread Michael Palimaka

commit: 4f8bb6e3d7aa1ea37abe11b9d25b30b4aaef0ce5
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Dec  3 19:41:08 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Dec  6 09:20:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8bb6e3

kde-apps/konsole: Fix blocker, bug 567472

Package-Manager: portage-2.2.26

 kde-apps/konsole/konsole-15.08.3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-15.08.3.ebuild 
b/kde-apps/konsole/konsole-15.08.3.ebuild
index f4de92e..b73cd81 100644
--- a/kde-apps/konsole/konsole-15.08.3.ebuild
+++ b/kde-apps/konsole/konsole-15.08.3.ebuild
@@ -48,7 +48,8 @@ DEPEND="
X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}
-   !kde-apps/konsole:4[-minimal(-),handbook]
+   !kde-apps/konsole:4[handbook]
+   !kde-apps/konsole:4[-minimal(-)]
 "
 
 src_configure() {

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

2015-09-24 Thread Michael Palimaka

commit: 4da17bc0ba54412fc25afbe7e7a01cdd9d42649a
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Sep  9 00:33:31 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep 24 19:29:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da17bc0

kde-apps/konsole: Disable LibKonq if USE=minimal

LibKonq is required for drag-n-drop menus in konsole application.
USE=minimal only installs konsolepart though, so disable it.
One less blocker against kde-apps/libkonq:5

Package-Manager: portage-2.2.20.1

 kde-apps/konsole/konsole-4.14.3-r1.ebuild | 55 +++
 1 file changed, 55 insertions(+)

diff --git a/kde-apps/konsole/konsole-4.14.3-r1.ebuild 
b/kde-apps/konsole/konsole-4.14.3-r1.ebuild
new file mode 100644
index 000..f5cb4e9
--- /dev/null
+++ b/kde-apps/konsole/konsole-4.14.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_DOC_DIRS="doc/manual"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde4-base
+
+DESCRIPTION="X terminal for use with KDE"
+HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug minimal"
+
+COMMONDEPEND="
+   !aqua? (
+   x11-libs/libX11
+   x11-libs/libXext
+   >=x11-libs/libxklavier-3.2
+   x11-libs/libXrender
+   x11-libs/libXtst
+   !minimal? ( $(add_kdeapps_dep libkonq) )
+   )
+"
+DEPEND="${COMMONDEPEND}
+   !aqua? (
+   x11-apps/bdftopcf
+   x11-proto/kbproto
+   x11-proto/renderproto
+   )
+"
+RDEPEND="${COMMONDEPEND}"
+
+# can't connect to a kded instance, fails to connect to dbus
+RESTRICT="test"
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_with "!minimal" LibKonq)
+   )
+
+   kde4-base_src_configure
+}
+
+src_install() {
+   kde4-base_src_install
+
+   if use minimal; then
+   rm "${D}/usr/bin/konsole" || die
+   rm "${D}/usr/bin/konsoleprofile" || die
+   fi
+}

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

2015-09-07 Thread Michael Palimaka

commit: 63616cff8613b3ef251fd62c60b2163971fc5b41
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Sep  6 16:58:38 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Sep  8 02:46:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63616cff

kde-apps/konsole: Fix blocker

Package-Manager: portage-2.2.20.1

 kde-apps/konsole/konsole-15.08.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-15.08.0.ebuild 
b/kde-apps/konsole/konsole-15.08.0.ebuild
index ab75c48..5f90ede 100644
--- a/kde-apps/konsole/konsole-15.08.0.ebuild
+++ b/kde-apps/konsole/konsole-15.08.0.ebuild
@@ -49,7 +49,7 @@ DEPEND="
X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}
-   !kde-apps/konsole:4[-minimal(+),handbook]
+   !kde-apps/konsole:4[-minimal(-),handbook]
 "
 
 src_configure() {

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

2015-08-27 Thread Michael Palimaka

commit: c604a3f80210d76e1de60ddb38377b20221af979
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu Aug 27 17:58:09 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu Aug 27 17:58:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c604a3f8

kde-apps/konsole: version bump 15.08.0.

Package-Manager: portage-2.2.20.1

 kde-apps/konsole/Manifest   |  1 +
 kde-apps/konsole/konsole-15.08.0.ebuild | 61 +
 2 files changed, 62 insertions(+)

diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 607206c..e1feaa6 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1 +1,2 @@
+DIST konsole-15.08.0.tar.xz 459340 SHA256 
de5f504f9b036f85a771dc60fb5f161a78c99d71ecc6f3d9de1df91a56f795ce SHA512 
45a028c5da586f809ec0d55a8b410d6fcf1a00c67b1ef4686a098b1fbce6e56e56039741a8fbd06c3cfca81bf58fc2929b6c3fabd078ccbc916cde1348a9250b
 WHIRLPOOL 
300a1d10df1cc4ed14455d997d135c00056e67a830a1d219ec93799d6a0b26a6e0f6bca9b97b2d796eaa90e591dbd1d5e16395a286210ee11ef2388d2237cdb7
 DIST konsole-4.14.3.tar.xz 455216 SHA256 
2f750e6930309f8a3b939c7cd30415a08d71da27af10893c3341305db803f155 SHA512 
88a919ea7230ae96518a347b80dbf08d641c60557f24cff02421f22cc99da5b2daf306d8e7b820cd701983fcd3ee46171cc97e231591ad2c334574777fbdb135
 WHIRLPOOL 
588f0f02c8008679ff598d15cd79f8214acd74e57f5c5a936d5aa26d64c1f4f62f46f834ddf6b0545ea05f98d6a2bafcb3b7b5eb9e7c31e93224976b5168bd8e

diff --git a/kde-apps/konsole/konsole-15.08.0.ebuild 
b/kde-apps/konsole/konsole-15.08.0.ebuild
new file mode 100644
index 000..ab75c48
--- /dev/null
+++ b/kde-apps/konsole/konsole-15.08.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_BLOCK_SLOT4=false
+KDE_HANDBOOK=true
+KDE_TEST=true
+KDE_PUNT_BOGUS_DEPS=true
+VIRTUALX_REQUIRED=test
+inherit kde5
+
+DESCRIPTION=KDE's terminal emulator
+HOMEPAGE=https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
+
+KEYWORDS=~amd64 ~x86
+IUSE=X
+
+DEPEND=
+   $(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kinit)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kpty)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtscript:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   X? ( x11-libs/libX11 )
+
+RDEPEND=${DEPEND}
+   !kde-apps/konsole:4[-minimal(+),handbook]
+
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package X X11)
+   )
+
+   kde5_src_configure
+}

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

2015-08-25 Thread Michael Palimaka

commit: b73904cd45fca09010de29a002db6a47870ec036
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Aug 25 13:26:45 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Aug 25 13:27:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b73904cd

kde-apps/konsole: introduce minimal USE flag for Plasma 5 compatibility.

Enabling it strips the components colliding with konsole:5, leaving
effectively only konsolepart.

Package-Manager: portage-2.2.20.1

 kde-apps/konsole/konsole-4.14.3.ebuild | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/kde-apps/konsole/konsole-4.14.3.ebuild 
b/kde-apps/konsole/konsole-4.14.3.ebuild
index 0c4bd47..e1a86c6 100644
--- a/kde-apps/konsole/konsole-4.14.3.ebuild
+++ b/kde-apps/konsole/konsole-4.14.3.ebuild
@@ -13,7 +13,7 @@ inherit kde4-base
 DESCRIPTION=X terminal for use with KDE
 HOMEPAGE=https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-IUSE=debug
+IUSE=debug minimal
 
 COMMONDEPEND=
!aqua? (
@@ -36,3 +36,12 @@ RDEPEND=${COMMONDEPEND}
 
 # can't connect to a kded instance, fails to connect to dbus
 RESTRICT=test
+
+src_install() {
+   kde4-base_src_install
+
+   if use minimal; then
+   rm ${D}/usr/bin/konsole || die
+   rm ${D}/usr/bin/konsoleprofile || die
+   fi
+}

62 matches

Mail list logo