commit: 60b39959b41fa88fd8d450cfd3c540f5d04399c8 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 3 15:44:10 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 3 19:21:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b39959
kde-plasma/plasma-pa: drop 6.2.3-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/plasma-pa/Manifest | 1 - ...ma-pa-6.2.3-guard-activePort-against-null.patch | 39 ----------------- ...a-6.2.3-kcm-fix-speaker-test-for-proaudio.patch | 50 ---------------------- kde-plasma/plasma-pa/plasma-pa-6.2.3-r1.ebuild | 49 --------------------- 4 files changed, 139 deletions(-) diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest index d4ab98a37972..c2c2354c5b54 100644 --- a/kde-plasma/plasma-pa/Manifest +++ b/kde-plasma/plasma-pa/Manifest @@ -1,3 +1,2 @@ DIST plasma-pa-6.1.5.tar.xz 163064 BLAKE2B 91ce21182b9890bbabaff3f993dd8b15dc771a8b59d3c611f85b073b9d915aa4c83447d239fa20cd6cd65e3b91bb66ed7f0e63c0d452ec459cb15601bcc5ffc2 SHA512 c0219145c30e322bef6f8d578f2c880248175f52094d65ca5d1c49fde556137e2d1a3d5670a17d32e9d77dfc933444ddc2e30084e7dd15c77e3ad5eda1048714 -DIST plasma-pa-6.2.3.tar.xz 184892 BLAKE2B 8ef3eb52cb537df497756886ca8109fdeda71f4e735ec76178d3b29feaca8f2fdc07d0569d183138e2351bf3704676e3ef22c6dcd400dd9779094892fe3ab0d5 SHA512 9a4202d6aca8b62553e074a0ee5dbea0aee834339f16d78cce6cd1ad8151e015189fe98201c3adcf5534993826f8209a05385a1a7d191b08610ede3094a758d7 DIST plasma-pa-6.2.4.tar.xz 185592 BLAKE2B ccba9b35c8d7386fe2bd053ccd8e1978c046eec84943570c7f778d82f3d4a29eb75fe5953dc03b8ec4e2adbb545e99d7c9f20aa665fcba08e6757766b7256c97 SHA512 19f7999bd0598fc138026cf915b57cf70ab92603851dae19e5f178560d5d90552120a90c0203327eec667247664d2ef5d218fea6913338863a3ccccae7998cdb diff --git a/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-guard-activePort-against-null.patch b/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-guard-activePort-against-null.patch deleted file mode 100644 index 11759a7c9cc6..000000000000 --- a/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-guard-activePort-against-null.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 49925e2a9598f27a526534dc2b4b1bc0bcee639b Mon Sep 17 00:00:00 2001 -From: Harald Sitter <[email protected]> -Date: Fri, 15 Nov 2024 13:36:04 +0000 -Subject: [PATCH] listitemmenu: guard activePort against null - -it's not quite obvious why ports.at(index) would return null, but it's -my best guess for why we have a crash here - -CCBUG: 496067 - - -(cherry picked from commit 23c8a3f982d5e0c8380c0870b047b251f67d179e) - -Co-authored-by: Harald Sitter <[email protected]> ---- - src/qml/listitemmenu.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/qml/listitemmenu.cpp b/src/qml/listitemmenu.cpp -index 5196a3de..9319bd26 100644 ---- a/src/qml/listitemmenu.cpp -+++ b/src/qml/listitemmenu.cpp -@@ -333,9 +333,10 @@ QMenu *ListItemMenu::createMenu() - // Ports - const auto ports = device->ports(); - bool activePortUnavailable = false; -- if (device->activePortIndex() != static_cast<quint32>(-1)) { -- auto *activePort = static_cast<Port *>(ports.at(device->activePortIndex())); -- activePortUnavailable = activePort->availability() == Port::Unavailable; -+ if (auto index = device->activePortIndex(); index != static_cast<quint32>(-1)) { -+ if (auto activePort = ports.at(index)) { -+ activePortUnavailable = activePort->availability() == Port::Unavailable; -+ } - } - - QMap<int, Port *> availablePorts; --- -GitLab - diff --git a/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-kcm-fix-speaker-test-for-proaudio.patch b/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-kcm-fix-speaker-test-for-proaudio.patch deleted file mode 100644 index c84e2cba02bc..000000000000 --- a/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-kcm-fix-speaker-test-for-proaudio.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0b4a26ada8258f4d25fa5069f239f1041eefecb5 Mon Sep 17 00:00:00 2001 -From: Ismael Asensio <[email protected]> -Date: Wed, 6 Nov 2024 17:31:17 +0000 -Subject: [PATCH] kcm: Fix speaker test layout for Pro-Audio profile - -Known audio channels (like 'front-right', `rear-left`) are assigned -rows 0 to 2 in the Grid layout so they are placed in their spatial -position around the user's avatar - -Unknown channels (those produced by the Pro Audio pipewire profile) -have no spatial info and are assigned to rows 3 and following - -The spacer items were also assigned to row 3, which collided with -those, breaking the layout. Let's give the spacers a high enough -row number so there is no collision with an already occupied cell - -BUG: 495752 -FIXED-IN: 6.2.4 - - -(cherry picked from commit 36075f9e5f8d58ad2c687b91ec9a9cbef8c59fb3) - -Co-authored-by: Ismael Asensio <[email protected]> ---- - src/kcm/ui/main.qml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/kcm/ui/main.qml b/src/kcm/ui/main.qml -index dacaec4f..57f60c35 100644 ---- a/src/kcm/ui/main.qml -+++ b/src/kcm/ui/main.qml -@@ -468,13 +468,13 @@ KCM.ScrollViewKCM { - - // Spacers for when the left and right columns are empty - Item { -- Layout.row: 3 -+ Layout.row: 9 // So we don't override an occupied cell - Layout.column: 0 - Layout.fillWidth: true - Layout.preferredWidth: Kirigami.Units.gridUnit * 4 - } - Item { -- Layout.row: 3 -+ Layout.row: 9 // So we don't override an occupied cell - Layout.column: 2 - Layout.fillWidth: true - Layout.preferredWidth: Kirigami.Units.gridUnit * 4 --- -GitLab - diff --git a/kde-plasma/plasma-pa/plasma-pa-6.2.3-r1.ebuild b/kde-plasma/plasma-pa/plasma-pa-6.2.3-r1.ebuild deleted file mode 100644 index 46b0ae24d6ce..000000000000 --- a/kde-plasma/plasma-pa/plasma-pa-6.2.3-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) -QTMIN=6.7.2 -inherit ecm plasma.kde.org - -DESCRIPTION="Plasma applet for audio volume management using PulseAudio" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RESTRICT="test" # missing selenium-webdriver-at-spi - -DEPEND=" - dev-libs/glib:2 - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kdbusaddons-${KFMIN}:6 - >=kde-frameworks/kdeclarative-${KFMIN}:6 - >=kde-frameworks/kglobalaccel-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 - >=kde-frameworks/ksvg-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - media-libs/libcanberra - media-libs/libpulse - >=media-libs/pulseaudio-qt-1.6.0:= -" -RDEPEND="${DEPEND} - dev-libs/kirigami-addons:6 - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/kitemmodels-${KFMIN}:6 - x11-themes/sound-theme-freedesktop -" -BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" - -PATCHES=( - "${FILESDIR}/${P}-kcm-fix-speaker-test-for-proaudio.patch" # KDE-bug #495752 - "${FILESDIR}/${P}-guard-activePort-against-null.patch" # KDE-bug #496067 -)
