From ac3eeb9563df5232dfa396d8b73d47645a65dd2f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 24 Apr 2025 23:14:05 +0200 Subject: [PATCH] kde-plasma/plasma-workspace: drop 6.2.5 Signed-off-by: Andreas Sturmlechner --- kde-plasma/plasma-workspace/Manifest | 1 - ...space-6.2.5-cameraindicator-optional.patch | 118 --------- kde-plasma/plasma-workspace/metadata.xml | 1 - .../plasma-workspace-6.2.5.ebuild | 225 ------------------ 4 files changed, 345 deletions(-) delete mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-6.2.5-cameraindicator-optional.patch delete mode 100644 kde-plasma/plasma-workspace/plasma-workspace-6.2.5.ebuild diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 5c21bb02b701e..66342136e2d1d 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-6.2.5.tar.xz 19136676 BLAKE2B 38d211247cfeee10df6f4fff5cbef91d9a7daa760033e29743e1c78577baf876c8c416d0a84e45efb5d6bab007965b3cd8c6d1feec7749bd4dd8cb24df4a71ee SHA512 228d183c9561cbf3d5630582b80c687868eaf420310010bd417de0e9f0ababaa4767805c1ce84f4eb3539ea32bfe6c2849b70d7ddd133f6095ab71f94f854dea DIST plasma-workspace-6.3.4.tar.xz 19153368 BLAKE2B 2f3e09a1698af00c24fd143b5c54d45ba2249e72db5fab279e260305026189c75983e08befae2b37f5a488bc3cd4cf89e07b3257ad5242fe26196c64a71982ce SHA512 62fc334b03796bb87fdda627ad2b4914c0832f43a93e9ae82c694c5c08d1373b4a0a5cbe3b421c2bda2fd36bf0ae52131143d9049c13be8c6c098599b7b4b226 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.2.5-cameraindicator-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.2.5-cameraindicator-optional.patch deleted file mode 100644 index 3c8a8843c2575..0000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.2.5-cameraindicator-optional.patch +++ /dev/null @@ -1,118 +0,0 @@ -From a64403d26fc7dd445b726aa4465825585c2ac7e0 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 12 Oct 2024 22:56:11 +0200 -Subject: [PATCH] Introduce BUILD_CAMERAINDICATOR option, default depending on - PipeWire_FOUND - -... but overrideable even if not, since PipeWire is no build time requirement. -- Drop unused Libdrm dependency -- Drop unused KPipeWire dependency -- Only autotests link to PipeWire, so only bail out there if not found - -Signed-off-by: Andreas Sturmlechner -(cherry picked from commit b2a5a2caf1c1be2acbf9ce6c3c25f1c82d4c8792) -(cherry picked from commit 039315ab9f6360c12dfbfc5f7b3dbf5d294175c7) -(cherry picked from commit 33733d5edceb35a8b1b2626a3217bd14c141f199) -(cherry picked from commit b2a10a33aa5860abd3ba35f7b450f5ca16401887) ---- - CMakeLists.txt | 18 +++++++++--------- - applets/CMakeLists.txt | 4 +++- - applets/cameraindicator/CMakeLists.txt | 3 --- - .../cameraindicator/autotests/CMakeLists.txt | 4 ++++ - 4 files changed, 16 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d1ac1bdccd..333a4c64c7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,6 +42,15 @@ include(ECMGenerateQmlTypes) - include(ECMDeprecationSettings) - include(ECMQmlModule) - -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(PipeWire QUIET IMPORTED_TARGET libpipewire-0.3) -+add_feature_info(PipeWire PipeWire_FOUND "Required for camera indicator applet and Wayland screencasting testing") -+set(BUILD_CAMERAINDICATOR_DEFAULT OFF) -+if(PipeWire_FOUND) -+ set(BUILD_CAMERAINDICATOR_DEFAULT ON) -+endif() -+option(BUILD_CAMERAINDICATOR "Build the camera indicator Plasma applet" ${BUILD_CAMERAINDICATOR_DEFAULT}) -+ - find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Svg Widgets Quick QuickWidgets Concurrent Network Core5Compat DBus ShaderTools Positioning) - find_package(QCoro6 REQUIRED COMPONENTS Core DBus) - find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS -@@ -64,7 +73,6 @@ if (BUILD_TESTING) - endif() - - find_package(KF6KDED CONFIG REQUIRED) --find_package(KPipeWire CONFIG) - - find_package(KF6NetworkManagerQt ${KF6_MIN_VERSION}) - set_package_properties(KF6NetworkManagerQt PROPERTIES DESCRIPTION "Qt wrapper for NetworkManager API" -@@ -100,7 +108,6 @@ set_package_properties(KF6Baloo PROPERTIES DESCRIPTION "File Searching" - PURPOSE "Needed for the File Search runner." - ) - --find_package(PkgConfig REQUIRED) - pkg_check_modules(QALCULATE libqalculate>2.0 REQUIRED IMPORTED_TARGET) - pkg_check_modules(DBus dbus-1 REQUIRED IMPORTED_TARGET) - -@@ -194,13 +201,6 @@ else() - set(HAVE_XFIXES 0) - endif() - --pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3) --add_feature_info(PipeWire PipeWire_FOUND "Required for Wayland screencasting") -- --if(PipeWire_FOUND) -- find_package(Libdrm REQUIRED) --endif() -- - # FreeBSD systems might have libxcrypt but their shadow equivalent doesn't use it - if(CMAKE_SYSTEM_NAME MATCHES "Linux") - pkg_check_modules(libxcrypt libxcrypt>=4) -diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt -index 6cdbd529b0..c9ab0073e8 100644 ---- a/applets/CMakeLists.txt -+++ b/applets/CMakeLists.txt -@@ -14,7 +14,9 @@ add_subdirectory(keyboardindicator) - add_subdirectory(kicker) - add_subdirectory(mediacontroller) - add_subdirectory(panelspacer) --add_subdirectory(cameraindicator) -+if(BUILD_CAMERAINDICATOR) -+ add_subdirectory(cameraindicator) -+endif() - plasma_install_package(clipboard org.kde.plasma.clipboard) - - add_subdirectory(notifications) -diff --git a/applets/cameraindicator/CMakeLists.txt b/applets/cameraindicator/CMakeLists.txt -index fb9b4c0d2c..78b9f3246b 100644 ---- a/applets/cameraindicator/CMakeLists.txt -+++ b/applets/cameraindicator/CMakeLists.txt -@@ -1,8 +1,5 @@ - # SPDX-FileCopyrightText: 2023 Fushan Wen - # SPDX-License-Identifier: BSD-3-Clause --if(NOT TARGET K::KPipeWire) -- RETURN() --endif() - plasma_install_package(package org.kde.plasma.cameraindicator) - if (BUILD_TESTING) - add_subdirectory(autotests) -diff --git a/applets/cameraindicator/autotests/CMakeLists.txt b/applets/cameraindicator/autotests/CMakeLists.txt -index 0f10f5ecbe..5611496ffa 100644 ---- a/applets/cameraindicator/autotests/CMakeLists.txt -+++ b/applets/cameraindicator/autotests/CMakeLists.txt -@@ -1,5 +1,9 @@ - # SPDX-FileCopyrightText: 2024 Fushan Wen - # SPDX-License-Identifier: BSD-3-Clause -+if(NOT TARGET PkgConfig::PipeWire) -+ return() -+endif() -+ - add_executable(pipewiremockcamera videosource.cpp) - target_link_libraries(pipewiremockcamera PkgConfig::PipeWire) - --- -2.47.1 - diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml index 64351b7458d1f..d9eff23c53eb6 100644 --- a/kde-plasma/plasma-workspace/metadata.xml +++ b/kde-plasma/plasma-workspace/metadata.xml @@ -11,7 +11,6 @@ Enable AppStream software metadata support - Enables dataengine providing location information Enable locale generation and Users KCM using sys-auth/polkit and sys-apps/accountsservice Enable screencast portal using kde-plasma/kpipewire Enable User Feedback control module for kde-plasma/systemsettings diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.2.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.2.5.ebuild deleted file mode 100644 index ff0caba9ad360..0000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-6.2.5.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -KFMIN=6.6.0 -QTMIN=6.7.2 -inherit ecm plasma.kde.org - -DESCRIPTION="KDE Plasma workspace" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" -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,opengl,sql,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] - >=dev-qt/qtpositioning-${QTMIN}:6 - >=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-${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 - >=kde-plasma/libkscreen-${KDE_CATV}:6 - >=kde-plasma/libksysguard-${KDE_CATV}:6 - >=kde-plasma/libplasma-${KDE_CATV}:6 - >=kde-plasma/plasma-activities-${KDE_CATV}:6 - >=kde-plasma/plasma-activities-stats-${KDE_CATV}:6 - >=kde-plasma/plasma5support-${KDE_CATV}:6 - media-libs/libcanberra - >=media-libs/phonon-4.12.0[qt6(+)] - sci-libs/libqalculate:= - 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 - ) - geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) - gps? ( sci-geosciences/gpsd ) - policykit? ( virtual/libcrypt:= ) - 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.14.0 - dev-libs/qcoro[dbus] - >=dev-qt/qtbase-${QTMIN}:6[concurrent] - x11-base/xorg-proto - fontconfig? ( x11-libs/libXrender ) - test? ( screencast? ( >=media-video/pipewire-0.3:* ) ) -" -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-${KDE_CATV}:6 - >=kde-plasma/kdesu-gui-${KDE_CATV}:* - >=kde-plasma/milou-${KDE_CATV}:6 - >=kde-plasma/plasma-integration-${KDE_CATV}:6 - >=kde-plasma/plasma-login-sessions-${KDE_CATV}:6 - sys-apps/dbus - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xsetroot - policykit? ( sys-apps/accountsservice ) - screencast? ( >=media-video/pipewire-0.3:* ) -" -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] ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 - "${FILESDIR}/${P}-cameraindicator-optional.patch" # in 6.3 -) - -src_prepare() { - ecm_src_prepare - - cmake_comment_add_subdirectory login-sessions - - # 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 - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged - -DGLIBC_LOCALE_GEN=OFF - -DGLIBC_LOCALE_PREGENERATED=$(usex elibc_glibc) - $(cmake_use_find_package appstream AppStreamQt) - $(cmake_use_find_package calendar KF6Holidays) - $(cmake_use_find_package fontconfig Fontconfig) - $(cmake_use_find_package geolocation KF6NetworkManagerQt) - -DBUILD_CAMERAINDICATOR=$(usex screencast) - $(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" -}