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

2024-07-12 Thread Andreas Sturmlechner 
commit: 78bd9817c4965c0b54bc60a6b38d805ac2bdccd3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jul 12 17:22:34 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul 12 17:22:34 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=78bd9817

kde-apps/konsole: Re-add IUSE X, add missing USEdep, drop obsolete patch

Amends (rather fixes) commit 6663a2bf1415d295444b5500d6911ee6e6f15727.

Upstream commit c5f2315c9df05ca069de25ab741d9fc38a6de21a

Closes: https://bugs.gentoo.org/935530
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konsole-23.08.1-drop-unused-X11-dep.patch  | 30 --
 kde-apps/konsole/konsole-.ebuild   | 11 +---
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch 
b/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch
deleted file mode 100644
index 6719fbfac0..00
--- a/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 68f6ef2ea203e047743a97fc17be23a4a964a05a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Fri, 15 Sep 2023 09:47:42 +0200
-Subject: [PATCH] Drop unused X11 dependency
-
-It seems it is (no longer) needed and was only a leftover for feature 
selection.
-
-Signed-off-by: Andreas Sturmlechner 

- CMakeLists.txt | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9fd6f4f01..47c234498 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -105,9 +105,7 @@ find_package(ICU 61.0 COMPONENTS uc i18n REQUIRED)
- if(NOT APPLE)
- option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" 
OFF)
- if (NOT WITHOUT_X11)
--find_package(X11)
--set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
--set(HAVE_X11 ${X11_FOUND})
-+set(HAVE_X11 1)
- endif()
- endif()
- 
--- 
-2.42.0
-

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index f184265166..c4bc1eff91 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
 KEYWORDS=""
-IUSE=""
+IUSE="X"
 
 DEPEND="
dev-libs/icu:=
@@ -42,12 +42,17 @@ DEPEND="
>=kde-frameworks/kservice-${KFMIN}:6
>=kde-frameworks/ktextwidgets-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-   >=kde-frameworks/kwindowsystem-${KFMIN}:6
+   >=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
>=kde-frameworks/kxmlgui-${KFMIN}:6
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-23.08.1-drop-unused-X11-dep.patch" ) # FIXME 
properly upstream
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_X11=$(usex X)
+   )
+   ecm_src_configure
+}
 
 src_test() {
# DBusTest: drkonqi process interferes. bug 702690

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

2023-09-15 Thread Andreas Sturmlechner 
commit: 6663a2bf1415d295444b5500d6911ee6e6f15727
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Sep 15 14:25:59 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Sep 15 14:25:59 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6663a2bf

kde-apps/konsole: Drop unused dep, drop IUSE X

Closes: https://bugs.gentoo.org/914127
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konsole-23.08.1-drop-unused-X11-dep.patch  | 30 ++
 kde-apps/konsole/konsole-23.08.49..ebuild  | 11 ++--
 kde-apps/konsole/konsole-.ebuild   | 11 ++--
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch 
b/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch
new file mode 100644
index 00..6719fbfac0
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch
@@ -0,0 +1,30 @@
+From 68f6ef2ea203e047743a97fc17be23a4a964a05a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Fri, 15 Sep 2023 09:47:42 +0200
+Subject: [PATCH] Drop unused X11 dependency
+
+It seems it is (no longer) needed and was only a leftover for feature 
selection.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9fd6f4f01..47c234498 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -105,9 +105,7 @@ find_package(ICU 61.0 COMPONENTS uc i18n REQUIRED)
+ if(NOT APPLE)
+ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" 
OFF)
+ if (NOT WITHOUT_X11)
+-find_package(X11)
+-set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
+-set(HAVE_X11 ${X11_FOUND})
++set(HAVE_X11 1)
+ endif()
+ endif()
+ 
+-- 
+2.42.0
+

diff --git a/kde-apps/konsole/konsole-23.08.49..ebuild 
b/kde-apps/konsole/konsole-23.08.49..ebuild
index 2a1195cc09..497c0bb398 100644
--- a/kde-apps/konsole/konsole-23.08.49..ebuild
+++ b/kde-apps/konsole/konsole-23.08.49..ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="X"
+IUSE=""
 
 DEPEND="
dev-libs/icu:=
@@ -48,17 +48,10 @@ DEPEND="
>=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=(
-   -DWITHOUT_X11=$(usex !X)
-   )
-
-   ecm_src_configure
-}
+PATCHES=( "${FILESDIR}/${PN}-23.08.1-drop-unused-X11-dep.patch" ) # FIXME 
properly upstream
 
 src_test() {
# DBusTest: drkonqi process interferes. bug 702690

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 2a1195cc09..497c0bb398 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="X"
+IUSE=""
 
 DEPEND="
dev-libs/icu:=
@@ -48,17 +48,10 @@ DEPEND="
>=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=(
-   -DWITHOUT_X11=$(usex !X)
-   )
-
-   ecm_src_configure
-}
+PATCHES=( "${FILESDIR}/${PN}-23.08.1-drop-unused-X11-dep.patch" ) # FIXME 
properly upstream
 
 src_test() {
# DBusTest: drkonqi process interferes. bug 702690

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

2022-07-31 Thread Andreas Sturmlechner 
commit: de56cc11b5be214fba43b3c265aba76b4c69d280
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 30 08:33:05 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 31 15:10:49 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=de56cc11

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.07.80.ebuild   |  4 +-
 kde-apps/konsole/konsole-22.08.49..ebuild  |  4 +-
 3 files changed, 52 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 00..ed396fcf20
--- /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.07.80.ebuild 
b/kde-apps/konsole/konsole-22.07.80.ebuild
index a0a71ba6f8..b2ba161347 100644
--- a/kde-apps/konsole/konsole-22.07.80.ebuild
+++ b/kde-apps/konsole/konsole-22.07.80.ebuild
@@ -50,9 +50,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" )
+
 src_configure() {
local mycmakeargs=(
-   $(cmake_use_find_package X X11)
+   -DWITHOUT_X11=$(usex !X)
)
 
ecm_src_configure

diff --git a/kde-apps/konsole/konsole-22.08.49..ebuild 
b/kde-apps/konsole/konsole-22.08.49..ebuild
index 059873271c..0a92af7f86 100644
--- a/kde-apps/konsole/konsole-22.08.49..ebuild
+++ b/kde-apps/konsole/konsole-22.08.49..ebuild
@@ -50,9 +50,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" )
+
 src_configure() {
local mycmakeargs=(
-   $(cmake_use_find_package X X11)
+   -DWITHOUT_X11=$(usex !X)
)
 
ecm_src_configure

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

2019-03-06 Thread Andreas Sturmlechner 
commit: 42accedeeb919a0aeb10f67d4cbde001b8fee38f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar  6 14:32:32 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar  6 14:32:32 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=42accede

kde-apps/konsole: Fix disappearing/non-moving cursor

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=402589
Bug: https://bugs.gentoo.org/673766
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../konsole/files/konsole-18.12.3-cursor.patch | 84 ++
 kde-apps/konsole/konsole-18.12.3.ebuild|  2 +
 2 files changed, 86 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-18.12.3-cursor.patch 
b/kde-apps/konsole/files/konsole-18.12.3-cursor.patch
new file mode 100644
index 00..f9960340b9
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-18.12.3-cursor.patch
@@ -0,0 +1,84 @@
+From eccfb1f62bbf67ebffee11e241bd05757b826ff1 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer 
+Date: Mon, 4 Mar 2019 09:59:45 -0500
+Subject: Fix ibeam and underline cursor rendering
+
+Summary:
+Since anti-aliasing was enabled in the painter, coordinates need to
+be shifted half a pixel so that they align with the pixel grid,
+otherwise the result gets "blurred" due to the anti-aliasing.
+And as parts of the blurred shape leak outside the cursor rectangle,
+this also leaves artifacts when the cursor moves or blinks as these
+parts are not cleared.
+
+This is basically the same as commit
+e7085310d6d594823d0ed491fa8bdbd99dec4932 for the
+standard block cursor.
+
+BUG: 402589
+
+Test Plan:
+- Switch cursor shape to "I-Beam" or "Underline" in the "Advanced"
+profile settings
+
+The cursors are a single line again now, before they were blurred by
+anti-aliasing.
+
+Screenshots:
+Before:
+{F6656366}
+{F6656370}
+
+After:
+{F6656371}
+{F6656373}
+
+Also, there are no more artifacts when the cursor is moved or
+cursor blinking is enabled.
+
+Reviewers: #konsole, hindenburg
+
+Reviewed By: #konsole, hindenburg
+
+Subscribers: hindenburg, konsole-devel
+
+Tags: #konsole
+
+Differential Revision: https://phabricator.kde.org/D19513
+---
+ src/TerminalDisplay.cpp | 18 ++
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index 543b897..397422c 100644
+--- a/src/TerminalDisplay.cpp
 b/src/TerminalDisplay.cpp
+@@ -716,16 +716,18 @@ void TerminalDisplay::drawCursor(QPainter& painter,
+ }
+ }
+ } else if (_cursorShape == Enum::UnderlineCursor) {
+-painter.drawLine(cursorRect.left(),
+- cursorRect.bottom(),
+- cursorRect.right(),
+- cursorRect.bottom());
++QLineF line(cursorRect.left() + 0.5,
++cursorRect.bottom() - 0.5,
++cursorRect.right() - 0.5,
++cursorRect.bottom() - 0.5);
++painter.drawLine(line);
+ 
+ } else if (_cursorShape == Enum::IBeamCursor) {
+-painter.drawLine(cursorRect.left(),
+- cursorRect.top(),
+- cursorRect.left(),
+- cursorRect.bottom());
++QLineF line(cursorRect.left() + 0.5,
++cursorRect.top() + 0.5,
++cursorRect.left() + 0.5,
++cursorRect.bottom() - 0.5);
++painter.drawLine(line);
+ }
+ }
+ 
+-- 
+cgit v1.1

diff --git a/kde-apps/konsole/konsole-18.12.3.ebuild 
b/kde-apps/konsole/konsole-18.12.3.ebuild
index 69ba89156d..65dd4d2ac6 100644
--- a/kde-apps/konsole/konsole-18.12.3.ebuild
+++ b/kde-apps/konsole/konsole-18.12.3.ebuild
@@ -55,3 +55,5 @@ src_configure() {
 
kde5_src_configure
 }
+
+PATCHES=( "${FILESDIR}/${P}-cursor.patch" ) # bug 673766

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

2018-02-07 Thread Andreas Sturmlechner 
commit: 140d0b7b372c6c9060be89e07959aa017869f7c7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb  7 16:02:45 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb  8 00:14:07 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=140d0b7b

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.2.ebuild|  2 +
 kde-apps/konsole/konsole-17.12.49..ebuild  |  2 +
 3 files changed, 58 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 00..37049b9b2f
--- /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.2.ebuild 
b/kde-apps/konsole/konsole-17.12.2.ebuild
index c091c44e38..13661d1d26 100644
--- a/kde-apps/konsole/konsole-17.12.2.ebuild
+++ b/kde-apps/konsole/konsole-17.12.2.ebuild
@@ -47,6 +47,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-17.12.1-libinput-pixeldelta.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)

diff --git a/kde-apps/konsole/konsole-17.12.49..ebuild 
b/kde-apps/konsole/konsole-17.12.49..ebuild
index da3754de86..91bdb3a97d 100644
--- a/kde-apps/konsole/konsole-17.12.49..ebuild
+++ b/kde-apps/konsole/konsole-17.12.49..ebuild
@@ -47,6 +47,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-17.12.1-libinput-pixeldelta.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)

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

2015-01-19 Thread Johannes Huber 
commit: 81a470b4a879e35b359566beb0d588b4ffa97d42
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Mon Jan 19 00:29:45 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Jan 19 21:56:19 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=81a470b4

[kde-apps/konsole] Make tests optional

---
 .../files/konsole--tests-optional.patch| 27 ++
 kde-apps/konsole/konsole-.ebuild   |  4 
 2 files changed, 31 insertions(+)

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

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 76f56c9..fe49ed6 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -5,6 +5,8 @@
 EAPI=5
 
 KDE_HANDBOOK=true
+KDE_TEST=true
+VIRTUALX_REQUIRED=test
 inherit kde5
 
 DESCRIPTION=KDE's terminal emulator
@@ -46,6 +48,8 @@ RDEPEND=${DEPEND}
!kde-base/konsole:4
 
 
+PATCHES=( ${FILESDIR}/${PN}--tests-optional.patch )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)