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 66F5B1581D3 for ; Sat, 1 Jun 2024 07:06:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF9D1E2A23; Sat, 1 Jun 2024 07:06:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 96A77E2A23 for ; Sat, 1 Jun 2024 07:06:18 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF40033BE32 for ; Sat, 1 Jun 2024 07:06:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58804175C for ; Sat, 1 Jun 2024 07:06:16 +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: <1717225569.b104fb273630c17a714ba3a31bfe86f4ba3c8c5c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-workspace/Manifest kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r1.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b104fb273630c17a714ba3a31bfe86f4ba3c8c5c X-VCS-Branch: master Date: Sat, 1 Jun 2024 07:06:16 +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: 42c11c4f-865e-49c0-bd65-c0f9a2036b2f X-Archives-Hash: 19477eb52bed04ffc4d9948076900762 commit: b104fb273630c17a714ba3a31bfe86f4ba3c8c5c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 1 07:00:37 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 1 07:06:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b104fb27 kde-plasma/plasma-workspace: Bump to snapshot w/ multiple 6.1 fixes Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-workspace/Manifest | 1 + .../plasma-workspace-6.0.90-r1.ebuild | 232 +++++++++++++++++++++ 2 files changed, 233 insertions(+) diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 12b34f8c9981..fafe6ee95465 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,3 +1,4 @@ DIST plasma-workspace-5.27.11.1.tar.xz 19490624 BLAKE2B eef62c13407073aea855878b0e8a109b2ea4532e9bffe97903e7163747b56ac01d881d9649c6a4d220a569e6fcaa9e7fb34996c8bb9a3f0abd5f6fa2e73abc47 SHA512 72bb17ba874be28ed15eb8536caa00cf0fb7777ad76728107ea8baa6216c5655a595d1364ec146f4c33b876c239c249bada9f75e3b0604d29de5f06bd327d006 DIST plasma-workspace-5.27.11.tar.xz 19486864 BLAKE2B 41da7e904b08e6c6dc7600c601183a9b600e68f122e1f9aae3dfec468adc1eff377566aadc52084648840be227106e7e0aa8cf48ffc7301a6853dc1c0ad92d4b SHA512 d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443 DIST plasma-workspace-6.0.90.tar.xz 19197412 BLAKE2B abb3723da361cb1a442a2be18acf04598f742798c38009ed0cb5f9057fa769fe13cfe34a383ec1d0dfafb11c72ab36148635dae5a9f5cc46da5e18670e413b41 SHA512 43315418846fa14839fb160e05fc52bc724b6759c8c08737c6cf0d60ccec1a8dd4da451138d10845e33bbd80f171140892f9798d0d09d5d51343bf8d65f854cf +DIST plasma-workspace-6.0.90_p20240601-58ced80a.tar.gz 26020494 BLAKE2B f58ea1856d8697f5d9cd4bbd7b8d0d39a1138f1a921d206ba321bf735af797b2a1115970b8143d563c6e1ef2d75ff14612e8126d99de91272d2a55c7880e61c2 SHA512 4e7fa32ee6d182c34988b3ba23f7bd9a478804617f5cfac95fbb2c9c775e7c36d4f8f7a5913ac2cd1ad6de2b28255effef282faf853e946e759188ea66ac2903 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r1.ebuild new file mode 100644 index 000000000000..ae655f845e87 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r1.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KFMIN=6.2.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.1 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma workspace" +SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}_p20240601-58ced80a.tar.gz" +S="${WORKDIR}/${PN}-58ced80a7b48d85b7a7743195479dc35ad1889c6" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="appstream +calendar +fontconfig geolocation gps +policykit +screencast +semantic-desktop systemd telemetry +wallpaper-metadata" + +REQUIRED_USE="gps? ( geolocation )" +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras +# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h +# slot op: various private QtWaylandClient headers +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,sql,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=dev-qt/qtshadertools-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qtwayland-${QTMIN}:6= + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdeclarative-${KFMIN}:6 + >=kde-frameworks/kded-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/ktexteditor-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kunitconversion-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=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-${PVCUT}:6 + >=kde-plasma/kscreenlocker-${PVCUT}:6 + >=kde-plasma/kwayland-${PVCUT}:6 + >=kde-plasma/kwin-${PVCUT}:6 + >=kde-plasma/layer-shell-qt-${PVCUT}:6 + >=kde-plasma/libkscreen-${PVCUT}:6 + >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/plasma-activities-stats-${PVCUT}:6 + >=kde-plasma/plasma5support-${PVCUT}:6 + media-libs/libcanberra + >=media-libs/phonon-4.12.0[qt6] + sci-libs/libqalculate:= + 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 + ) + geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) + gps? ( sci-geosciences/gpsd ) + policykit? ( + >=sys-auth/polkit-qt-0.175[qt6] + virtual/libcrypt:= + ) + screencast? ( + >=dev-qt/qtbase-${QTMIN}:6=[opengl] + >=kde-plasma/kpipewire-${PVCUT}:6 + media-libs/libglvnd + >=media-video/pipewire-0.3:= + x11-libs/libdrm + ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 ) + systemd? ( sys-apps/systemd:= ) + telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) + wallpaper-metadata? ( kde-apps/libkexiv2:6 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.6.0 + dev-libs/qcoro[dbus] + >=dev-qt/qtbase-${QTMIN}:6[concurrent] + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) +" +RDEPEND="${COMMON_DEPEND} + !kde-plasma/libkworkspace:5 + !=dev-qt/qttools-${QTMIN}:*[qdbus] + kde-apps/kio-extras:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kquickcharts-${KFMIN}:6 + >=kde-plasma/kactivitymanagerd-${PVCUT}:6 + >=kde-plasma/milou-${PVCUT}:6 + >=kde-plasma/plasma-integration-${PVCUT}:6 + sys-apps/dbus + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrdb + x11-apps/xsetroot + policykit? ( sys-apps/accountsservice ) +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + >=dev-util/wayland-scanner-1.19.0 + >=kde-frameworks/kcmutils-${KFMIN}:6 + virtual/pkgconfig + test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor] ) +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" + +PATCHES=( + "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 +) + +src_prepare() { + ecm_src_prepare + + # TODO: try to get a build switch upstreamed + if ! use screencast; then + ecm_punt_bogus_dep KPipeWire + sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if use geolocation; then + use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \ + -i dataengines/geolocation/CMakeLists.txt || die + fi + + if ! use policykit; then + cmake_run_in kcms cmake_comment_add_subdirectory users + fi + + if ! use fontconfig; then + ecm_punt_bogus_dep XCB IMAGE + sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if ! use systemd; then + sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DWITH_X11=ON # TODO: broken upstream, fix it if you can + -DGLIBC_LOCALE_GEN=$(usex policykit) + $(cmake_use_find_package appstream AppStreamQt) + $(cmake_use_find_package calendar KF6Holidays) + $(cmake_use_find_package fontconfig Fontconfig) + $(cmake_use_find_package geolocation KF6NetworkManagerQt) + $(cmake_use_find_package semantic-desktop KF6Baloo) + $(cmake_use_find_package telemetry KF6UserFeedback) + $(cmake_use_find_package wallpaper-metadata KExiv2Qt6) + ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + + # default startup and shutdown scripts + insinto /etc/xdg/plasma-workspace/env + doins "${FILESDIR}"/10-agent-startup.sh + + insinto /etc/xdg/plasma-workspace/shutdown + doins "${FILESDIR}"/10-agent-shutdown.sh + fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh +} + +pkg_postinst () { + ecm_pkg_postinst + + elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," + elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" + elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" +}