From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 12E0D158089 for ; Fri, 15 Sep 2023 16:46:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF26A2BC022; Fri, 15 Sep 2023 16:46:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B04D72BC022 for ; Fri, 15 Sep 2023 16:46:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 738FD335D2E for ; Fri, 15 Sep 2023 16:46:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D954711A9 for ; Fri, 15 Sep 2023 16:46:14 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1694787959.6663a2bf1415d295444b5500d6911ee6e6f15727.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/konsole/files/, kde-apps/konsole/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch kde-apps/konsole/konsole-23.08.49.9999.ebuild kde-apps/konsole/konsole-9999.ebuild X-VCS-Directories: kde-apps/konsole/files/ kde-apps/konsole/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6663a2bf1415d295444b5500d6911ee6e6f15727 X-VCS-Branch: master Date: Fri, 15 Sep 2023 16:46:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5c73f5fb-25bd-4b78-975a-995be292f9de X-Archives-Hash: 5e4b5e00a1eca713996a6a9b242df432 commit: 6663a2bf1415d295444b5500d6911ee6e6f15727 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Sep 15 14:25:59 2023 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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.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