From 60f657b5e6155f26601c7def7baa11cee72246d0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 1 Feb 2023 21:05:47 +0000 Subject: gentoo auto-resync : 01:02:2023 - 21:05:47 --- kde-frameworks/plasma/Manifest | 2 + ...of-distance-betw-dialog-and-parent-applet.patch | 44 +++++++++++++ kde-frameworks/plasma/plasma-5.102.0-r3.ebuild | 75 ++++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 kde-frameworks/plasma/files/plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch create mode 100644 kde-frameworks/plasma/plasma-5.102.0-r3.ebuild (limited to 'kde-frameworks/plasma') diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest index 228d1c5d195b..84d132ce16a3 100644 --- a/kde-frameworks/plasma/Manifest +++ b/kde-frameworks/plasma/Manifest @@ -1,7 +1,9 @@ +AUX plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch 1911 BLAKE2B ad1f6fc8ab918b5f275b5b269339e07a21777930291c92843af1e69d6ea633fd03cbdfd163dea6571d0f4e69d49c0089331b0fcdd7ef828b1ba5e5504c970c45 SHA512 dd14247cfc81088547415324cd854099d1dbb9d780c9571a47634b4f48f894d22abf1ea9f8aa996107eb5353c27618f532c8a0e0b00006b1fbc28fba59c34cca AUX plasma-5.102.0-fix-flicker-on-fade-animation.patch 2092 BLAKE2B 73e7958fa8c61e8a0fca590642283f46e0655bd6da7f90a350c862e98046cbc14e3fe0c3e53079f7ad8df1e3872b21e032d13b0e40041ffc78f7261158bf27bc SHA512 3d57a2b8bff651950c946aaafbf606f814e0469ac75569a187bd71fa6afd4a0e487a944219247525a0323afe2c36d40c2d1ad99e41ceb0588da91f43d034e9df DIST plasma-framework-5.102.0.tar.xz 3305096 BLAKE2B 225bb5a2d3cc5e0631defa59bafaeef49e6b1c4cf650d19d4b15cd270ec47ab2a613d4e3689bdea8d6cee19ed26aff78cb5c24a1ef0c8245fac4b80fa2a2147d SHA512 0db243ad6425c1f543149f4d939b7787cc20af526d4e81246debf7910b05a318cf18822ab0518d70dbb2641ad5853359a4e23104138f131c3a4073237c56d4b1 DIST plasma-framework-5.99.0.tar.xz 3141664 BLAKE2B b37534440bc1f3d8f5fc13b6b62527c1bdde4b5d5d1c88530c49da2be221c9f55afac832cd8db61eb1bb91328145bc9b4c9e7b227b1ce740b10fa1bbefd3d2ef SHA512 bcf4f33facb20b542a90f5216fc0c5778d4de51d6a0ae86abdd5a22d7d1bfd7156dfd7a7d6cdad524b8f98596a75aa064fcbb295a36161ce288d4be4f42c5abb EBUILD plasma-5.102.0-r1.ebuild 1945 BLAKE2B 3108cbd3ea42e08678c6aabc3eebcb84a5a547aaf995d3de52e5cf3394a4aa7f75cd54f665f04b85538b82d8fe93ec84f444de8ad2b38f9e2d3b4a699295758a SHA512 7cf34b6f753f4c6bfe80389969796eeb8c6ab57042c585da1e8d1229ed8e4401ea994e5a909f7c9ff78d0431d24ae06b9672895a4cdfdb5f6c64d6d8152e65dc EBUILD plasma-5.102.0-r2.ebuild 2038 BLAKE2B 977118fa8d1333a54270eeaeebca8ec629988d8ebe2b3c9c6af72d0735e649a5b1de8e8730e43f6afa6632920a2d6b2c3f1568db78255d4762050c356814f616 SHA512 c63154c59c32b7b2298032802cc6e2f9318e1b7d99975faa05a11bb3c026cf4b21f7d044b69003d451c2f43b913a41bfc8aad98e26c9a7bfd80fa167b24d9236 +EBUILD plasma-5.102.0-r3.ebuild 2141 BLAKE2B c7272f3c79a1db628aa993392adcfa7be3b88019acf8e4960efdd89216df822b9af8f60143fb549afae503b8f780c465c9f7721013bf50af92b41eb64501d400 SHA512 425ef710eb0735b49ba8d33c8fb335220ecf4011df382a362713858b225766507b140365e941fb74a0ad2d9f89bee705924796a8daa00bc526eaa3e4b5f4eccc EBUILD plasma-5.99.0.ebuild 1926 BLAKE2B f241e720ae257014353cc38da113054dee7165a535a4e38d4c116c9f3a3680308f16d286ce4e76f28d50e56e3acbbb0c26d410f21449d9e88b32624ca30c83bf SHA512 7400aa7e239e3f9855850cb534f5bb6e173326cd2c2c7f05f66435c9bf96afcb3fa61d5e86d3a387c45b0ed75a8b438e7b895fd3e0c9b86b0fefe705c1c236a6 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/plasma/files/plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch b/kde-frameworks/plasma/files/plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch new file mode 100644 index 000000000000..13f7a7e20232 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch @@ -0,0 +1,44 @@ +From 1e0042c750756d0963d11d125978f47ea830d495 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= +Date: Tue, 31 Jan 2023 20:25:06 +0000 +Subject: [PATCH] Dialog: Fix calculation of distance between dialog and parent + applet + +`ParentRect` is not using the same coordinate system as `dialogPos` and `avail`, +which could result in incorrect placement of dialogs when you have e.g. multiple +monitors or a non-maximized panel. This replaces `ParentRect` with `dialogPos` so +the coordinate systems remain in sync. + +BUG:464201 +BUG:464513 +FIXED-IN: 5.103 + + +(cherry picked from commit eda6caabcffff484544af8949d0ca0a3ea3ce333) +--- + src/plasmaquick/dialog.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp +index 786d7ebe2..bdbdd028b 100644 +--- a/src/plasmaquick/dialog.cpp ++++ b/src/plasmaquick/dialog.cpp +@@ -1249,13 +1249,13 @@ QPoint Dialog::popupPosition(QQuickItem *item, const QSize &size) + switch (d->location) { + case Plasma::Types::TopEdge: + case Plasma::Types::BottomEdge: +- if (qAbs(parentRect.center().x() - avail.center().x() ) < size.width() / 2 - parentRect.width() / 3) { ++ if (qAbs(dialogPos.x() + size.width() / 2 - avail.center().x() ) < size.width() / 2 - parentRect.width() / 3) { + dialogPos.setX(avail.center().x() - size.width() / 2); + } + break; + case Plasma::Types::LeftEdge: + case Plasma::Types::RightEdge: +- if (qAbs(parentRect.center().y() - avail.center().y() ) < size.height() / 2 - parentRect.height() / 3) { ++ if (qAbs(dialogPos.y() + size.height() / 2 - avail.center().y() ) < size.height() / 2 - parentRect.height() / 3) { + dialogPos.setY(avail.center().y() - size.height() / 2); + } + break; +-- +GitLab + diff --git a/kde-frameworks/plasma/plasma-5.102.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.102.0-r3.ebuild new file mode 100644 index 000000000000..b3a2bef794de --- /dev/null +++ b/kde-frameworks/plasma/plasma-5.102.0-r3.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2023 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.5 +VIRTUALX_REQUIRED="test" +inherit ecm frameworks.kde.org + +DESCRIPTION="Plasma framework" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="gles2-only man wayland" + +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +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 + >=dev-qt/qtx11extras-${QTMIN}:5 + =kde-frameworks/kactivities-${PVCUT}*:5 + =kde-frameworks/karchive-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5[qml] + =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[X] + =kde-frameworks/kxmlgui-${PVCUT}*:5 + x11-libs/libX11 + x11-libs/libxcb + !gles2-only? ( media-libs/libglvnd[X] ) + wayland? ( + =kde-frameworks/kwayland-${PVCUT}*:5 + media-libs/libglvnd + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" + +PATCHES=( + "${FILESDIR}/${P}-fix-flicker-on-fade-animation.patch" # KDE-bug 463061, 463685 + "${FILESDIR}/${P}-fix-calc-of-distance-betw-dialog-and-parent-applet.patch" # KDE-bug 464201, 464513 +) + +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) + ) + + ecm_src_configure +} -- cgit v1.2.3