gentoo auto-resync : 19:11:2024 - 03:03:00

4 files changed, 141 insertions, 0 deletions

diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index ba75f201c81e..18d32be25050 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,8 @@
+AUX plasma-pa-6.2.3-guard-activePort-against-null.patch 1433 BLAKE2B 146876560f66d83037c390bd8e8f0146fed74c82d283fa25d3efc390b12a69814a561d482444fd2b77d9abad1e436fa9bb53f4a5d9d573ec4bb8c130cac77490 SHA512 41bd7afadca84c6d11d9d0d50aa7385b6f0c693f185ef922b9e3dda91107d19e0ee1764f673db37d57895655c79e064ffeb8fb8ea7d0fb1d2682dc9cea1beda2
+AUX plasma-pa-6.2.3-kcm-fix-speaker-test-for-proaudio.patch 1818 BLAKE2B a5c2433aeffae4d273cf5b9237f69017d7f40f61aa6ce7b0561c78b8699c8790a851fcdd2620477c9346c3b4a0f617e2a8756f15a2a545f9d0b7b14abfa894ec SHA512 c576b13ac4cc5dc1a0be0cf1004528f0348e3e24de538527573cd75123ea7b68d9ef2a638347355d9e1707fe33e82fbd5c2713b4cc15e61e1aa40b5be58343f0
 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
 EBUILD plasma-pa-6.1.5.ebuild 1189 BLAKE2B efcc3642c3f04975b8d30691a4760ec260ea789739a099fad01582d12feabdc68ccdb95cbd097e2a351c7762dfa9e712e99deb02a97d779277e1f65e8146cca4 SHA512 15d6175e67872a1c39129218af25af446141a1ee5affee9db4edd1e80de38ec5113c90a03b21e083cb1ffff109fc9c4663e9e3fb3424f9a65747b28f1fb5e812
+EBUILD plasma-pa-6.2.3-r1.ebuild 1356 BLAKE2B 3821247d4ef02ea911ffc63d438d017c01f7b4192fe9395e6182896c2713d3fd5a6afa9b4d09a0b07e2938352559d1d6c20293ec99fafc6372023227c246dd49 SHA512 94ed75e8f0c915e3281b73266edcc4e3157a6576bada2081ef88cf09238106ea58158c181e59b7c8985aface3d5ef1f8264e76867f12819b8fd5a3164f09676e
 EBUILD plasma-pa-6.2.3.ebuild 1191 BLAKE2B 051e004a310de50fc63222484de5a219708e49b9cac35a829c85d7e568804e75c9b59eb073ec1961b3d52719e751e990c47ac0264a1cdbe3e276582d58f1620d SHA512 7db7d16ce19e18d15b2f8244b058096399f86fba7f4869d2eb66b0f2c689453fad77104140b867018df7159ae3aa25f36fa3aa56cedb5f2c9429bf281a9bc312
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
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
new file mode 100644
index 000000000000..11759a7c9cc6
--- /dev/null
+++ b/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-guard-activePort-against-null.patch
@@ -0,0 +1,39 @@
+From 49925e2a9598f27a526534dc2b4b1bc0bcee639b Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+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 <sitter@kde.org>
+---
+ 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
new file mode 100644
index 000000000000..c84e2cba02bc
--- /dev/null
+++ b/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-kcm-fix-speaker-test-for-proaudio.patch
@@ -0,0 +1,50 @@
+From 0b4a26ada8258f4d25fa5069f239f1041eefecb5 Mon Sep 17 00:00:00 2001
+From: Ismael Asensio <isma.af@gmail.com>
+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 <isma.af@gmail.com>
+---
+ 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
new file mode 100644
index 000000000000..46b0ae24d6ce
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-6.2.3-r1.ebuild
@@ -0,0 +1,49 @@
+# 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
+)