commit: caa7e287c1eff5fcadf0b3423af82ac09b35f10c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Apr 21 08:51:10 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Apr 21 08:51:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa7e287
kde-frameworks/plasma: Two 5.93 upstream backport requests See also: https://mail.kde.org/pipermail/distributions/2022-April/001220.html https://mail.kde.org/pipermail/distributions/2022-April/001221.html Upstream commits: aec00b32980390b93411f140dfb0503a671c2163 734b956c27bd76df7fed6979beb27c2f30cbd3bf KDE-bug: https://bugs.kde.org/show_bug.cgi?id=452648 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=452555 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../plasma-5.93.0-fix-osd-dialog-position.patch | 32 +++++++++ ...ma-5.93.0-keep-legacy-highlight-behaviour.patch | 33 +++++++++ kde-frameworks/plasma/plasma-5.93.0-r2.ebuild | 80 ++++++++++++++++++++++ 3 files changed, 145 insertions(+) diff --git a/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch b/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch new file mode 100644 index 000000000000..088230402863 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch @@ -0,0 +1,32 @@ +From aec00b32980390b93411f140dfb0503a671c2163 Mon Sep 17 00:00:00 2001 +From: Jim Jones <[email protected]> +Date: Wed, 20 Apr 2022 16:18:20 +0000 +Subject: [PATCH] Fix osd dialog position + +After the upgrade to kde-frameworks-5.93 the osd volume indicator is displayed in the top left corner of the screen instead of being displayed in the center of the screen. + +BUG: 452648 +--- + src/plasmaquick/dialog.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp +index 9ca2c8a66..1e6736dee 100644 +--- a/src/plasmaquick/dialog.cpp ++++ b/src/plasmaquick/dialog.cpp +@@ -1237,11 +1237,7 @@ bool Dialog::event(QEvent *event) + { + if (event->type() == QEvent::Expose) { + if (!KWindowSystem::isPlatformWayland() || !isExposed()) { +- auto ret = QQuickWindow::event(event); +- if (d->mainItem) { +- d->syncToMainItemSize(); +- } +- return ret; ++ return QQuickWindow::event(event); + } + + /* +-- +GitLab + diff --git a/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch b/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch new file mode 100644 index 000000000000..20935856caa8 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch @@ -0,0 +1,33 @@ +From 734b956c27bd76df7fed6979beb27c2f30cbd3bf Mon Sep 17 00:00:00 2001 +From: Aleix Pol <[email protected]> +Date: Wed, 13 Apr 2022 17:25:52 +0200 +Subject: [PATCH] Keep PlasmaComponents.Highlight on its former behaviour + +Otherwise some applets like Kickoff Legacy don't get a highlight + +BUG: 452555 +--- + src/declarativeimports/plasmacomponents/qml/Highlight.qml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/declarativeimports/plasmacomponents/qml/Highlight.qml b/src/declarativeimports/plasmacomponents/qml/Highlight.qml +index 672e57231..3672050b7 100644 +--- a/src/declarativeimports/plasmacomponents/qml/Highlight.qml ++++ b/src/declarativeimports/plasmacomponents/qml/Highlight.qml +@@ -4,6 +4,7 @@ + SPDX-License-Identifier: LGPL-2.0-or-later + */ + ++import QtQuick 2.15 + import org.kde.plasma.extras 2.0 as PlasmaExtras + + /** +@@ -15,4 +16,5 @@ PlasmaExtras.Highlight + id: root + // At some point we had the "hover" property which was replaced with "hovered" + property alias hover: root.hovered ++ hovered: true + } +-- +GitLab + diff --git a/kde-frameworks/plasma/plasma-5.93.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.93.0-r2.ebuild new file mode 100644 index 000000000000..f5d72b460cb0 --- /dev/null +++ b/kde-frameworks/plasma/plasma-5.93.0-r2.ebuild @@ -0,0 +1,80 @@ +# 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}/${PN}-5.92.0-fix-blurry-buttons.patch" # KDE-bug 447977 + "${FILESDIR}/${P}-fix-widget-popups.patch" # bug 838661, KDE-bug 452512 + "${FILESDIR}/${P}-fix-osd-dialog-position.patch" # KDE-bug 452648 + "${FILESDIR}/${P}-keep-legacy-highlight-behaviour.patch" # KDE-bug 452555 +) + +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 +}
