commit: 99a6c9cb20f32c96d9d79c7bb8fb2b01744b4acc Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 7 11:48:14 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jan 24 19:42:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a6c9cb
kde-plasma/plasma-workspace: drop 5.19.5* Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/plasma-workspace/Manifest | 1 - ....19.2-use-PlasmaExtras.PlaceholderMessage.patch | 44 ---- .../files/plasma-workspace-5.19.5-gpsd-3.21.patch | 29 --- ...-5.19.5-guard-against-no-virtual-desktops.patch | 46 ----- ...plasma-workspace-5.19.5-login-button-size.patch | 36 ---- kde-plasma/plasma-workspace/metadata.xml | 1 - .../plasma-workspace-5.19.5-r2.ebuild | 225 --------------------- 7 files changed, 382 deletions(-) diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index b318c4b031a..9d60abe75ce 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch deleted file mode 100644 index 527e199cc66..00000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch +++ /dev/null @@ -1,44 +0,0 @@ -From faef126255222f727219bf69ac2b89857dc61ab2 Mon Sep 17 00:00:00 2001 -From: Nate Graham <[email protected]> -Date: Sun, 14 Jun 2020 09:08:21 -0600 -Subject: [PATCH] Port applets to use PlasmaExtras.PlaceholderMessage - -The Kirigami version uses QQC2 elements which don't respect the plasma -theme and color scheme, leading to thing slooking out of place -especially when using a dark color theme or scheme. - -Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13 ---- - applets/clipboard/contents/ui/Menu.qml | 2 +- - .../notifications/package/contents/ui/FullRepresentation.qml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/applets/clipboard/contents/ui/Menu.qml b/applets/clipboard/contents/ui/Menu.qml -index 0bd6064a5..cac8380db 100644 ---- a/applets/clipboard/contents/ui/Menu.qml -+++ b/applets/clipboard/contents/ui/Menu.qml -@@ -55,7 +55,7 @@ PlasmaExtras.ScrollArea { - onAction: menu.action(uuid) - } - -- Kirigami.PlaceholderMessage { -+ PlasmaExtras.PlaceholderMessage { - id: emptyHint - - anchors.centerIn: parent -diff --git a/applets/notifications/package/contents/ui/FullRepresentation.qml b/applets/notifications/package/contents/ui/FullRepresentation.qml -index b34dee7af..989cb4341 100644 ---- a/applets/notifications/package/contents/ui/FullRepresentation.qml -+++ b/applets/notifications/package/contents/ui/FullRepresentation.qml -@@ -585,7 +585,7 @@ PlasmaComponents3.Page { - } - } - -- Kirigami.PlaceholderMessage { -+ PlasmaExtras.PlaceholderMessage { - anchors.centerIn: parent - width: parent.width - (units.largeSpacing * 4) - --- -2.27.0 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch deleted file mode 100644 index 64c5e106e10..00000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e3134289f522edb140797818fffd60d641b86cd8 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <[email protected]> -Date: Wed, 5 Aug 2020 14:07:24 +0200 -Subject: [PATCH] Fix build with gpsd 3.21 - -Adapt to API changes ---- - dataengines/geolocation/location_gps.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp -index 021c29ac5..476117ca3 100644 ---- a/dataengines/geolocation/location_gps.cpp -+++ b/dataengines/geolocation/location_gps.cpp -@@ -65,7 +65,11 @@ void Gpsd::run() - if (m_gpsdata->online) { - #endif - //qDebug() << "online"; -+#if GPSD_API_MAJOR_VERSION >= 10 -+ if (m_gpsdata->fix.status != STATUS_NO_FIX) { -+#else - if (m_gpsdata->status != STATUS_NO_FIX) { -+#endif - //qDebug() << "fix"; - d["accuracy"] = 30; - d["latitude"] = QString::number(m_gpsdata->fix.latitude); --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch deleted file mode 100644 index 21e33531590..00000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5cb38daedbfa5ef26a47d82d197c96230a004b0f Mon Sep 17 00:00:00 2001 -From: David Edmundson <[email protected]> -Date: Wed, 30 Sep 2020 08:56:16 +0000 -Subject: [PATCH] [containmentactions] Guard against having no virtual desktops - -It can apparently happen that virtual desktops is empty at a given point -in time. Potentially due to other bugs on the system. - -Calls to desktopIds.at(N) will fail. - -BUG: 427106 - - -(cherry picked from commit 2441c82a2a92535ccc0a9643715427eb362c98e8) ---- - containmentactions/switchdesktop/desktop.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/containmentactions/switchdesktop/desktop.cpp b/containmentactions/switchdesktop/desktop.cpp -index 809543a49..dda78c584 100644 ---- a/containmentactions/switchdesktop/desktop.cpp -+++ b/containmentactions/switchdesktop/desktop.cpp -@@ -85,6 +85,10 @@ void SwitchDesktop::switchTo() - void SwitchDesktop::performNextAction() - { - const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds(); -+ if (desktopIds.isEmpty()) { -+ return; -+ } -+ - const QVariant ¤tDesktop = m_virtualDesktopInfo->currentDesktop(); - const int currentDesktopIndex = desktopIds.indexOf(currentDesktop); - -@@ -100,6 +104,9 @@ void SwitchDesktop::performNextAction() - void SwitchDesktop::performPreviousAction() - { - const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds(); -+ if (desktopIds.isEmpty()) { -+ return; -+ } - const QVariant ¤tDesktop = m_virtualDesktopInfo->currentDesktop(); - const int currentDesktopIndex = desktopIds.indexOf(currentDesktop); - --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch deleted file mode 100644 index aa30a4d2cf2..00000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9a8fc811282e303ec2f93c978228a85961dae263 Mon Sep 17 00:00:00 2001 -From: Noah Davis <[email protected]> -Date: Mon, 14 Sep 2020 10:18:57 -0400 -Subject: [PATCH] [sddm-theme/lockscreen] Fix login button size - -Some users reported this button becoming too small after KF5.74 was released, but I could not reproduce it myself. However, this code did look suspicious. Hopefully this fixes the issue. ---- - lookandfeel/contents/lockscreen/MainBlock.qml | 4 ++-- - sddm-theme/Login.qml | 5 ++--- - 2 files changed, 4 insertions(+), 5 deletions(-) - ---- a/lookandfeel/contents/lockscreen/MainBlock.qml -+++ b/lookandfeel/contents/lockscreen/MainBlock.qml -@@ -97,7 +97,8 @@ - PlasmaComponents.Button { - id: loginButton - Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Unlock") -- implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field -+ Layout.preferredHeight: passwordBox.implicitHeight -+ Layout.preferredWidth: loginButton.Layout.preferredHeight - - PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off - anchors.fill: parent ---- a/sddm-theme/Login.qml -+++ b/sddm-theme/Login.qml -@@ -112,8 +112,8 @@ - PlasmaComponents.Button { - id: loginButton - Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log In") -- implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field -- Layout.rightMargin: 1 // prevents it from extending beyond the username field -+ Layout.preferredHeight: passwordBox.implicitHeight -+ Layout.preferredWidth: loginButton.Layout.preferredHeight - - PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off - anchors.fill: parent diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml index b52b6b48585..599877f90bf 100644 --- a/kde-plasma/plasma-workspace/metadata.xml +++ b/kde-plasma/plasma-workspace/metadata.xml @@ -9,7 +9,6 @@ <flag name="appstream">Enable AppStream software metadata support</flag> <flag name="geolocation">Enables dataengine providing location information</flag> <flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag> - <flag name="qrcode">Enable support for creating QR codes from clipboard data using <pkg>kde-frameworks/prison</pkg></flag> <flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag> <flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag> </use> diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild deleted file mode 100644 index 472f6c66c2d..00000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.71.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.14.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE Plasma workspace" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry" - -REQUIRED_USE="gps? ( geolocation )" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5[jpeg] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kded-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kpeople-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=kde-plasma/kwin-${PVCUT}:5 - >=kde-plasma/libkscreen-${PVCUT}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - >=media-libs/phonon-4.11.0 - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util - x11-libs/xcb-util-image - appstream? ( dev-libs/appstream[qt5] ) - calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) - geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) - gps? ( sci-geosciences/gpsd ) - qalculate? ( sci-libs/libqalculate:= ) - qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/qtconcurrent-${QTMIN}:5 - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - app-text/iso-codes - >=dev-qt/qdbus-${QTMIN}:5 - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtpaths-${QTMIN}:5 - >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-apps/kio-extras-19.04.3:5 - >=kde-frameworks/kquickcharts-${KFMIN}:5 - >=kde-frameworks/kdesu-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/ksysguard-${PVCUT}:5 - >=kde-plasma/milou-${PVCUT}:5 - >=kde-plasma/plasma-integration-${PVCUT}:5 - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xsetroot - systemd? ( sys-apps/dbus[user-session] ) - !systemd? ( sys-apps/dbus ) - !<kde-plasma/plasma-desktop-5.16.80:5 -" -PDEPEND=" - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -PATCHES=( - "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" - "${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684 - "${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392 - "${FILESDIR}/${P}-login-button-size.patch" - "${FILESDIR}/${P}-guard-against-no-virtual-desktops.patch" # KDE-Bug #427106 -) - -RESTRICT+=" test" - -pkg_setup() { - ecm_pkg_setup - - local md5 - local srcfile=/etc/plasma/XX/10-agent-XX.sh - local newdir="${EPREFIX}"/etc/xdg/plasma-workspace - - if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then - md5=$(md5sum "${EROOT}"${srcfile//XX/startup}) - if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then - elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected." - elog "Copying to ${newdir}/env/10-agent-startup.sh..." - cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die - fi - fi - - if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then - md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown}) - if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then - elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected." - elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..." - cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die - fi - fi -} - -src_prepare() { - ecm_src_prepare - - if [[ ! -f "${T}"/10-agent-startup.sh ]]; then - cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die - fi - if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then - cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die - fi - - cmake_comment_add_subdirectory libkworkspace - # delete colliding libkworkspace translations - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find po -type f -name "*po" -and -name "libkworkspace*" -delete || die - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_xembed-sni-proxy=OFF - $(cmake_use_find_package appstream AppStreamQt) - $(cmake_use_find_package calendar KF5Holidays) - $(cmake_use_find_package geolocation KF5NetworkManagerQt) - $(cmake_use_find_package qalculate Qalculate) - $(cmake_use_find_package qrcode KF5Prison) - $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package telemetry KUserFeedback) - ) - - use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) ) - - ecm_src_configure -} - -src_install() { - ecm_src_install - - # default startup and shutdown scripts - insinto /etc/xdg/plasma-workspace/env - doins "${T}"/10-agent-startup.sh - - insinto /etc/xdg/plasma-workspace/shutdown - doins "${T}"/10-agent-shutdown.sh - fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh -} - -pkg_postinst () { - ecm_pkg_postinst - - # Clean up pre-5.17.4 scripts - if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then - rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die - elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh" - fi - if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then - rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die - elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" - fi - rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null - - 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" -}
