diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2024-12-04 19:48:34 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-12-11 00:45:34 +0100 |
commit | 0b494d55e4577817a703a77ba87a23eda2088ca7 (patch) | |
tree | 4a2aff586c75e63adbd1152efb8659558c78fbfb /kde-plasma | |
parent | kde-plasma/plasma-welcome: drop 6.1.5 (diff) | |
download | gentoo-0b494d55e4577817a703a77ba87a23eda2088ca7.tar.gz gentoo-0b494d55e4577817a703a77ba87a23eda2088ca7.tar.bz2 gentoo-0b494d55e4577817a703a77ba87a23eda2088ca7.zip |
kde-plasma/plasma-workspace: drop 6.1.5-r3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma')
6 files changed, 0 insertions, 389 deletions
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 540c4715b0b8..ad5e9d22c215 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-6.1.5.tar.xz 19305196 BLAKE2B 4eb75be1404d84519fabdb148accbeb48227aebd2fadeee5c27ba37dc158685b8bf9283f41172dff86dbe07ffe47a62097f873e907dd44ada61a53b3dd1f04b8 SHA512 1b68ddb1d287733ec16900a14b56bf1dbdfb9bce0d10666c1a710612dee6cc786629ea0a924627d58f1268a9594e3bfae587d57bcd7c926bf48b8e914c5d9238 DIST plasma-workspace-6.2.4.tar.xz 19140364 BLAKE2B 5249e1889ddb540b000287e425d297827f7e23e54b236d47b91ab6f6c0a48afb61adb43a1851a7803dad795f0d767ddf30fac9ce282f650718a8bbc8608fff05 SHA512 f260e00c5e2de0485e53f98956578d1b47810b60f913c8d10678edb4d6d79935300b0017514cd79c492eeac903d2ee3fd6ba20a77cd27e0ef12811d4361edc1a diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-p-b-i-wayland-crashes.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-p-b-i-wayland-crashes.patch deleted file mode 100644 index ce519c0e9b7e..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-p-b-i-wayland-crashes.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5751ca2b246b1d43886da13a57539df43793ac8f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven@kde.org> -Date: Sat, 14 Sep 2024 14:02:26 +0200 -Subject: [PATCH] libtaskmanager/waylandtasksmodel: disconnect from - parentWindowChanged in dtor - -As windows destruction might happen in any order, destruction of parent window of -of transient ones will trigger their parentWindowChanged event. - -BUG: 488653 -(cherry picked from commit 561646763d994288d771b0efaa9b2a3e45e810fa) ---- - libtaskmanager/waylandtasksmodel.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libtaskmanager/waylandtasksmodel.cpp b/libtaskmanager/waylandtasksmodel.cpp -index 4081b16edf2..85778bc6d59 100644 ---- a/libtaskmanager/waylandtasksmodel.cpp -+++ b/libtaskmanager/waylandtasksmodel.cpp -@@ -845,7 +845,12 @@ WaylandTasksModel::WaylandTasksModel(QObject *parent) - d->init(); - } - --WaylandTasksModel::~WaylandTasksModel() = default; -+WaylandTasksModel::~WaylandTasksModel() -+{ -+ for (auto &window : d->windows) { -+ QObject::disconnect(window.get(), &PlasmaWindow::parentWindowChanged, this, nullptr); -+ } -+} - - QVariant WaylandTasksModel::data(const QModelIndex &index, int role) const - { --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-systemsettings-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-systemsettings-crash.patch deleted file mode 100644 index b199921e9dc1..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-systemsettings-crash.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e81dde14d9f9c98bdce4cc5536b105a6adc3613b Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Sun, 1 Sep 2024 14:24:08 +0200 -Subject: [PATCH] [krdb] Don't manually process events when applying Qt - settings - -Manually processing events like this can cause unpredictable behavior and for QML apps like systemsettings cause crashes - -It's also not necessary, the config we are applying isn't used by systemsettings/modern Qt apps anyway - -BUG: 486922 - -SENTRY: SYSTEMSETTINGS-3RP -(cherry picked from commit aaf0cc601a7a9ed455e2a61906ed46b6e275f007) ---- - kcms/krdb/krdb.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp -index eefa0d36a0..39bcb7317d 100644 ---- a/kcms/krdb/krdb.cpp -+++ b/kcms/krdb/krdb.cpp -@@ -484,7 +484,6 @@ void runRdb(unsigned int flags) - applyQtSettings(kglobalcfg, *settings); // For kcmstyle - - delete settings; -- QCoreApplication::processEvents(); - #if HAVE_X11 - if (qApp->platformName() == QLatin1String("xcb")) { - // We let KIPC take care of ourselves, as we are in a KDE app with -@@ -514,7 +513,6 @@ void runRdb(unsigned int flags) - PropModeReplace, - (unsigned char *)stamp.buffer().data(), - stamp.buffer().size()); -- qApp->processEvents(); - } - #endif - } --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch deleted file mode 100644 index 925be20afcc9..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4dff1973116597210cf9fb1c102e5c9433d13b1d Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Sat, 14 Sep 2024 13:22:05 +0000 -Subject: [PATCH] startkde: Fix wayland session restore saving - -When we added manual saving support to plasma-shutdown a guard was -changed in the normal shutdown path. This guard was wrong, we want to -check we're in the restorePreviousLogout path here. - -This amends 804976c5ecec1fbf5f6e7e09970a8269bdf748d2 - -BUG: 436318 ---- - startkde/plasma-shutdown/shutdown.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/startkde/plasma-shutdown/shutdown.cpp b/startkde/plasma-shutdown/shutdown.cpp -index 11c002bcd80..ab93cca6ef7 100644 ---- a/startkde/plasma-shutdown/shutdown.cpp -+++ b/startkde/plasma-shutdown/shutdown.cpp -@@ -84,7 +84,7 @@ void Shutdown::ksmServerComplete() - { - const KConfigGroup c(KSharedConfig::openConfig(QStringLiteral("ksmserverrc")), QStringLiteral("General")); - -- if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restoreSavedSession")) { -+ if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restorePreviousLogout")) { - // Now record windows that are not session managed - int ret = QProcess::execute(QStringLiteral(PLASMA_FALLBACK_SESSION_SAVE_BIN)); - if (ret) { --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-x11-logout-w-session-restore.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-x11-logout-w-session-restore.patch deleted file mode 100644 index 052ff52bba38..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-x11-logout-w-session-restore.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9bd2dcc8a785d977cdf67a7cbb467423803e3327 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Fri, 20 Sep 2024 14:36:11 +0200 -Subject: [PATCH] startkde: Disable session management in our session - management - -We have two types of session restore, ksmserver for ICE clients and a -small fallback app that runs after ksmserver for any stragglers. - -This fallback app is a gui application, as such it will try and connect -to ksmserver. This isn't useful and can cause a block. - -BUG: 488853 ---- - startkde/session-restore/restore.cpp | 1 + - startkde/session-restore/save.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/startkde/session-restore/restore.cpp b/startkde/session-restore/restore.cpp -index 2d86215a6f..aecc179139 100644 ---- a/startkde/session-restore/restore.cpp -+++ b/startkde/session-restore/restore.cpp -@@ -22,6 +22,7 @@ using namespace Qt::StringLiterals; - - int main(int argc, char *argv[]) - { -+ QCoreApplication::setAttribute(Qt::AA_DisableSessionManager); - QGuiApplication a(argc, argv); - a.setDesktopSettingsAware(false); - a.setApplicationName(u"plasmasessionrestore"_s); -diff --git a/startkde/session-restore/save.cpp b/startkde/session-restore/save.cpp -index a2a0fb2086..5e1473ed0b 100644 ---- a/startkde/session-restore/save.cpp -+++ b/startkde/session-restore/save.cpp -@@ -29,6 +29,7 @@ using namespace Qt::StringLiterals; - - int main(int argc, char *argv[]) - { -+ QCoreApplication::setAttribute(Qt::AA_DisableSessionManager); - QGuiApplication::setDesktopFileName(u"plasma-fallback-session-save"_s); - QGuiApplication a(argc, argv); - a.setApplicationName(u"plasmasessionrestore"_s); --- -GitLab - diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r3.ebuild deleted file mode 100644 index acf9d5b28e63..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r3.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# 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.5.0 -PVCUT=$(ver_cut 1-3) -QTMIN=6.7.2 -inherit ecm plasma.kde.org - -DESCRIPTION="KDE Plasma workspace" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="amd64 arm64 ~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,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.13.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 - !<kde-plasma/plasma-desktop-5.27.0:5 - !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-${PVCUT}:6 - >=kde-plasma/kdesu-gui-${PVCUT}:* - >=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] ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 - "${FILESDIR}/${P}-fix-wayland-session-restore-saving.patch" # KDE-bug 436318 - "${FILESDIR}/${P}-fix-x11-logout-w-session-restore.patch" # bug 938925, KDE-bug 488853 - "${FILESDIR}/${P}-fix-systemsettings-crash.patch" # KDE-bug 486922 - "${FILESDIR}/${P}-fix-p-b-i-wayland-crashes.patch" # in 6.2; KDE-bug 488653 -) - -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" -} |