diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-04-30 23:37:01 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-05-04 22:49:56 +0200 |
commit | d9c514f57cd1426b965765c0062ff38286c05829 (patch) | |
tree | 1ca66ee103f57d5b47594b46069d12270627cbf7 /kde-frameworks | |
parent | kde-frameworks/kxmlgui: drop 5.90.0* (diff) | |
download | gentoo-d9c514f57cd1426b965765c0062ff38286c05829.tar.gz gentoo-d9c514f57cd1426b965765c0062ff38286c05829.tar.bz2 gentoo-d9c514f57cd1426b965765c0062ff38286c05829.zip |
kde-frameworks/plasma: drop 5.90.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks')
5 files changed, 0 insertions, 270 deletions
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest index fd285b2eb967..fdd094a817a2 100644 --- a/kde-frameworks/plasma/Manifest +++ b/kde-frameworks/plasma/Manifest @@ -1,3 +1,2 @@ -DIST plasma-framework-5.90.0.tar.xz 3143720 BLAKE2B 497a1808c2f07b985f3b458d2bf6b4b4e0198a8bd92cffdad86cc9470cd51c857c3de66edbe4d6ea543da74f6ba05fe5ce1b6746e2df7830839e45549ca01293 SHA512 0f22e100ad996be39a2cc5afa72d3e769dc512d3854d417e81536908bc4e6c9874788554fcea1ca1ec4798cd78681c78ab7c2242b95d7f5fdb6cfd9eeee9543b DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c DIST plasma-framework-5.93.0.tar.xz 3148720 BLAKE2B 2e11e742279ce33b33bf5a7a7e4051e14bb7e7c2cdecb41e127bf07c5fbe91fd4ab8905cadb27a2a1be95ce4287e4eb8539cdfb9ad36e052f9789abf5d8159c3 SHA512 df876c422d2de82325537bfdce4db016dc649202f334de063403c15f44d554c4b0f6707e02c8890e269bdb71c17fdd31f651fad3ed7506f23a110d725fd8ccf8 diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch deleted file mode 100644 index bccc097a3b99..000000000000 --- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch +++ /dev/null @@ -1,90 +0,0 @@ -From d40d36057a0ee9fcb4badc7ff8b56844da79dfc8 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Wed, 12 Jan 2022 22:21:34 +0000 -Subject: [PATCH] Always sync the setPanelBehavior to wayland - -Currently this code is in the else statement to if (type != -Dialog::Normal) { - -This doesn't make sense as panel roles apply explicitly to other types, -like Dialog::Dock. On X11 the equivalent always applies. - -BUG: 426969 - -* asturm 2022-01-22: Merged with below fixup: - -From b882b34d7b55975f679133ef86cfd12869e8bba5 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Thu, 13 Jan 2022 17:03:38 +0000 -Subject: [PATCH] Always sync the setPanelBehavior to wayland - -The previous patch moved some code that reapplied setRole in a way that -caused issues. - -BUG: 448373 - ---- a/src/plasmaquick/dialog.cpp -+++ b/src/plasmaquick/dialog.cpp -@@ -693,14 +693,13 @@ - - void DialogPrivate::applyType() - { -- if (type != Dialog::Normal) { - /*QXcbWindowFunctions::WmWindowType*/ int wmType = 0; - - #if HAVE_X11 - if (KWindowSystem::isPlatformX11()) { - switch (type) { - case Dialog::Normal: -- Q_UNREACHABLE(); -+ q->setFlags(Qt::FramelessWindowHint | q->flags()); - break; - case Dialog::Dock: - wmType = QXcbWindowFunctions::WmWindowType::Dock; -@@ -729,11 +728,15 @@ - } - #endif - -- if (!wmType) { -+ if (!wmType && type != Dialog::Normal) { - KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type)); - } - #if HAVE_KWAYLAND - if (shellSurface) { -+ if (q->flags() & Qt::WindowStaysOnTopHint) { -+ type = Dialog::Dock; -+ shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow); -+ } - switch (type) { - case Dialog::Dock: - shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel); -@@ -750,27 +753,13 @@ - case Dialog::CriticalNotification: - shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::CriticalNotification); - break; -+ case Dialog::Normal: -+ shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal); - default: - break; - } - } - #endif -- } else { -- q->setFlags(Qt::FramelessWindowHint | q->flags()); -- --#if HAVE_KWAYLAND -- // Only possible after setup -- if (shellSurface) { -- if (q->flags() & Qt::WindowStaysOnTopHint) { -- shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel); -- shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow); -- } else { -- shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal); -- shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::AlwaysVisible); -- } -- } --#endif -- } - - // an OSD can't be a Dialog, as qt xcb would attempt to set a transient parent for it - // see bug 370433 diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch deleted file mode 100644 index 62cb8a52b6c5..000000000000 --- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ecf0cc36936f69830a07937b97807ec0ba4d3f41 Mon Sep 17 00:00:00 2001 -From: Marco Martin <notmart@gmail.com> -Date: Mon, 10 Jan 2022 09:22:09 +0000 -Subject: [PATCH] Don't crash when a screen gets disabled and enabled again - -when a screen gets disabled, the containment loses its view, and when gets enabled again, -the process of the old orphaned containment getting a new view causes a plasma crash. -It comes from the wallpaper, which indicates a hierarchy of C++ owned objects -makes the internal one (wallpaper) to not reset correctly its window and have a stray pointer to it. - -BUG:447752 ---- - .../qml/plasmoid/containmentinterface.cpp | 21 +++++++++++++++---- - .../qml/plasmoid/containmentinterface.h | 1 + - 2 files changed, 18 insertions(+), 4 deletions(-) - -diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp -index d8a89014c..29a7738ca 100644 ---- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp -+++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp -@@ -74,10 +74,6 @@ void ContainmentInterface::init() - connect(m_activityInfo, &KActivities::Info::nameChanged, this, &ContainmentInterface::activityNameChanged); - Q_EMIT activityNameChanged(); - -- if (!m_containment->wallpaper().isEmpty()) { -- loadWallpaper(); -- } -- - AppletInterface::init(); - - // Create the ToolBox -@@ -1162,4 +1158,21 @@ bool ContainmentInterface::isLoading() const - return loading; - } - -+void ContainmentInterface::itemChange(ItemChange change, const ItemChangeData &value) -+{ -+ if (change == QQuickItem::ItemSceneChange) { -+ // we have a window: create the representations if needed -+ if (value.window && !m_containment->wallpaper().isEmpty()) { -+ loadWallpaper(); -+ } else if (m_wallpaperInterface) { -+ m_wallpaperInterface->deleteLater(); -+ m_wallpaperInterface = nullptr; -+ Q_EMIT wallpaperInterfaceChanged(); -+ } -+ } -+ -+ AppletInterface::itemChange(change, value); -+} -+ -+ - #include "moc_containmentinterface.cpp" -diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.h b/src/scriptengines/qml/plasmoid/containmentinterface.h -index a91c60c5e..f1276ee80 100644 ---- a/src/scriptengines/qml/plasmoid/containmentinterface.h -+++ b/src/scriptengines/qml/plasmoid/containmentinterface.h -@@ -169,6 +169,7 @@ protected: - void addContainmentActions(QMenu *desktopMenu, QEvent *event); - - virtual bool isLoading() const override; -+ void itemChange(ItemChange change, const ItemChangeData &value) override; - - Q_SIGNALS: - /** --- -GitLab - diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch deleted file mode 100644 index 4bbb7a8ce1b0..000000000000 --- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e9ba0c54f2c01bb530370c16502cf304fc18b3f6 Mon Sep 17 00:00:00 2001 -From: Alexander Lohnau <alexander.lohnau@gmx.de> -Date: Mon, 17 Jan 2022 19:58:53 +0100 -Subject: [PATCH] Corona::containmentForScreen: Ignore activities when an empty - string is used - -With the other overloads being deprecated, consumers are forced to put in an empty string -for the activity. As one can see in the pre-existing code, an empty string indicates -that the activity should be ignored. Consequently we should skip the activity check, when -we got an empty string. - -BUG: 448590 ---- - src/plasma/corona.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp -index f034d7b2e..8f532d690 100644 ---- a/src/plasma/corona.cpp -+++ b/src/plasma/corona.cpp -@@ -206,7 +206,7 @@ Containment *Corona::containmentForScreen(int screen, const QString &activity, c - for (Containment *cont : std::as_const(d->containments)) { - /* clang-format off */ - if (cont->lastScreen() == screen -- && (cont->activity().isEmpty() || cont->activity() == activity) -+ && ((cont->activity().isEmpty() || activity.isEmpty()) || cont->activity() == activity) - && (cont->containmentType() == Plasma::Types::DesktopContainment - || cont->containmentType() == Plasma::Types::CustomContainment)) { /* clang-format on */ - containment = cont; --- -GitLab - diff --git a/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild deleted file mode 100644 index df38b8e9aa83..000000000000 --- a/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="${PN}-framework" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Plasma framework" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="gles2-only man wayland X" - -RESTRICT="test" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=] - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kactivities-${PVCUT}*:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kdeclarative-${PVCUT}*:5 - =kde-frameworks/kglobalaccel-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kirigami-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 - =kde-frameworks/kpackage-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 - =kde-frameworks/kxmlgui-${PVCUT}*:5 - !gles2-only? ( media-libs/libglvnd[X?] ) - wayland? ( - =kde-frameworks/kwayland-${PVCUT}*:5 - media-libs/libglvnd - ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libxcb - ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" - -PATCHES=( - "${FILESDIR}/${P}-KDEBUG-426969.patch" - "${FILESDIR}/${P}-KDEBUG-447752.patch" - "${FILESDIR}/${P}-KDEBUG-448590.patch" -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package !gles2-only OpenGL) - $(cmake_use_find_package man KF5DocTools) - $(cmake_use_find_package wayland EGL) - $(cmake_use_find_package wayland KF5Wayland) - $(cmake_use_find_package X X11) - $(cmake_use_find_package X XCB) - ) - - ecm_src_configure -} |