commit: 6663a2bf1415d295444b5500d6911ee6e6f15727 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Sep 15 14:25:59 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Sep 15 14:25:59 2023 +0000 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 <asturm <AT> gentoo.org> .../konsole-23.08.1-drop-unused-X11-dep.patch | 30 ++++++++++++++++++++++ kde-apps/konsole/konsole-23.08.49.9999.ebuild | 11 ++------ kde-apps/konsole/konsole-9999.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 0000000000..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 <[email protected]> +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 <[email protected]> +--- + 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.9999.ebuild b/kde-apps/konsole/konsole-23.08.49.9999.ebuild index 2a1195cc09..497c0bb398 100644 --- a/kde-apps/konsole/konsole-23.08.49.9999.ebuild +++ b/kde-apps/konsole/konsole-23.08.49.9999.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-9999.ebuild b/kde-apps/konsole/konsole-9999.ebuild index 2a1195cc09..497c0bb398 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="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
