commit: 86b9e71ff93cf85b3ec79cca91868c6f35ec9cbe Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Sep 25 19:15:42 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Sep 26 10:17:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b9e71f
kde-plasma/plasma-workspace: drop 6.3.6 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/plasma-workspace/Manifest | 1 - .../plasma-workspace-6.3.5-colorsapplicator.patch | 41 ---- .../files/plasma-workspace-6.3.5-gcc-16.patch | 30 --- .../plasma-workspace/plasma-workspace-6.3.6.ebuild | 217 --------------------- 4 files changed, 289 deletions(-) diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 19449a71d09b..b06d5df176e3 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-6.3.6.tar.xz 19107548 BLAKE2B 640cb0fe555304e80109a6887e0bf769ea32dd4816cdf3c59392c00be6c1484871f3184d05619acee6863f24a2bc3bc51cdfddf4c16096d47bb707022decfc47 SHA512 4d29d5f36ccc69626d2b7faf6848ead497fc273c49f8ae0ec8d517200db8b38a0a69a334a6352e71b9ccfa45f955d1612c7f073c7b88d0c1d3f745916e19d268 DIST plasma-workspace-6.4.5.tar.xz 20834364 BLAKE2B f99248273faa60f0e4b42bf3aa81d7e10c8f932a919581fa3cb9bb83d1e8fc1ad344c9c8b6ac11f9c0958c373f27582d31453d78c6f6e4170bcbdd172b5a77fd SHA512 5d267605783b28e7ab46c02f78c7584a516c311ad16203db56bd77fb752d767462d8a78d65955082086af8ae0dcbd35a5678c0cd94d55e2d67a08d57ac187534 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.5-colorsapplicator.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.5-colorsapplicator.patch deleted file mode 100644 index e12fb5c532e4..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.5-colorsapplicator.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 32a7cf2a06e16d58cbb8c4a0ab08a0832fa377d4 Mon Sep 17 00:00:00 2001 -From: Akseli Lahtinen <[email protected]> -Date: Mon, 5 May 2025 21:14:08 +0300 -Subject: [PATCH] colorsapplicator: Don't allow extended RGB from - OKLabToLinearSRGB - -When reading the rgb values in OKLabToLinearSRGB, there is a chance, -when colors are tinted, for QColor::fromRgbF to return Extended RGB -colors, which can invert. -Read more at -https://doc.qt.io/qt-6/qcolor.html#the-extended-rgb-color-model - -Instead, just make sure we always return regular RGB values. - -BUG: 503394 -FIXED-IN: 6.3 - - -(cherry picked from commit 4329b16a96a47c310e2d2a5da6f7543f94b6d3ec) - -Co-authored-by: Akseli Lahtinen <[email protected]> ---- - kcms/colors/colorsapplicator.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kcms/colors/colorsapplicator.cpp b/kcms/colors/colorsapplicator.cpp -index 6f0eeffe66..7d28889de6 100644 ---- a/kcms/colors/colorsapplicator.cpp -+++ b/kcms/colors/colorsapplicator.cpp -@@ -100,7 +100,7 @@ QColor OKLabToLinearSRGB(LAB lab) - const auto g = -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s; - const auto b = -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s; - -- return QColor::fromRgbF(r, g, b); -+ return QColor::fromRgbF(r, g, b).toRgb(); - } - - auto toLinearSRGB = QColorSpace(QColorSpace::SRgb).transformationToColorSpace(QColorSpace::SRgbLinear); --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.5-gcc-16.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.5-gcc-16.patch deleted file mode 100644 index dbef96f26498..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.5-gcc-16.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://invent.kde.org/plasma/plasma-workspace/-/commit/73e7404f - -From 73e7404f7da95c0e1be94fc49ffa7ea3e3b27312 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Sun, 1 Jun 2025 03:45:34 +0100 -Subject: [PATCH] dataengines: add missing <mutex> include - -This shows up with recent GCC 16 trunk. It's fixed on master with -fe0dbb13cd4263a75ff1c226f8a49ce8a09131e6 but that change is a bit big, -so let's do the minimal thing here for the branch. ---- - dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp -index 32ec4b02e4f..c6140c572c5 100644 ---- a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp -+++ b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp -@@ -11,6 +11,8 @@ - - #include "ion_bbcukmetdebug.h" - -+#include <mutex> -+ - #include <KIO/TransferJob> - #include <KLocalizedString> - #include <KUnitConversion/Converter> --- -GitLab - diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.3.6.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.3.6.ebuild deleted file mode 100644 index a477e6840e81..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-6.3.6.ebuild +++ /dev/null @@ -1,217 +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.10.0 -QTMIN=6.8.1 -inherit ecm plasma.kde.org xdg - -DESCRIPTION="KDE Plasma workspace" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="appstream +calendar +fontconfig networkmanager +policykit screencast -+semantic-desktop systemd telemetry +wallpaper-metadata" - -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,sqlite,wayland,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] - >=dev-qt/qtpositioning-${QTMIN}:6 - >=dev-qt/qtshadertools-${QTMIN}:6 - >=dev-qt/qtsvg-${QTMIN}:6 - >=kde-frameworks/karchive-${KFMIN}:6 - >=kde-frameworks/kauth-${KFMIN}:6 - >=kde-frameworks/kbookmarks-${KFMIN}:6 - >=kde-frameworks/kcmutils-${KFMIN}:6 - >=kde-frameworks/kcolorscheme-${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 - ) - 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 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.16.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:* ) ) -" -RDEPEND="${COMMON_DEPEND} - !kde-plasma/libkworkspace:5 - !<kde-plasma/plasma-desktop-5.27.0:5 - !<kde-plasma/xdg-desktop-portal-kde-6.1.90 - !kde-plasma/xembed-sni-proxy:* - app-text/iso-codes - dev-libs/kirigami-addons:6 - >=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 - policykit? ( sys-apps/accountsservice ) - screencast? ( >=media-video/pipewire-0.3:* ) -" -RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )" -BDEPEND=" - >=dev-qt/qtbase-${QTMIN}:6[wayland] - >=dev-util/wayland-scanner-1.19.0 - >=kde-frameworks/kcmutils-${KFMIN}:6 - virtual/pkgconfig - test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor(+)] ) -" -BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )" - -PATCHES=( - "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 -) - -src_prepare() { - ecm_src_prepare - - cmake_comment_add_subdirectory login-sessions - - 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 networkmanager 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 () { - xdg_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" -}
