commit: 78bd9817c4965c0b54bc60a6b38d805ac2bdccd3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jul 12 17:22:34 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jul 12 17:22:34 2024 +0000 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 <asturm <AT> gentoo.org> .../konsole-23.08.1-drop-unused-X11-dep.patch | 30 ---------------------- kde-apps/konsole/konsole-9999.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..0000000000 --- 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 <ast...@gentoo.org> -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 <ast...@gentoo.org> ---- - 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-9999.ebuild b/kde-apps/konsole/konsole-9999.ebuild index f184265166..c4bc1eff91 100644 --- a/kde-apps/konsole/konsole-9999.ebuild +++ b/kde-apps/konsole/konsole-9999.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
