From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E238B158287 for ; Thu, 15 May 2025 22:14:30 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id C8056343873 for ; Thu, 15 May 2025 22:14:30 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 651421103DD; Thu, 15 May 2025 22:14:22 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 5AC5F1103DD for ; Thu, 15 May 2025 22:14:22 +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 1763C34384E for ; Thu, 15 May 2025 22:14:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F06D1A2B for ; Thu, 15 May 2025 22:14:20 +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: <1747345482.d70be269740b6ea863aed91bed2fd7544085a2c1.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d70be269740b6ea863aed91bed2fd7544085a2c1 X-VCS-Branch: master Date: Thu, 15 May 2025 22:14:20 +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: 7af8036a-ed13-4710-bfb4-2c88e6739608 X-Archives-Hash: c3b124ea6dd5d83289a2b0f6ee144057 commit: d70be269740b6ea863aed91bed2fd7544085a2c1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 15 20:36:17 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 15 21:44:42 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d70be269 kde-plasma/plasma-workspace: Add IUSE X See also: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/5420 Upstream commits: 23cd44f00304a477275f7eea24c29330799228e7 03c2b1860aa2d19996709eb606141c3baed97479 Signed-off-by: Andreas Sturmlechner gentoo.org> .../plasma-workspace/plasma-workspace-9999.ebuild | 49 ++++++++++++---------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 6258bca205..47e280c39a 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -15,8 +15,9 @@ LICENSE="GPL-2" # TODO: CHECK SLOT="6" KEYWORDS="" IUSE="appstream +calendar +fontconfig networkmanager +policykit screencast -+semantic-desktop systemd telemetry +wallpaper-metadata" ++semantic-desktop systemd telemetry +wallpaper-metadata +X" +REQUIRED_USE="fontconfig? ( X )" RESTRICT="test" # kde-frameworks/kwindowsystem[X]: Uses KX11Extras @@ -26,7 +27,7 @@ COMMON_DEPEND=" dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qt5compat-${QTMIN}:6[qml] - >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,libinput,network,opengl,sql,sqlite,widgets,xml] + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,libinput,network,opengl,sql,sqlite,widgets,xml] >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] >=dev-qt/qtlocation-${QTMIN}:6 >=dev-qt/qtpositioning-${QTMIN}:6 @@ -68,12 +69,11 @@ COMMON_DEPEND=" >=kde-frameworks/kunitconversion-${KFMIN}:6 >=kde-frameworks/kwallet-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X?] >=kde-frameworks/kxmlgui-${KFMIN}:6 >=kde-frameworks/prison-${KFMIN}:6[qml] >=kde-frameworks/solid-${KFMIN}:6 >=kde-plasma/breeze-${KDE_CATV}:6 - >=kde-plasma/kscreenlocker-${KDE_CATV}:6 >=kde-plasma/kwayland-${KDE_CATV}:6 >=kde-plasma/kwin-${KDE_CATV}:6 >=kde-plasma/layer-shell-qt-${KDE_CATV}:6 @@ -89,37 +89,42 @@ COMMON_DEPEND=" sys-apps/dbus sys-libs/zlib virtual/libudev:= - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util appstream? ( >=dev-libs/appstream-1[qt6] ) calendar? ( >=kde-frameworks/kholidays-${KFMIN}:6 ) - fontconfig? ( - media-libs/fontconfig - x11-libs/libXft - x11-libs/xcb-util-image - ) policykit? ( virtual/libcrypt:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 ) systemd? ( sys-apps/systemd:= ) telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) wallpaper-metadata? ( kde-apps/libkexiv2:6 ) + X? ( + >=dev-qt/qtbase-${QTMIN}:6=[X] + >=kde-plasma/kscreenlocker-${KDE_CATV}:6 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXtst + x11-libs/xcb-util + fontconfig? ( + media-libs/fontconfig + x11-libs/libXft + x11-libs/xcb-util-image + ) + ) " DEPEND="${COMMON_DEPEND} >=dev-libs/plasma-wayland-protocols-1.18.0 dev-libs/qcoro >=dev-qt/qtbase-${QTMIN}:6[concurrent] - x11-base/xorg-proto - fontconfig? ( x11-libs/libXrender ) test? ( screencast? ( >=media-video/pipewire-0.3:* ) ) + X? ( + fontconfig? ( x11-libs/libXrender ) + x11-base/xorg-proto + ) " RDEPEND="${COMMON_DEPEND} !kde-plasma/libkworkspace:5 @@ -178,7 +183,7 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DWITH_X11=ON # TODO: broken upstream, fix it if you can + -DWITH_X11=$(usex X) # remember to submit patches with bugs -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged -DGLIBC_LOCALE_GEN=OFF -DGLIBC_LOCALE_PREGENERATED=$(usex elibc_glibc)